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
+#: 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 "Cimbabue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"�Est� seguro de que quere\n"
-"borrar este contacto?"
+#: 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 "Corpo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "�Borrar Contacto?"
+#: 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 "Autom�bil"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
+#, fuzzy
+msgid "Is New Card"
+msgstr "Novo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
+#, fuzzy
+msgid "Writable Fields"
+msgstr "Campo _Desde"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#, fuzzy
+msgid "Changed"
+msgstr "Chad"
 
-#: 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 "Non hai unha descrici�n dispo�ible."
 
-#: 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 "Este contacto pertence a estas categor�as:"
 
-#: 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 "Gardar como 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 ""
+"�Est� seguro de que quere\n"
+"borrar este contacto?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"�Est� seguro de que quere\n"
+"borrar este contacto?"
+
+#: 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 "Non se puido atopa-lo control dun campo: `%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 "Engadir Contacto Rapidamente"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr "Editar Completo"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Nome Completo:"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "E-mail"
 msgstr "Correo Electr�nico"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, fuzzy, c-format
+msgid "Error saving %s: %s"
+msgstr "Erro ao gardar o ficheiro: %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 "Br�tema"
 
-#: 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"
@@ -2715,151 +2698,148 @@ msgstr ""
 "%s xa existe\n"
 "�Quere sobrescribilo?"
 
-#: 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 "�Sobrescribir ficheiro?"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Enderezo _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Comprobar Enderezo"
 
-#: 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 "_Enderezo:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Apdo. de Correos:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "C�digo _Postal:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Check Full Name"
 msgstr "Comprobar Nome Completo"
 
-#: 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 "Don"
 
-#: 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 "fillo"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Sri�a."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Sr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Sra."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Sra."
 
-#: 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 "_Nome:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Apelidos:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Outros nomes:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Sufixo:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Tratamento:"
 
-#: 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 "_Nome da lista:"
 
-#: 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 "Membros"
 
-#: 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 ""
 "Escriba un enderezo de correo ou arraste un contacto � lista de abaixo:"
 
-#: 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 "_Agochar enderezos cando se env�e correo a esta lista"
 
-#: 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 "Elimina_r"
 
-#: 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 "editor-de-contactos"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+#, fuzzy
+msgid "Is New List"
+msgstr "Nova Lista"
+
 #. 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 "Editor de Listas de Contactos"
 
-#: 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 "Gardar como VCard"
@@ -2914,276 +2894,297 @@ msgstr ""
 "O enderezo ou nome cambiado deste contacto xa existe neste\n"
 "cartafol.  �Gostar�alle engadilo de todas maneiras?"
 
-#: 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 "Busca Avanzada"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr "Buscar"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr "1 tarxeta"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:152
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr "%d tarxetas"
 
-#: 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 "Alema�a"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Erro ao iniciar %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
 msgid "Error modifying card"
 msgstr "Erro ao modifica-la tarxeta"
 
-#: 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 "�xito"
 
-#: 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 "Erro desco�ecido"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: 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 "Permiso denegado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Tarxeta non atopada"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "O ID da Tarxeta xa existe"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protocolo non soportado"
 
-#: 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 "Cancelada"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "A autenticaci�n fallou."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Autenticaci�n requirida"
 
-#: 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 "O cartafol `%s' non existe."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Outro erro"
 
-#: 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 "�Quere gardar os cambios?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:77
+#, fuzzy
+msgid "_Discard"
+msgstr "Imprimir tarxeta"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Erro ao engadi-la lista"
 
-#: 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 "Erro ao engadi-la tarxeta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:91
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Erro ao modifica-la lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Erro ao elimina-la lista"
 
-#: 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 "Erro ao elimina-la tarxeta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
-#, fuzzy
-msgid "Display Cards?"
-msgstr "Amosar"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-#, fuzzy
-msgid "Display Cards"
-msgstr "Amosar"
-
-#: 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 "Sen tarxetas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 #, fuzzy
 msgid "Copy card to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:353
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 #, fuzzy
 msgid "Move cards to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:355
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "Varias VCards"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard de %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 "Tipo:"
+
+#: 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 "Libro de Enderezos"
 
-#: 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 "Gardar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 #, fuzzy
 msgid "New Contact..."
 msgstr "Novo Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nova Lista de Contactos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Ir � Cartafol..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 #, fuzzy
 msgid "Import..."
 msgstr "Importando..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Buscar Contactos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Fontes do Libro de Enderezos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Preferencias de Correo..."
 
-#: 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 "Remitir Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:815
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr "Enviar unha Mensaxe a un Contacto"
 
-#: 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 "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr "Imprimir Sobre"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_Mover � Cartafol.."
 
-#: 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 "Cortar"
 
-#: 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 "Copiar"
 
-#: 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 "Pegar"
 
-#: 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 "Eliminar"
 
-#: 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 "_Vista Actual"
@@ -3192,7 +3193,7 @@ msgstr "_Vista 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 ""
 
@@ -3200,11 +3201,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"
@@ -3272,20 +3273,60 @@ msgstr "Outro Tel�fono"
 msgid "Primary Phone"
 msgstr "Tel�fono Principal"
 
-#: 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 "Gardar no libro de enderezos"
 
-#: 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 "Largura:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+#, fuzzy
+msgid "Height"
+msgstr "Altura:"
+
+#: 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 "Campo _Desde"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+#, fuzzy
+msgid "Field Name"
+msgstr "Nome Completo:"
+
+#: 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
+#, fuzzy
+msgid "Column Width"
+msgstr "Colombia"
+
+#: addressbook/gui/widgets/e-minicard-view.c:141
 #, fuzzy
 msgid ""
 "\n"
@@ -3300,7 +3341,7 @@ msgstr ""
 "\n"
 "Faga dobre clic aqu� para crear un novo Contacto."
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 #, fuzzy
 msgid ""
 "\n"
@@ -3313,21 +3354,41 @@ msgstr ""
 "\n"
 "Faga dobre clic aqu� para crear un novo Contacto."
 
-#: 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 "Eliminada"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Ordeamento das tarefas"
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Vista de Tarxeta"
 
-#: 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 "Vista Semanal"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr "Imprimir sobre"
 
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1130
 msgid "Print cards"
 msgstr "Imprimir tarxetas"
 
-#: 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 "Imprimir tarxeta"
 
@@ -3400,7 +3461,6 @@ msgid "Include:"
 msgstr "Inclu�r:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Horizontal"
 
@@ -3420,17 +3480,16 @@ msgstr "Marxes"
 msgid "Number of columns:"
 msgstr "N�mero de columnas:"
 
-#: 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 "Opci�ns"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Orientaci�n"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "P�xina"
 
@@ -3446,9 +3505,7 @@ msgstr "Papel"
 msgid "Paper source:"
 msgstr "Orixe do papel:"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Vertical"
 
@@ -3509,43 +3566,167 @@ msgstr "_Fonte..."
 msgid "Untitled appointment"
 msgstr "_Editar 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 "Indefinida"
 
-#: 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 "Erro ao se comunicar co servidor de axenda"
 
-#: 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 "Non foi posible ler o bloque de aplicaci�n da Axenda do pilot"
 
@@ -3554,93 +3735,81 @@ msgstr "Non foi posible ler o bloque de aplicaci�n da Axenda do pilot"
 msgid "Default Priority:"
 msgstr "_Prioridade:"
 
-#: 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 "Non foi posible ler o bloque de aplicaci�n ToDo (PorFacer) do pilot"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-#, fuzzy
-msgid "A Bonobo control which displays a task list."
-msgstr "Unha control Bonobo de exemplo que amosa unha axenda."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Unha control Bonobo de exemplo que amosa unha axenda."
-
-#: 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 "Preferencias da Axenda e as Tarefas"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Calendar."
-msgstr "F�brica para o compo�ente da axenda de 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 "Visor da axenda iTip/iMip de Evolution"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Preferencias da Axenda e as Tarefas"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Compo�ente de Evolution para manexar a axenda."
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Compo�ente do resumo executivo da axenda de 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"
+msgid "Evolution Calendar configuration control"
 msgstr "F�brica para o compo�ente de correo de Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the calendar iTip view control"
-msgstr "F�brica para o control vista iTip da axenda"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-msgid "Factory for the sample Calendar control"
-msgstr "F�brica para o control Axenda de exemplo"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Visor da axenda iTip/iMip de Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "F�brica para centraliza-los di�logos editores de compo�entes da axenda"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Visor da axenda iTip/iMip de Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 #, fuzzy
-msgid "Factory to create a component editor factory"
-msgstr "F�brica para centraliza-los di�logos editores de compo�entes da axenda"
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor de Novas de Evolution"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "Servicio de notificaci�n de alarma"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Editor de Novas de 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
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
 msgstr "F�bica para o servicio de notificaci�n de alarmas"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 #, fuzzy
 msgid "Starting:"
 msgstr "Opci�ns"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 #, fuzzy
 msgid "Ending:"
 msgstr "�_ndice"
 
-#: 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 _finalizaci�n:"
 
-#: 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 "Alarmas"
@@ -3662,11 +3831,17 @@ msgstr "Tempo de adiamento (minutos)"
 msgid "_Edit appointment"
 msgstr "_Editar cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "Non hai unha descrici�n dispo�ible."
 
-#: 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 "Advertencia"
+
+#: 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"
@@ -3674,13 +3849,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 "Advertencia"
-
-#: 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 "
@@ -3691,16 +3860,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 "Non preguntar de novo"
 
-#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
-msgid "Could not initialize GNOME"
-msgstr "Non foi posible inicializar GNOME"
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize gnome-vfs"
+msgstr "Non foi posible inicializar 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 "Non foi posible crear a f�brica do servicio de notificaci�ns de alarma"
 
@@ -3716,36 +3885,36 @@ msgstr "A descrici�n cont�n"
 msgid "Comment contains"
 msgstr "O comentario cont�n"
 
-#: 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 "Non concorda"
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:404
 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
 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 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 de %b"
 
@@ -3756,67 +3925,168 @@ msgstr ""
 "Non foi posible crear o visor da axenda. Comprobe a s�a configuraci�n de "
 "ORBit e 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 "Axenda"
+
+#: calendar/gui/calendar-component.c:71
+msgid "Folder containing appointments and events"
+msgstr "Cartafol que cont�n citas e eventos"
+
+#: calendar/gui/calendar-component.c:75
+#, fuzzy
+msgid "Public Calendar"
+msgstr "Imprimir Axenda"
+
+#: calendar/gui/calendar-component.c:76
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Cartafol que cont�n citas e 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: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 "Tarefas"
+
+#: calendar/gui/calendar-component.c:81
+msgid "Folder containing to-do items"
+msgstr "Cartafol que cont�n elementos para-facer"
+
+#: calendar/gui/calendar-component.c:85
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Imprimir tarxetas"
+
+#: calendar/gui/calendar-component.c:86
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Cartafol que cont�n elementos para-facer"
+
+#: calendar/gui/calendar-component.c:730
+#, fuzzy
+msgid "New appointment"
+msgstr "Nova Cita"
+
+#: calendar/gui/calendar-component.c:730
+#, fuzzy
+msgid "_Appointment"
+msgstr "Cita"
+
+#: calendar/gui/calendar-component.c:731
+msgid "Create a new appointment"
+msgstr "Crear unha nova cita"
+
+#: calendar/gui/calendar-component.c:735
+#, fuzzy
+msgid "New meeting"
+msgstr "Configuraci�n da Fonte de Novas"
+
+#: calendar/gui/calendar-component.c:735
+#, fuzzy
+msgid "_Meeting"
+msgstr "Xuntanza"
+
+#: calendar/gui/calendar-component.c:736
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Crear unha nova tarefa"
+
+#: calendar/gui/calendar-component.c:740
+#, fuzzy
+msgid "New task"
+msgstr "Nova Tarefa"
+
+#: calendar/gui/calendar-component.c:740
+msgid "_Task"
+msgstr "_Tarefa"
+
+#: calendar/gui/calendar-component.c:741
+msgid "Create a new task"
+msgstr "Crear unha nova tarefa"
+
+#: 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 C_ita"
+
+#: calendar/gui/calendar-component.c:746
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Crear unha nova cita"
+
+#: 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: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�blico"
 
-#: 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
 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 "Ocupado"
 
-#: 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 "Non Iniciada"
 
-#: 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 Progreso"
 
-#: 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 "Completada"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3827,343 +4097,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 "Nada"
 
-#: calendar/gui/calendar-model.c:1723
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Recorrendo"
 
-#: calendar/gui/calendar-model.c:1725
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Asignada"
 
-#: 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 "Si"
 
-#: 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 "Non"
 
-#: calendar/gui/calendar-view-factory.c:148
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Vista Diaria"
 
-#: calendar/gui/calendar-view-factory.c:151
+#: calendar/gui/calendar-view-factory.c:121
 msgid "Work Week View"
 msgstr "Vista de Semana Laboral"
 
-#: calendar/gui/calendar-view-factory.c:154
+#: calendar/gui/calendar-view-factory.c:124
 msgid "Week View"
 msgstr "Vista Semanal"
 
-#: calendar/gui/calendar-view-factory.c:157
+#: calendar/gui/calendar-view-factory.c:127
 msgid "Month View"
 msgstr "Vista Mensual"
 
-#: 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 "Axenda"
-
-#: calendar/gui/component-factory.c:72
-msgid "Folder containing appointments and events"
-msgstr "Cartafol que cont�n citas e eventos"
-
-#: calendar/gui/component-factory.c:76
-#, fuzzy
-msgid "Public Calendar"
-msgstr "Imprimir Axenda"
-
-#: calendar/gui/component-factory.c:77
-#, fuzzy
-msgid "Public folder containing appointments and events"
-msgstr "Cartafol que cont�n citas e eventos"
-
-#: 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 "Tarefas"
-
-#: calendar/gui/component-factory.c:82
-msgid "Folder containing to-do items"
-msgstr "Cartafol que cont�n elementos para-facer"
-
-#: calendar/gui/component-factory.c:86
-#, fuzzy
-msgid "Public Tasks"
-msgstr "Imprimir tarxetas"
-
-#: calendar/gui/component-factory.c:87
-#, fuzzy
-msgid "Public folder containing to-do items"
-msgstr "Cartafol que cont�n elementos para-facer"
-
-#: calendar/gui/component-factory.c:750
-#, fuzzy
-msgid "New appointment"
-msgstr "Nova Cita"
-
-#: calendar/gui/component-factory.c:750
-#, fuzzy
-msgid "_Appointment"
-msgstr "Cita"
-
-#: calendar/gui/component-factory.c:751
-msgid "Create a new appointment"
-msgstr "Crear unha nova cita"
-
-#: calendar/gui/component-factory.c:755
-#, fuzzy
-msgid "New meeting"
-msgstr "Configuraci�n da Fonte de Novas"
-
-#: calendar/gui/component-factory.c:755
-#, fuzzy
-msgid "_Meeting"
-msgstr "Xuntanza"
-
-#: calendar/gui/component-factory.c:756
-#, fuzzy
-msgid "Create a new meeting request"
-msgstr "Crear unha nova tarefa"
-
-#: calendar/gui/component-factory.c:760
+#: calendar/gui/comp-editor-factory.c:456
 #, fuzzy
-msgid "New task"
-msgstr "Nova Tarefa"
-
-#: calendar/gui/component-factory.c:760
-msgid "_Task"
-msgstr "_Tarefa"
-
-#: calendar/gui/component-factory.c:761
-msgid "Create a new task"
-msgstr "Crear unha nova tarefa"
-
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "New All Day Appointment"
-msgstr "Nova Cita"
+msgid "Error while opening the calendar"
+msgstr "Erro ao se comunicar co servidor de axenda"
 
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "All _Day Appointment"
-msgstr "Nova C_ita"
+#: 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 "Crear unha nova cita"
+msgid "Permission denied to open the calendar"
+msgstr "Permiso denegado"
 
-#: calendar/gui/control-factory.c:123
+#: calendar/gui/control-factory.c:119
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/control-factory.c:167
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "O URI que ha amosar a axenda"
 
-#: 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 "Opci�ns das Alarmas Sonoras"
 
-#: calendar/gui/dialogs/alarm-options.c:368
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Opci�ns das Alarmas de Mensaxes"
 
-#: calendar/gui/dialogs/alarm-options.c:377
-msgid "Mail Alarm Options"
+#: calendar/gui/dialogs/alarm-options.c:438
+#, fuzzy
+msgid "Email Alarm Options"
 msgstr "Opci�ns das Alarmas de Correo"
 
-#: calendar/gui/dialogs/alarm-options.c:386
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Opci�ns de Alarma do Programa"
 
-#: calendar/gui/dialogs/alarm-options.c:395
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Opci�ns de Alarma Desco�ecidas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Alarm Repeat"
 msgstr "Repetici�n da 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
 msgid "Message to Display"
 msgstr "Mensaxe a Amosar"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "Corpo da Mensaxe"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "Tocar un son:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "Repetir a alarma"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "Executar un programa:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "Enviar como:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr "Con estes argumentos:"
 
-#: 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 "d�as"
 
-#: 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
+#, fuzzy
+msgid "dialog1"
+msgstr "Amosar un di�logo"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:12
 msgid "extra times every"
 msgstr "veces cada"
 
-#: 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 "horas"
 
-#: 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 "minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:319
-#, c-format
-msgid "%d days"
-msgstr "%d d�as"
-
-#: calendar/gui/dialogs/alarm-page.c:322
-msgid "1 day"
-msgstr "1 d�a"
-
-#: calendar/gui/dialogs/alarm-page.c:327
-#, c-format
-msgid "%d weeks"
-msgstr "%d semanas"
-
-#: calendar/gui/dialogs/alarm-page.c:330
-msgid "1 week"
-msgstr "1 semana"
-
-#: calendar/gui/dialogs/alarm-page.c:335
-#, c-format
-msgid "%d hours"
-msgstr "%d horas"
-
-#: calendar/gui/dialogs/alarm-page.c:338
-msgid "1 hour"
-msgstr "1 hora"
-
-#: calendar/gui/dialogs/alarm-page.c:343
-#, c-format
-msgid "%d minutes"
-msgstr "%d minutos"
-
-#: calendar/gui/dialogs/alarm-page.c:346
-msgid "1 minute"
-msgstr "1 minuto"
-
-#: calendar/gui/dialogs/alarm-page.c:351
-#, c-format
-msgid "%d seconds"
-msgstr "%d segundos"
-
-#: calendar/gui/dialogs/alarm-page.c:354
-msgid "1 second"
-msgstr "1 segundo"
-
-#: calendar/gui/dialogs/alarm-page.c:383
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
-msgstr "Tocar un son"
-
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
-msgstr "Amosar unha mensaxe"
-
-#: calendar/gui/dialogs/alarm-page.c:391
-msgid "Send an email"
-msgstr "Enviar unha mensaxe"
-
-#: calendar/gui/dialogs/alarm-page.c:395
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
-msgstr "Executar un programa"
-
-#: calendar/gui/dialogs/alarm-page.c:401
-#, fuzzy
-msgid "Unknown action to be performed"
-msgstr "Treboada desco�ecida"
-
-#: calendar/gui/dialogs/alarm-page.c:413
-#, fuzzy, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "antes do comezo da cita"
-
-#: calendar/gui/dialogs/alarm-page.c:416
-#, fuzzy, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "antes do comezo da cita"
-
-#: calendar/gui/dialogs/alarm-page.c:421
-#, fuzzy, c-format
-msgid "%s at the start of the appointment"
-msgstr "antes do comezo da cita"
-
-#: calendar/gui/dialogs/alarm-page.c:430
-#, fuzzy, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "antes do comezo da cita"
-
-#: calendar/gui/dialogs/alarm-page.c:433
-#, fuzzy, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "despois da fin da cita"
-
-#: calendar/gui/dialogs/alarm-page.c:438
-#, fuzzy, c-format
-msgid "%s at the end of the appointment"
-msgstr "despois da fin da cita"
-
-#: calendar/gui/dialogs/alarm-page.c:462
-#, fuzzy, c-format
-msgid "%s at %s"
-msgstr "Servidor %s %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
 msgid "Basics"
@@ -4174,46 +4257,63 @@ msgstr "B�sico"
 msgid "Date/Time:"
 msgstr "Data/Hora:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "Amosar unha mensaxe"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "Tocar un son"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Recordatorios"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "Executar un programa"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "Enviar unha mensaxe"
+
+#: 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 "Resumo:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_Opci�ns..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "despois"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "antes"
 
-#: 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 "d�a(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "fin da cita"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "hora(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 "minutos"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "comezo da cita"
 
@@ -4237,7 +4337,7 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: 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 "Alarmas"
@@ -4263,7 +4363,8 @@ msgid "Days"
 msgstr "D�as"
 
 #: 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 "Venres"
 
@@ -4276,7 +4377,8 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #: 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 "Luns"
 
@@ -4286,7 +4388,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 "S�bado"
 
@@ -4299,7 +4402,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Amosa-los _n�meros das semanas no navegador de datas"
 
 #: 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 "Domingo"
 
@@ -4318,7 +4422,8 @@ msgid "Task List"
 msgstr "Lista de _Tarefas"
 
 #: 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 "Xoves"
 
@@ -4335,7 +4440,8 @@ msgid "Time format:"
 msgstr "Formato da 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 "Martes"
 
@@ -4344,7 +4450,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 "M�rcores"
 
@@ -4387,7 +4494,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 "_Xeral"
 
@@ -4432,155 +4539,159 @@ msgstr "M�_r"
 msgid "before every appointment"
 msgstr "antes da fin da cita"
 
-#: 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 "�Est� seguro de que quere cancelar e borrar esta cita?"
 
-#: 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 "�Est� seguro de que quere cancelar e borrar esta tarefa?"
 
-#: 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 "�Est� seguro de que quere cancelar e borrar esta entrada de diario?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Este evento foi eliminado."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Esta tarefa foi eliminada."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Esta entrada de diario foi eliminada"
 
-#: 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  Fixo cambios. �Quere esquecer estes cambios e pechar o editor?"
 
-#: 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 Non fixo cambios, �quere pechar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Este evento foi modificado."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Esta tarefa foi modificada."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Esta entrada de diario foi modificada."
 
-#: 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  Fixo cambios. �Quere esquecer estes cambios e actualizar o editor?"
 
-#: 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  Non fixo cambios, �quere actualizar o editor?"
 
-#: 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 "Erro desco�ecido: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr " a "
 
-#: 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 " (Completada "
 
-#: 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 "Completada "
 
-#: 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 " (Pendente "
 
-#: 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 "Pendente "
 
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:328
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: 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 "Non foi posible actualizar os ficheiros correctamente"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Editar 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 "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "Sen resumo"
 
-#: 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 "Gardar como..."
 
-#: 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 "�Non foi posible obter a versi�n actual!"
 
@@ -4638,91 +4749,104 @@ msgstr "Delegar En:"
 msgid "Enter Delegate"
 msgstr "Introducir Delegado"
 
-#: 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 "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Recorrencia"
 
-#: 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 "_Programar Xuntanza"
 
-#: 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 "Xuntanza"
 
-#: 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 de _Inicio:"
+
+#: 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 de _comezo:"
+
+#: 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 "Evento de d�a comp_leto"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "Oc_upado"
 
-#: 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 "Clasificaci�n"
 
-#: 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_fidencial"
 
-#: 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 e Hora"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "Lib_re"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 #, fuzzy
 msgid "L_ocation:"
 msgstr ""
 "\n"
 "Localizaci�n Xeogr�fica: "
 
-#: 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_vado"
 
-#: 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�_blico"
 
-#: 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 "Amosa-lo Tempo Coma"
 
-#: 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 "_Resumo:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Contactos..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "Hora de _finalizaci�n:"
@@ -4731,20 +4855,24 @@ msgstr "Hora de _finalizaci�n:"
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
-#: 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
 #, fuzzy
 msgid "An organizer is required."
 msgstr "Debe estabrecerse un organizador."
 
-#: 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 "�Esa persoa xa asiste � xuntanza!"
 
-#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr "_Delegar En..."
 
@@ -4784,16 +4912,11 @@ msgid "Member"
 msgstr "Membro"
 
 #: 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 "Papel"
-
 #: 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
@@ -4801,13 +4924,6 @@ msgstr "Papel"
 msgid "Status"
 msgstr "Estado"
 
-#: 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 "Tipo:"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4818,106 +4934,87 @@ msgid "_Change Organizer"
 msgstr "_Cambiar Organizador"
 
 #: 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 "_Convidar Outros..."
 
-#: 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/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"
+msgid "This and Future Instances"
+msgstr "Illas Wallis e Futuna"
 
-#: 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 "Avanzado"
 
-#: calendar/gui/dialogs/recurrence-page.c:629
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita cont�n recorrencias que Evolution non pode editar."
 
-#: 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 "o"
 
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:977
 #, fuzzy
 msgid "first"
 msgstr "Br�tema"
 
-#: 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 "Outro"
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:980
 #, fuzzy
 msgid "fourth"
 msgstr "Norte"
 
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:981
 #, fuzzy
 msgid "last"
 msgstr "Br�tema"
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1004
 #, fuzzy
 msgid "Other Date"
 msgstr "Outro Fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "d�a"
 
-#: calendar/gui/dialogs/recurrence-page.c:1270
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:1455
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr "ocorrencias"
 
@@ -4981,24 +5078,29 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: 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 "A informaci�n da xuntanza cambiou. �Enviar unha versi�n actualizada?"
 
-#: 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 "A informaci�n da xuntanza cambiou. �Enviar unha versi�n actualizada?"
 
-#: 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 "A informaci�n da tarefa cambiou. �Enviar unha versi�n actualizada?"
 
-#: 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 "A informaci�n da tarefa cambiou. �Enviar unha versi�n actualizada?"
 
+#: calendar/gui/dialogs/task-details-page.c:397
+#, fuzzy
+msgid "Completed date is wrong"
+msgstr "Completada "
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -5009,42 +5111,40 @@ msgstr "% Completo"
 msgid "Date Completed:"
 msgstr "Data Completada:"
 
-#: 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 "Precisa dunha Acci�n"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "En Progreso"
 
-#: 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 "_Prioridade:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "E_stado:"
 
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "B�sico"
 
-#: 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 "Asignaci�n"
 
-#: 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 "Descrici�n:"
 
@@ -5052,140 +5152,238 @@ msgstr "Descrici�n:"
 msgid "Sta_rt Date:"
 msgstr "Data de _Inicio:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Contactos..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Data L�mite"
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d d�as"
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "1 d�a"
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d semanas"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 semana"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d horas"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 hora"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d minutos"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 minuto"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d segundos"
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "1 segundo"
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "Enviar unha mensaxe"
+
+#: calendar/gui/e-alarm-list.c:475
+#, fuzzy
+msgid "Unknown action to be performed"
+msgstr "Treboada desco�ecida"
+
+#: calendar/gui/e-alarm-list.c:487
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "antes do comezo da cita"
+
+#: calendar/gui/e-alarm-list.c:490
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "antes do comezo da cita"
+
+#: calendar/gui/e-alarm-list.c:495
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
+msgstr "antes do comezo da cita"
+
+#: calendar/gui/e-alarm-list.c:504
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "antes do comezo da cita"
+
+#: calendar/gui/e-alarm-list.c:507
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "despois da fin da cita"
+
+#: calendar/gui/e-alarm-list.c:512
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr "despois da fin da cita"
+
+#: calendar/gui/e-alarm-list.c:536
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "Servidor %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: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
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Elimina-los contactos seleccionados"
 
-#: 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 "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:951
 #, fuzzy
 msgid "_Save as..."
 msgstr "Gardar como..."
 
-#: 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 "_Imprimir..."
 
-#: 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 "Co_rtar"
 
-#: 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 "_Copiar"
 
-#: 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 "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:962
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Asignar Tarefa"
 
-#: calendar/gui/e-calendar-table.c:1000
+#: calendar/gui/e-calendar-table.c:963
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Remitir como i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "_Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:965
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marca-las Tarefas como Completas"
 
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "_Borra-las Tarefas Seleccionadas"
 
-#: 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 "Prema para engadir unha tarefa"
@@ -5194,8 +5392,8 @@ msgstr "Prema para engadir unha tarefa"
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: 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 "Completo"
 
@@ -5224,8 +5422,8 @@ msgid "Start Date"
 msgstr "Data de _Inicio:"
 
 #: 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 "Resumo"
 
@@ -5233,19 +5431,15 @@ msgstr "Resumo"
 msgid "Task sort"
 msgstr "Ordeamento das tarefas"
 
-#: 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"
 
@@ -5260,143 +5454,221 @@ 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 divisi�ns de 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: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 de %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 "Nova C_ita"
 
-#: 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 "Novo _Evento de D�a Completo"
 
-#: 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 "Xuntanza"
 
-#: 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 "Nova Tarefa"
 
-#: 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 "Imprimir..."
 
-#: 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 "Ir a _Hoxe"
 
-#: 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 "_Ir � 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
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar Informaci�n de Libre/Ocupado"
 
-#: 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 "_Preferencias de Correo..."
 
-#: 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 "Gardar _Como..."
 
-#: 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 "_Programar Xuntanza"
 
-#: 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 "Remitir como i_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
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta Ocorrencia _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
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: 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 "Borrar _T�dalas Ocorrencias"
 
-#: calendar/gui/e-itip-control.c:615
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Yes. (Complex Recurrence)"
+msgstr "Recorrencia _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 "%d d�as"
+
+#: 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 "%d semanas"
+
+#: 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 semanas"
+
+#: calendar/gui/e-itip-control.c:739
+#, fuzzy
+msgid " and "
+msgstr "Area"
+
+#: 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 "Un m_es"
+
+#: 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 do _final da reuni�n:"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:851
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Completada "
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:861
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "<b>Descrici�n:</b> %s"
 
-#: 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 "informaci�n de axenda"
 
 #. Title
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:913
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Axenda"
 
-#: 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 "un remitente desco�ecido"
 
 #. 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."
@@ -5404,357 +5676,358 @@ msgstr ""
 "<br> Por favor, olle a seguinte informaci�n, e escolla unha acci�n do men� "
 "de embaixo."
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Ningunha</i>"
 
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Location:"
 msgstr ""
 "\n"
 "Localizaci�n Xeogr�fica: "
 
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-itip-control.c:1073
 #, fuzzy
 msgid "Status:"
 msgstr "E_stado:"
 
-#: 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 "Aceptado"
 
-#: 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 " Tentativa "
 
-#: 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 "Rexeitado"
 
-#: 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 "Desco�ecido"
 
-#: 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 "Escolla unha Acci�n"
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:1146
 #, fuzzy
 msgid "Update"
 msgstr "Actualizaci�n de Tarefa"
 
-#: 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 "Aceptar"
 
-#: calendar/gui/e-itip-control.c:955
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "Accept"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:1175
 #, fuzzy
 msgid "Tentatively accept"
 msgstr " Tentativa "
 
-#: calendar/gui/e-itip-control.c:957
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Decline"
 msgstr "Rexeitado"
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:1200
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Informaci�n de Libre/Ocupado"
 
-#: 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 "Informaci�n da Tarefa"
 
-#: 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 "Cancelar"
 
-#: 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> publicou informaci�n sobre unha reuni�n."
 
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Informaci�n da Xuntanza"
 
-#: 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> require a s�a presencia nunha reuni�n."
 
-#: 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> require a s�a presencia nunha reuni�n."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Proposta de Xuntanza"
 
-#: 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> desexa asistir a unha reuni�n existente."
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Actualizaci�n da Xuntanza"
 
-#: 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> desexa recibir a �ltima informaci�n sobre a reuni�n."
 
-#: calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "_Solicitude de Actualizaci�n de Xuntanza"
 
-#: 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> respostou a unha petici�n de xuntanza."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Resposta de Xuntanza"
 
-#: 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> cancelou unha reuni�n."
 
-#: calendar/gui/e-itip-control.c:1136
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Cancelaci�n da Xuntanza"
 
-#: 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> enviou unha mensaxe inintelixible."
 
-#: calendar/gui/e-itip-control.c:1144
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Mensaxe Incorrecta sobre a Xuntanza"
 
-#: 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> publicou informaci�n sobre tarefa."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Informaci�n da Tarefa"
 
-#: 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> require que se encargue dunha tarefa."
 
-#: 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> require que se encargue dunha tarefa."
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Proposta de Tarefas"
 
-#: 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> desexa asistir a unha tarefa existente."
 
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Actualizaci�n de Tarefa"
 
-#: 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> desexa recibir a �ltima informaci�n sobre a tarefa."
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Petici�n de Actualizaci�n de Tarefa"
 
-#: 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> respostou a unha asignaci�n de tarefa."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Resposta � Tarefa"
 
-#: 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> cancelou unha tarefa."
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Cancelaci�n de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Mensaxe Incorrecta sobre a Tarefa"
 
-#: 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> publicou informaci�n de libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Informaci�n de Libre/Ocupado"
 
-#: 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> require a s�a informaci�n libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Petici�n de Libre/Ocupado"
 
-#: 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> respostou a unha petici�n de libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Resposta de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Mensaxe de Libre/Ocupado Incorrecta"
 
-#: 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 "O cartafol parece estar corrompido sen recuperaci�n posible."
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1604
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Esta mensaxe s� cont�n destinatarios Bcc."
 
-#: 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
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Houbo un erro ao descarga-la fonte de novas"
 
-#: 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 "�Non se puido envia-lo elemento!\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 "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Actualizaci�n completada\n"
 
-#: calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1922
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "�Non se puido envia-lo elemento!\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 "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/e-itip-control.c:1766
+#: calendar/gui/e-itip-control.c:2011
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:2014
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1804
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Eliminaci�n Completa"
 
-#: 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 "�Elemento enviado!\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 "�Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1961
+#: calendar/gui/e-itip-control.c:2206
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Seleccionar Cartafol"
 
-#: calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:2213
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Seleccionar Cartafol"
@@ -5796,223 +6069,227 @@ msgstr "data-finalizaci�n"
 msgid "date-start"
 msgstr "data-comezo"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr "Presidentes"
 
-#: 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 "Participantes Requiridos"
 
-#: calendar/gui/e-meeting-model.c:86
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr "Participantes Opcionais"
 
-#: calendar/gui/e-meeting-model.c:87
+#: calendar/gui/e-meeting-model.c:83
 #, fuzzy
 msgid "Resources"
 msgstr "Recurso"
 
-#: 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 "Individual"
 
-#: 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 "Grupo"
 
-#: 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 "Recurso"
 
-#: 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 "Cuarto"
 
-#: 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 "Presidencia"
 
-#: 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 "Participantes Requiridos"
 
-#: 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 "Participante Opcional"
 
-#: 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 "Non-Participante"
 
-#: 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 "Precisa dunha 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:406
 msgid "Tentative"
 msgstr "Tentativa"
 
-#: 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 "Delegado"
 
-#: 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 "En Progreso"
 
 #. 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 "F�ra da Oficina"
 
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Sen Informaci�n"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Opci�ns"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Amosar _S� as Horas de Traballo"
 
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Amozar sen _Zoom"
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "_Actualizar Libres/Ocupadas"
 
-#: 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 "_Autoescoller"
 
-#: 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 "_T�dalas Persoas e Recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "T�dalas _Persoas e Un Recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "Persoas _Requiridas"
 
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Persoas Requiridas e _Un Recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:654
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Hora do _inicio da reuni�n:"
 
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Hora do _final da reuni�n:"
 
-#: 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 "Abrindo armacenamento %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 "Non foi posible cargar as tarefas 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 "O m�todo requirido para cargar `%s' non est� soportado"
 
-#: 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 "Non foi posible abrir o cartafol en `%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 "Erro ao iniciar %s"
 
-#: calendar/gui/e-tasks.c:540
+#: calendar/gui/e-tasks.c:554
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-tasks.c:563
+#: calendar/gui/e-tasks.c:577
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-tasks.c:656
+#: calendar/gui/e-tasks.c:672
 #, fuzzy
 msgid "Expunging"
 msgstr "Limpar"
 
-#: calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: calendar/gui/gnome-cal.c:1530
+#: calendar/gui/gnome-cal.c:1503
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Non foi posible abrir o cartafol en `%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 "O m�todo requirido para cargar `%s' non est� soportado"
 
-#. 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 "Alarmas"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6020,7 +6297,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"
@@ -6028,7 +6305,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 "Abrir axenda"
@@ -6094,330 +6371,185 @@ msgstr "outubro"
 msgid "September"
 msgstr "setembro"
 
-#: 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 "Debe estabrecerse un organizador."
 
-#: 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 "informaci�n de axenda"
 
-#: 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 "Informaci�n da Tarefa"
 
-#: 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 "Informaci�n Opcional"
 
-#: 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 "Informaci�n de Libre/Ocupado"
 
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:394
 #, fuzzy
 msgid "Calendar information"
 msgstr "informaci�n de axenda"
 
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:430
 #, fuzzy
 msgid "Updated"
 msgstr "Actualizaci�n de Tarefa"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:438
 #, fuzzy
 msgid "Refresh"
 msgstr "Actualizar Lista"
 
-#: 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 "Informaci�n de Libre/Ocupado"
 
-#: calendar/gui/itip-utils.c:598
+#: calendar/gui/itip-utils.c:525
 #, fuzzy
 msgid "iCalendar information"
 msgstr "informaci�n de axenda"
 
-#: 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 "Non foi posible inicializar Bonobo"
-
-#: calendar/gui/main.c:99
-#, fuzzy
-msgid "Could not create the component editor factory"
-msgstr "Non foi posible crear a f�brica do servicio de notificaci�ns de alarma"
-
-#: 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 "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 "Me"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "Xo"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "S�"
 
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr "D�a seleccionado (%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 de %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
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana seleccionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr "Mes seleccionado (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr "Ano seleccionado (%Y)"
 
-#: calendar/gui/print.c:2249
+#: calendar/gui/print.c:2267
 #, fuzzy
 msgid "Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2326
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "E_stado:"
 
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Prioridade:"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2358
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada"
 
-#: 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"
 "Categor�as: "
 
-#: calendar/gui/print.c:2375
+#: calendar/gui/print.c:2395
 #, fuzzy
 msgid "Contacts: "
 msgstr "Co_ntactos:"
 
-#: calendar/gui/print.c:2430
-msgid "Print Calendar"
-msgstr "Imprimir Axenda"
-
-#: 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 "Previsualizaci�n da Impresi�n"
 
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "Imprimir Elemento"
 
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "Configuraci�n da Impresi�n"
 
-#: calendar/gui/tasks-control-factory.c:75
-#, fuzzy
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Non foi posible crear o visor da axenda. Comprobe a s�a configuraci�n de "
-"ORBit e OAF."
-
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr "O URI do cartafol de tarefas a amosar"
 
-#: 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 "
@@ -6430,96 +6562,54 @@ msgstr ""
 "\n"
 "�Eliminar realmente estas mensaxes?"
 
-#: 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 "Non preguntar de novo"
 
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:615
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Imprimir tarxetas"
 
-#: 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 colleu as tarefas que estaban no cartafol da axenda e migrounas "
-"automaticamente ao novo cartafol de tarefas."
-
-#: 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 tentou coller as tarefas que estaban no cartafol da axenda e "
-"migralas automaticamente ao novo cartafol de tarefas.\n"
-"Non foi posible migrar algunhas das tarefas, as� que pode tentar facerse "
-"este proceso outra vez no futuro."
-
-#: 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 ""
-"Non se puido abrir `%s'; non se migrar�n obxectos do cartafol da axenda ao "
-"de tarefas."
-
-#: 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 ""
-"Non est� soportado o m�todo requirido para cargar `%s'; non se migrar�n "
-"obxectos do cartafol da axenda ao de tarefas."
-
-#: 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 "DLMMXVS"
 
-#: 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 "F�brica para importar ficheiros VCard a Evolution."
+msgid "Evolution Calendar intelligent importer"
+msgstr "Visor da axenda iTip/iMip de 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 "Importa ficheiros VCard a Evolution."
+msgid "Evolution iCalendar importer"
+msgstr "Visor da axenda iTip/iMip de 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 "Importa ficheiros VCard a Evolution."
+msgid "Evolution vCalendar importer"
+msgstr "Visor da axenda iTip/iMip de Evolution"
 
-#: calendar/importers/icalendar-importer.c:168
-#, fuzzy, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr ""
-"Non � posible obter a mensaxe: %s do cartafol %s\n"
-"  %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Mensaxe da Axenda"
 
-#: calendar/importers/icalendar-importer.c:180
-#, fuzzy, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "Non foi posible conectarse � servidor: %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 "Recordatorio"
 
-#: calendar/importers/icalendar-importer.c:697
+#: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Mensaxe da Axenda"
 
-#: calendar/importers/icalendar-importer.c:722
+#: calendar/importers/icalendar-importer.c:663
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6528,11 +6618,15 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Pine.\n"
 "�Gostar�alle importalos a Evolution?"
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:670
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Axenda"
 
+#: 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 espera 0 argumentos"
@@ -8282,30 +8376,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 "As sinaturas non est�n soportadas por este cifrado"
 
-#: camel/camel-cipher-context.c:210
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr "A verificaci�n non est� soportada neste cifrado"
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr "Non se soporta o cifrado con esta cifra"
 
-#: camel/camel-cipher-context.c:296
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr "Non est� soportado o descifrado desta cifra"
 
-#: camel/camel-data-cache.c:169
+#: camel/camel-cipher-context.c:342
+#, fuzzy
+msgid "You may not import keys with this cipher"
+msgstr "Non est� soportado o descifrado desta cifra"
+
+#: camel/camel-cipher-context.c:374
+#, fuzzy
+msgid "You may not export keys with this cipher"
+msgstr "Non est� soportado o descifrado desta cifra"
+
+#: camel/camel-data-cache.c:133
 #, fuzzy
 msgid "Unable to create cache path"
 msgstr ""
 "Non foi posible crear o ficheiro de sa�da: %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 "Non foi posible abrir o directorio de cach�: %s"
@@ -8345,87 +8449,94 @@ msgstr "Creando o cartafol %s"
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar traballando conectado para completar esta operaci�n"
 
-#: 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 "Non se puido descodifica-la mensaxe."
+
+#: 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 "Non se puido descodifica-la mensaxe."
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "Non foi posible crear o directorio %s: %s"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Sincronizando cartafoles"
 
-#: 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 "Erro ao analizar o filtro: %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 "Erro ao executar o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Incapaz de abrir o cartafol spool"
 
-#: camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Incapaz de procesar o cartafol spool"
 
-#: camel/camel-filter-driver.c:966
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Recibindo a mensaxe %d (%d%%)"
 
-#: camel/camel-filter-driver.c:970
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: 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 "Fallo na mensaxe %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 "Sincronizando cartafol"
 
-#: camel/camel-filter-driver.c:1058
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Argumentos non v�lidos"
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Argumentos non v�lidos"
 
-#: camel/camel-filter-search.c:514
-#, fuzzy, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Non se puido descodifica-la mensaxe."
-
-#: camel/camel-filter-search.c:550
-#, fuzzy, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Non se puido descodifica-la mensaxe."
-
-#: 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 "Erro ao executar a busca por filtro: %s: %s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8434,7 +8545,7 @@ msgstr ""
 "Non se pode analizar a expresi�n de busca: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8443,11 +8554,11 @@ msgstr ""
 "Erro ao executar a expresi�n de busca: %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 "(coinciden-todas) require un �nico resultado booleano"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Efectuando petici�n sobre a cabeceira desco�ecida: %s"
@@ -8481,7 +8592,7 @@ msgstr "Copiando as mensaxes"
 msgid "Copying messages"
 msgstr "Copiando as mensaxes a %s"
 
-#: camel/camel-gpg-context.c:697
+#: camel/camel-gpg-context.c:724
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8489,72 +8600,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 "Cancelado."
 
-#: 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 do servidor IMAP: %s"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:814
 #, fuzzy
 msgid "No data provided"
 msgstr "Non se especificou un nome de cartafol"
 
-#: camel/camel-gpg-context.c:830
+#: camel/camel-gpg-context.c:857
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: 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 "Non se puido descodifica-la mensaxe."
 
-#: 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 "Non se puido descodifica-la mensaxe."
 
-#: 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 "Non se puido descodifica-la mensaxe."
 
-#: 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 "Non se puido descodifica-la mensaxe."
 
-#: 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 "Non foi posible crear o ficheiro temporal: %s"
@@ -8579,25 +8691,24 @@ msgstr "Non se puido bloquear '%s': erro de protocolo con lock-helper"
 msgid "Could not lock '%s'"
 msgstr "Non se puido bloquear '%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 "Non foi posible crear o ficheiro de bloqueo para %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 ""
 "A operaci�n expirou tentando obter o ficheiro de bloqueo sobre %s. T�nteo de "
 "novo m�is tarde."
 
-#: camel/camel-lock.c:206
+#: camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Non se puido obter un bloqueo usando 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 "Non se puido obter un bloqueo usando flock(2): %s"
@@ -8607,51 +8718,51 @@ msgstr "Non se puido obter un bloqueo usando flock(2): %s"
 msgid "Could not check mail file %s: %s"
 msgstr "Non foi posible comprobar o ficheiro de correo %s: %s"
 
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Non foi posible abrir o ficheiro de correo %s: %s"
 
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Non foi posible abrir o ficheiro de correo temporal %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 "Non se puido armacenar o correo no ficheiro temporal %s: %s"
 
-#: camel/camel-movemail.c:188
+#: camel/camel-movemail.c:187
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Non foi posible crear unha canalizaci�n: %s"
 
-#: camel/camel-movemail.c:200
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Non foi posible facer fork: %s"
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:237
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "O programa movemail fallou: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 msgid "(Unknown error)"
 msgstr "(Erro desco�ecido)"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Erro ao ler o ficheiro de correo: %s"
 
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Erro ao escribir o ficheiro temporal de correo: %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 "Erro ao copiar o ficheiro temporal de correo: %s"
@@ -8668,27 +8779,27 @@ 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 "Outro erro"
 
-#: 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 ""
 "Non foi posible cargar %s: Non se soporta a carga de m�dulos neste sistema."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:141
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Non foi posible cargar %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 "Non foi posible cargar %s: Non hai c�digo de inicializaci�n no m�dulo."
@@ -8744,11 +8855,11 @@ msgstr ""
 "Esta opci�n conectarase � servidor usando un contrasinal seguro CRAM-MD5, se "
 "o servidor o soporta."
 
-#: 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."
@@ -8756,41 +8867,117 @@ msgstr ""
 "Esta opci�n conectarase � servidor usando un contrasinal seguro DIGEST-MD5, "
 "se o servidor o soporta."
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Desaf�o do servidor longo de m�is (>2048 octetos)\n"
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr "Desaf�o do servidor non v�lido\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 ""
 "O desaf�o do servidor conti�a un elemento \"Quality of Protection"
 "\" (\"Calidade da Protecci�n\") non v�lido\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 "A resposta do servidor non conti�a datos de autorizaci�n\n"
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr "A resposta do servidor conti�a datos incompletos de autorizaci�n\n"
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr "A resposta do servidor non coincide\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 "Esta opci�n conectarase � servidor usando autenticaci�n 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 "Mala resposta de autenticaci�n do servidor."
+
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "Non se puido descodifica-la mensaxe."
+
+#: camel/camel-sasl-gssapi.c:299
+#, fuzzy
+msgid "Unsupported security layer."
+msgstr "Dete_ctar tipos soportados "
+
+#: 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 "Esta opci�n conectarase � servidor usando autenticaci�n Kerberos 4."
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -8799,11 +8986,6 @@ msgstr ""
 "Non foi posible obter un billete de Kerberos:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1059
-msgid "Bad authentication response from server."
-msgstr "Mala resposta de autenticaci�n do servidor."
-
 #: camel/camel-sasl-login.c:32
 #, fuzzy
 msgid "Login"
@@ -8852,7 +9034,7 @@ msgstr "Autorizaci�n POP antes de SMTP usando un transporte desco�ecido"
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "Autorizaci�n POP antes de SMTP usando unha fonte non-pop"
 
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fallo na compilaci�n da expresi�n regular: %s: %s"
@@ -8872,37 +9054,37 @@ msgstr "O URL '%s' necesita unha parte co nome de m�quina"
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita unha parte coa ruta"
 
-#: camel/camel-service.c:743
+#: camel/camel-service.c:741
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %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 "Fallo na b�squeda do nome: %s"
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Fallo na busca do servidor: %s: servidor non atopado"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Fallo na busca do servidor: %s: motivo desco�ecido"
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 #, fuzzy
 msgid "Resolving address"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Fallo na busca do servidor: %s: servidor non atopado"
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Fallo na busca do servidor: %s: motivo desco�ecido"
@@ -8915,12 +9097,12 @@ msgstr "Fornecedor de correo do cartafol virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para ler correo coma unha petici�n de outro conxunto de cartafoles"
 
-#: 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 "Non hai ning�n fornecedor dispo�ible para o protocolo `%s'"
 
-#: camel/camel-session.c:545
+#: camel/camel-session.c:548
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8929,181 +9111,181 @@ msgstr ""
 "Non foi posible crear o directorio %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 "Introduza o seu contrasinal para %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 "Por favor, indique o alcume dun certificado co que asinar."
 
-#: camel/camel-smime-context.c:209
+#: camel/camel-smime-context.c:207
 #, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr "O certificado da sinatura de \"%s\" non existe."
 
-#: camel/camel-smime-context.c:249
+#: camel/camel-smime-context.c:247
 #, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "O certificado de cifrado de \"%s\" non existe."
 
-#: 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 "Non se puido atopa-lo certificado de \"%s\"."
 
-#: camel/camel-smime-context.c:556
+#: camel/camel-smime-context.c:554
 msgid "Failed to find a common bulk algorithm."
 msgstr "Non se puido atopar un algoritmo bulk com�n."
 
-#: camel/camel-smime-context.c:810
+#: camel/camel-smime-context.c:808
 msgid "Failed to decode message."
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
 msgid "Failed to verify certificates."
 msgstr "Non se puido verifica-los certificados."
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 #, fuzzy
 msgid "Unable to get issuer's certificate"
 msgstr "Non se puido verifica-los certificados."
 
-#: 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 "Non se puido verifica-los certificados."
 
-#: 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 "Ficheiro de sinatura:"
 
-#: 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 do certificado:"
 
-#: 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 "Erro ao cargar %s"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 #, fuzzy
 msgid "Out of memory"
 msgstr "F�ra da 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 "Non se puido verifica-los certificados."
 
-#: 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 do certificado:"
 
-#: 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 "Argumentos non v�lidos"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 #, fuzzy
 msgid "Certificate untrusted"
 msgstr "ID do certificado:"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 #, fuzzy
 msgid "Certificate rejected"
 msgstr "ID do certificado:"
 
-#: 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"
@@ -9112,15 +9294,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"
@@ -9138,7 +9320,7 @@ msgstr ""
 "�Desexa aceptar de todas maneiras?"
 
 #. 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"
@@ -9153,35 +9335,35 @@ msgstr ""
 "\n"
 "�Desexa aceptar de todas maneiras?"
 
-#: 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 do certificado:"
 
-#: 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 do certificado:"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Non foi posible analizar o URL `%s'"
@@ -9196,44 +9378,44 @@ msgstr "Erro ao iniciar %s"
 msgid "No such message %s in %s"
 msgstr "Non existe a mensaxe %s en %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 "Comprobar as novas mensaxes en t�dolos cartafoles"
 
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:261
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%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 ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Non foi posible renomear o cartafol: %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 "Non foi posible renomear o cartafol %s a %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
 msgid "Operation cancelled"
 msgstr "Operaci�n cancelada"
 
 #: 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 "O servidor desconectou inesperadamente"
@@ -9256,52 +9438,52 @@ msgstr "Resposta inesperada do servidor IMAP: %s"
 msgid "IMAP command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr "A resposta do servidor rematou cedo de m�is."
 
-#: 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 "A resposta do servidor IMAP non conti�a informaci�n sobre %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 positiva inesperada do 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 "Non foi posible crear o directorio %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 "Non foi posible carga-lo resumo de %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 "O cartafol foi destruido e rexenerado no servidor."
 
 #. 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 "Buscando mensaxes cambiadas"
 
-#: 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 "Non se puido descodifica-la mensaxe."
 
-#: 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"
@@ -9310,24 +9492,24 @@ msgstr ""
 "Non � posible obter a mensaxe: %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 "Non existe a mensaxe"
 
-#: 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 "Esta mensaxe non est� dispo�ible actualmente."
 
-#: 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 "Recollendo informaci�n de resumo para as mensaxes novas"
 
-#: 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 "Non foi posible atopar o corpo da mensaxe na resposta FETCH."
 
@@ -9357,7 +9539,7 @@ msgstr "Comprobando o novo correo"
 msgid "Check for new messages in all folders"
 msgstr "Comprobar as novas mensaxes en t�dolos cartafoles"
 
-#: 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 "Cartafoles"
 
@@ -9387,7 +9569,7 @@ msgstr "Para ler e almacenar correo en servidores 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 "Contrasinal"
 
@@ -9406,62 +9588,61 @@ msgstr "Servidor de SMTP %s"
 msgid "IMAP service for %s on %s"
 msgstr "Servicio %s para %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
 msgid "Connection cancelled"
 msgstr "Conexi�n cancelada"
 
-#: 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 "Non foi posible conectarse a %s (porto %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 ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o nome de usuario: %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�n non soportada"
 
-#: 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 "A autenticaci�n fallou."
 
-#: 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 "O servidor IMAP %s non soporta o tipo de autenticaci�n %s solicitado."
 
-#: 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 "Non hai soporte para o tipo de autenticaci�n %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 "%sIntroduza o contrasinal IMAP para %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 "Non introduciu un contrasinal."
 
-#: 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"
@@ -9472,24 +9653,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 "Non existe o cartafol %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 "O nome do cartafol non pode conter o car�cter 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 "Erro desco�ecido: %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 "Non se lle permite ao cartafol pai conter subcartafoles"
 
@@ -9569,8 +9750,8 @@ msgstr ""
 "Para ler e armacenar correo local en ficheiros spool est�ndar de tipo mbox."
 
 #: 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 "A ra�z de almacenamento %s non � unha ruta absoluta"
@@ -9582,36 +9763,36 @@ msgstr "O ra�z de armacenamento %s non � un directorio normal."
 
 #: 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 "Non � posible obter o cartafol: %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 "Os armacenamentos locais non te�en un 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 "Ficheiro local de correo %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 "Non foi posible renomear o cartafol %s a %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 "Non foi posible renomear o cartafol: %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 "Non foi posible borrar o ficheiro de resumo de cartafol `%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 "Non foi posible borrar o ficheiro de �ndice de cartafol `%s': %s"
@@ -9621,7 +9802,7 @@ msgstr "Non foi posible borrar o ficheiro de �ndice de cartafol `%s': %s"
 msgid "Could not save summary: %s: %s"
 msgstr "Non foi posible carga-lo resumo de %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 "Incapaz de engadir a mensaxe ao resumo: motivo desco�ecido"
 
@@ -9635,14 +9816,14 @@ msgstr "Fallo na mensaxe %d"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Non se pode engadir a mensaxe ao cartafol 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 "Contido da mensaxe non v�lido"
 
 #: 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"
@@ -9654,14 +9835,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 "O cartafol `%s' non existe."
 
 #: 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"
@@ -9676,72 +9857,72 @@ msgid "`%s' is not a maildir directory."
 msgstr "`%s' non � un directorio 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 "Non foi posible borrar o cartafol `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:169
 msgid "not a maildir directory"
 msgstr "non � un directorio 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 "Non foi posible examina-lo cartafol `%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 "Non se pode abri-la ruta do directorio maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:539
+#: camel/providers/local/camel-maildir-summary.c:541
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Comprobando o novo correo"
 
-#: camel/providers/local/camel-maildir-summary.c:640
+#: camel/providers/local/camel-maildir-summary.c:644
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Buscando mensaxes novas"
 
-#: 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 "Sincronizando cartafol"
 
-#: 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 "Non se pode crear bloqueo de cartafol en %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 "Non se pode abri-la caixa do correo: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:278
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Operaci�n cancelada"
 
-#: 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 "Non se pode engadir a mensaxe ao ficheiro 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"
@@ -9750,11 +9931,11 @@ msgstr ""
 "Non � posible obter a mensaxe: %s do cartafol %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 "O cartafol parece estar corrompido sen recuperaci�n posible."
 
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Contrucci�n da mensaxe fallida: �mailbox corrompido?"
 
@@ -9797,80 +9978,80 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "O cartafol `%s' non est� baleiro. Non borrado."
 
-#: 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 ""
 "Non � posible abrir o cartafol `%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 ""
 "Erro grave do analizador de correo preto da posici�n %ld no cartafol %s"
 
-#: 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 "Non � posible obter o cartafol: %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 ""
 "Non foi posible abrir o ficheiro %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 "Non � posible abrir a caixa de correo 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 "Non foi posible pechar o cartafol orixe %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 "Non foi posible pechar o cartafol 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 "Non foi posible renomear o cartafol: %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 "O resumo e o cartafol non concordan, mesmo logo de sincronizar"
 
-#: 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 "Erro desco�ecido: %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 "Non foi posible renomear o cartafol: %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 "Erro ao escribir � caixa de correo temporal: %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 "Erro escribindo � caixa de correo temporal: %s: %s"
@@ -9890,67 +10071,67 @@ msgstr "Non � posible engadir a mensaxe � cartafol mh: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' non � un directorio."
 
-#: 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 "Non foi posible abrir a ruta do directorio 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 "Non se pode renomear os cartafoles 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 "O ra�z de armacenamento %s non � un directorio 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 "O cartafol `%s/%s' non existe."
 
-#: 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' non � un ficheiro normal."
 
-#: 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 "Ficheiro spool de correo %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 "Non se pode renomear os cartafoles spool"
 
-#: camel/providers/local/camel-spool-store.c:213
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr "Non se pode renomear os cartafoles spool"
 
-#: camel/providers/local/camel-spool-store.c:221
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr "Os cartafoles spool non se poden eliminar"
 
-#: 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 "Non foi posible sincroniza-lo cartafol temporal %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 "Non se puido sincroniza-lo cartafol 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 ""
@@ -10031,45 +10212,45 @@ msgid "Retrieving POP summary"
 msgstr "Recibindo o resumo de 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 "Operaci�n cancelada"
 
-#: 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 "Non � posible obter o cartafol: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:306
+#: camel/providers/pop3/camel-pop3-folder.c:308
 msgid "Expunging deleted messages"
 msgstr "Eliminando as mensaxes borradas"
 
-#: 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 "Non existe a mensaxe con 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 "Recibindo a mensaxe 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 ""
 "Non � posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Precipitaci�n desco�ecida"
@@ -10087,7 +10268,7 @@ msgstr "Deixar as mensaxes no servidor"
 msgid "Delete after %s day(s)"
 msgstr "Borrar despois de %s d�a(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"
 
@@ -10113,27 +10294,27 @@ msgstr ""
 "trav�s do protocolo APOP. Pode que isto non funcione para t�dolos usuarios, "
 "mesmo nalg�ns servidores que indican que o soportan."
 
-#: 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 "Non foi posible conectarse a %s (porto %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 ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o nome de usuario: %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 "Non foi posible conectarse � 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 "
@@ -10142,28 +10323,28 @@ msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Non hai soporte para o mecanismo de autenticaci�n solicitado."
 
-#: 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 "O comando IMAP fallou: %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 "Non foi posible autenticarse co 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 "%sIntroduza o contrasinal POP3 para %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"
@@ -10172,13 +10353,13 @@ msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o contrasinal: %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 "Non existe o cartafol `%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"
 
@@ -10189,52 +10370,52 @@ msgid ""
 msgstr ""
 "Para entregar o correo pas�ndollo � programa \"sendmail\" no 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 "Non foi posible analizar o 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 ""
 "Non foi posible crear unha canalizaci�n para o sendmail: %s: correo non "
 "enviado"
 
-#: 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 "Non foi posible facer fork para o sendmail: %s: correo non enviado"
 
-#: 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 "Non foi posible enviar a mensaxe: %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 sa�u co sinal %s: correo non enviado."
 
-#: 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 "Non foi posible executar %s: correo non enviado."
 
-#: 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 sa�u con estado %d: correo non enviado."
 
-#: 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 "Entrega de correo a trav�s do 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 "SMTP"
 
@@ -10244,145 +10425,145 @@ msgstr ""
 "Para entregar correo por conexi�n a un servidor de correo remoto usando "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr "Erro de sintaxe, comando non reco�ecido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr "Erro de sintaxe nos par�metros ou argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr "Comando non implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr "Par�metro do comando non implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr "Resposta do estado do sistema ou da axuda do sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr "Mensaxe de axuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr "Servicio preparado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr "Servicio pechando a canle de transmisi�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr "Servicio non dispo�ible, pechando a canle de transmisi�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr "Acci�n de correo pedida exitosa, completada"
 
-#: 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 "O usuario non � local; remitirase a <ruta de env�o>"
 
-#: 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 ""
 "A acci�n de correo pedida non foi levada a cabo: caixa de correo non "
 "dispo�ible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "A acci�n pedida non foi levada a cabo: caixa de correo non dispo�ible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr "Abortouse a acci�n solicitada: erro ao procesar"
 
-#: 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 "Usuario non local; t�nteo con <ruta-de-env�o>"
 
-#: 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 ""
 "A acci�n pedida non foi levada a cabo: insuficiente armacenamento no sistema"
 
-#: 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 ""
 "Abortouse a acci�n solicitada: excedeuse da asignaci�n de armacenamento"
 
-#: 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 ""
 "A acci�n pedida non foi levada a cabo: nome de caixa de correo non admitido"
 
-#: 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 "Comeza a introducci�n da mensaxe; remate con <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr "A transacci�n fallou"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr "Prec�sase unha transici�n de contrasinal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr "O mecanismo de autenticaci�n � feble de m�is"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Neces�tase cifrado para o mecanismo de autenticaci�n solicitado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr "Fallo temporal de autenticaci�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "Autenticaci�n requirida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Erro na resposta 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 ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o nome de usuario: %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 "O cartafol parece estar corrompido sen recuperaci�n posible."
 
-#: 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 "A petici�n AUTH expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Erro na resposta 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 "O servidor SMTP %s non soporta o tipo de autenticaci�n %s requirida"
 
-#: 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 "%sIntroduza o contrasinal SMTP para %s@%s"
@@ -10412,11 +10593,11 @@ msgstr "Entrega de correo SMTP v�a %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Non se pode enviar a mensaxe: enderezo do autor non v�lido"
 
-#: 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 "Enviando a mensaxe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:703
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
@@ -10425,63 +10606,63 @@ msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr "Sa�do 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 "A petici�n RSET expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 #, fuzzy
 msgid "HELO response error"
 msgstr "Erro na resposta RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr "Autenticaci�n SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr "Erro ao crear o obxecto de autenticaci�n 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 "A petici�n AUTH expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr "A petici�n AUTH fallou."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr "Mala resposta de autenticaci�n do servidor.\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 "A petici�n MAIL FROM expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Erro na resposta MAIL FROM: %s: correo non enviado"
 
-#: 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 "A petici�n RCPT TO expirou: %s: correo non enviado"
 
-#: 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 "A petici�n DATA expirou: %s: correo non enviado"
@@ -10489,81 +10670,81 @@ msgstr "A petici�n DATA expirou: %s: correo non enviado"
 #. 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 "Erro na resposta 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 "O env�o de DATA expirou: remate da mensaxe: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Mala resposta de autenticaci�n do servidor."
 
-#: 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 "A petici�n RSET expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 #, fuzzy
 msgid "RSET response error"
 msgstr "Erro na resposta 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 "A petici�n AUTH expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Erro na resposta 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 "anexo"
 
-#: 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 "Eliminar os elementos seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:551
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Engadir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:552
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "Anexar un ficheiro � mensaxe"
 
-#: 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 "Non � posible obter o cartafol: %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 "Ese non � un ficheiro normal."
@@ -10581,11 +10762,15 @@ msgid "MIME type:"
 msgstr "Tipo 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 "Suxerir que se amose o anexo automaticamente"
 
-#: 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 "Prema aqu� para o libro de enderezos"
 
@@ -10596,45 +10781,45 @@ msgstr "Prema aqu� para o libro de enderezos"
 #. * 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 "Responder-A:"
 
 #.
 #. * 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 "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:432
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: 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 "Introduza os enderezos que recibir�n unha copia da mensaxe"
 
-#: 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."
@@ -10645,27 +10830,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 "descrici�n"
 
-#: 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 "Anexar un ficheiro"
 
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:533
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Non foi posible crear un contexto de sinatura PGP."
 
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10674,34 +10860,30 @@ msgstr ""
 "Erro ao le-lo ficheiro %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1160
-msgid "Warning!"
-msgstr "�Aviso!"
-
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "O ficheiro existe, �sobrescribir?"
 
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao gardar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:1207
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao cargar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:1240
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acceder ao ficheiro: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Non foi posible recibir a mensaxe do editor"
 
-#: composer/e-msg-composer.c:1255
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10710,7 +10892,7 @@ msgstr ""
 "Non � posible desprazarse no ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10719,7 +10901,16 @@ msgstr ""
 "Non foi posible trunca-lo ficheiro: %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 ""
+"Non � posible desprazarse no ficheiro: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10728,7 +10919,7 @@ msgstr ""
 "Erro ao autogardar a mensaxe: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1388
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -10737,7 +10928,7 @@ msgstr ""
 "Evolution atopou ficheiros non gravados dunha sesi�n anterior.\n"
 "�Gostar�alle probar a recuperalos?"
 
-#: composer/e-msg-composer.c:1525
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10748,35 +10939,40 @@ msgstr ""
 "\n"
 "�Desexa gardar os cambios?"
 
-#: 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 "Mensaxe Remitida"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Signature:"
 msgstr "Gravar sinatura"
 
-#: 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 "Compo�er unha mensaxe"
 
-#: 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"
@@ -10787,7 +10983,7 @@ msgstr ""
 "Non foi posible crear a fiestra do compositor, porque a�nda\n"
 "non configurou ningunha identidade no compo�ente de correo."
 
-#: composer/e-msg-composer.c:2879
+#: composer/e-msg-composer.c:2991
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10796,25 +10992,12 @@ msgstr ""
 "Non foi posible crear a fiestra do compositor, porque a�nda\n"
 "non configurou ningunha identidade no compo�ente de correo."
 
-#: 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 ""
-"Non foi posible crear a fiestra do compositor, porque a�nda\n"
-"non configurou ningunha identidade no compo�ente de correo."
-
-#: composer/evolution-composer.c:408
-#, fuzzy
-msgid "Cannot initialize the Evolution composer."
-msgstr "Non foi posible inicializar o compositor de Evolution."
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "A suite de traballo en grupo Evolution"
@@ -10864,8 +11047,111 @@ msgstr "O asunto cont�n"
 msgid "Subject does not contain"
 msgstr "O asunto non cont�n"
 
-#: 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 "F�ra da Oficina"
+
+#: designs/OOA/ooa.glade.h:5
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Descrici�n:</b> %s"
+
+#: 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 "F�ra da Oficina"
+
+#: designs/OOA/ooa.glade.h:13
+#, fuzzy
+msgid "Yes, Change Status"
+msgstr "Estado"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:2
+#, fuzzy
+msgid "<b>Receiving Email</b>"
+msgstr "Recepci�n de Correo"
+
+#: designs/read_receipts/read.glade.h:3
+#, fuzzy
+msgid "<b>Sending Email:</b>"
+msgstr "Enviando Correo"
+
+#: 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 "Destinatarios"
+
+#: 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?"
@@ -10873,223 +11159,249 @@ msgstr ""
 "Xa existe un ficheiro con ese nome.\n"
 "�Sobrescribilo?"
 
-#: e-util/e-passwords.c:363
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "�Sobrescribir ficheiro?"
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Lembrar este contrasinal"
 
-#: 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 "Categor�as"
 
 #. 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 "%H:%M:%S"
 
 #. 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 "segundos"
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr "1 segundo"
 
-#: filter/filter-datespec.c:71
-msgid "minute"
-msgstr "minuto"
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr "%d segundos"
 
-#: filter/filter-datespec.c:72
-msgid "hour"
-msgstr "hora"
+#: filter/filter-datespec.c:66
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 minuto"
 
-#: filter/filter-datespec.c:74
-msgid "week"
-msgstr "semana"
+#: filter/filter-datespec.c:66
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "%d minutos"
 
-#: filter/filter-datespec.c:74 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "semanas"
+#: filter/filter-datespec.c:67
+#, fuzzy
+msgid "1 hour ago"
+msgstr "1 hora"
+
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d horas"
+
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "1 day ago"
+msgstr "1 d�a"
 
-#: filter/filter-datespec.c:75
-msgid "month"
+#: filter/filter-datespec.c:68
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr " atr�s"
+
+#: filter/filter-datespec.c:69
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 semana"
+
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d semanas"
+
+#: 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 "meses"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr " atr�s"
 
-#: filter/filter-datespec.c:76
-msgid "year"
-msgstr "ano"
+#: filter/filter-datespec.c:71
+msgid "1 year ago"
+msgstr ""
 
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
-msgid "years"
-msgstr "anos"
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr " atr�s"
 
-#: filter/filter-datespec.c:174
+#: filter/filter-datespec.c:176
 #, fuzzy
 msgid "You must choose a date."
 msgstr "Oops. Esqueceu escoller unha data."
 
-#: filter/filter-datespec.c:269
+#: filter/filter-datespec.c:275
 msgid "<click here to select a date>"
 msgstr "<prema aqu� para seleccionar unha data>"
 
-#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
 msgid "now"
 msgstr "agora"
 
 #. 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 " atr�s"
-
-#: filter/filter-datespec.c:407
+#: filter/filter-datespec.c:406
 #, fuzzy
 msgid "Select a time to compare against"
 msgstr "Seleccionar un Fuso Horario"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Regras de Filtrado"
 
-#: 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 "Nome do estilo:"
 
-#: 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 "O spool `%s' non existe ou non � un ficheiro normal"
 
-#: filter/filter-file.c:307
+#: filter/filter-file.c:298
 #, fuzzy
 msgid "Choose a file"
 msgstr "Escolla unha Acci�n"
 
 #. and now for the action area
-#: filter/filter-filter.c:513
+#: filter/filter-filter.c:491
 msgid "Then"
 msgstr "Ent�n"
 
-#: filter/filter-filter.c:527
-msgid "Add action"
-msgstr "Engadir acci�n"
-
-#: 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 "Nome do estilo:"
 
-#: 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 "Seleccionar Cartafol"
 
-#: filter/filter-input.c:200
+#: filter/filter-input.c:191
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -11098,79 +11410,77 @@ msgstr ""
 "Erro na expresi�n regular '%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 "Importante"
 
 #. 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 "Traballando"
 
 #. 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 "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 "despois"
 
-#: 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
 #, fuzzy
 msgid "You must name this filter."
 msgstr "Cambiar o nome deste cartafol"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:751
 msgid "Rule name: "
 msgstr "Nome da regra: "
 
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:755
 msgid "Untitled"
 msgstr "Sen t�tulo"
 
-#: filter/filter-rule.c:785
+#: filter/filter-rule.c:772
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:803
+#: filter/filter-rule.c:790
 msgid "Execute actions"
 msgstr "Executar acci�ns"
 
-#: filter/filter-rule.c:807
+#: filter/filter-rule.c:794
 msgid "if all criteria are met"
 msgstr "se se cumpren t�dolos criterios"
 
-#: filter/filter-rule.c:812
+#: filter/filter-rule.c:799
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "se se cumpre alg�n criterio"
 
-#: filter/filter-rule.c:823
-msgid "Add criterion"
-msgstr "Engadir criterio"
-
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "incoming"
 msgstr "entrante"
 
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "outgoing"
 msgstr "sa�nte"
 
@@ -11222,7 +11532,7 @@ msgstr ""
 "A data da mensaxe hase comparar co momento\n"
 "que especifique 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 "Cartafoles Virtuais"
 
@@ -11234,6 +11544,14 @@ msgstr "unha hora relativa � hora actual"
 msgid "ago"
 msgstr "atr�s"
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "meses"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr "segundos"
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "cartafoles espec�ficos namais"
@@ -11251,6 +11569,10 @@ msgstr "unha hora que especifique"
 msgid "vFolder Sources"
 msgstr "Fontes de CartafolV"
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "semanas"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "con todos os cartafoles remotos activos"
@@ -11263,6 +11585,10 @@ msgstr "con todos os cartafoles locais e cos remotos activos"
 msgid "with all local folders"
 msgstr "con todos os cartafoles locais"
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "anos"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -11395,7 +11721,7 @@ msgstr "non �"
 msgid "is not Flagged"
 msgstr "Marcada"
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 msgid "Label"
 msgstr ""
 
@@ -11425,7 +11751,7 @@ msgstr "Enviar unha Mensaxe a un Contacto"
 msgid "Play Sound"
 msgstr "Tocar un son:"
 
-#: 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 "Ler"
 
@@ -11456,12 +11782,12 @@ msgstr "� maior que"
 msgid "returns less than"
 msgstr "� menor 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�n"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "Autor"
 
@@ -11498,8 +11824,9 @@ msgstr "comeza por"
 msgid "Stop Processing"
 msgstr "Parar o Procesamento"
 
-#: 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 "Asunto"
 
@@ -11508,70 +11835,86 @@ msgstr "Asunto"
 msgid "Unset Status"
 msgstr "Establecer Estado"
 
-#: filter/rule-editor.c:180
-msgid "Rules"
-msgstr "Regras"
-
-#: 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 "Regras"
+
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Engadir Regra"
 
-#: filter/rule-editor.c:388
+#: filter/rule-editor.c:372
 msgid "Edit Rule"
 msgstr "Editar Regra"
 
-#: filter/score-editor.c:130
+#: filter/rule-editor.c:689
+#, fuzzy
+msgid "Rule name"
+msgstr "Nome da regra: "
+
+#: filter/score-editor.c:114
 msgid "Score Rules"
 msgstr "Regras de Puntuaci�n"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Cambiar o nome deste cartafol"
 
-#: filter/vfolder-rule.c:215
+#: filter/vfolder-rule.c:222
 #, fuzzy
 msgid "You need to to specify at least one folder as a source."
 msgstr "Oops.  Necesita especificar polo menos un cartafol como fonte."
 
-#: importers/elm-importer.c:95
+#: filter/vfolder-rule.c:499
+#, fuzzy
+msgid "VFolder source"
+msgstr "Fontes de CartafolV"
+
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution est� importando o seu correo de Elm antigo"
 
 #: 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 "Importando..."
 
 #: 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 "Agarde, por favor"
 
 #: 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 "Importando %s coma %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 "Examinando %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 "Correo"
 
-#: 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?"
@@ -11579,7 +11922,7 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Elm.\n"
 "�Gostar�alle importalos a Evolution?"
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr ""
 
@@ -11591,12 +11934,12 @@ msgstr ""
 "Evolution atopou ficheiros GnomeCard.\n"
 "�Gostar�alle importalos a 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 "_Prioridade:"
 
-#: 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"
@@ -11611,7 +11954,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"
@@ -11619,7 +11962,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"
@@ -11628,39 +11971,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 est� importando os datos antigos de 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 "Lixo"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Ficheiro local de correo %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 "Explorando o directorio"
 
-#: 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 "Comezando a importaci�n"
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Opci�ns"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Editar Filtros"
 
-#: 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?"
@@ -11668,12 +12013,12 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Netscape.\n"
 "�Gostar�alle importalos a Evolution?"
 
-#: importers/pine-importer.c:100
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
 #, fuzzy
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution est� importando os seus datos de Pine antigos"
 
-#: 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?"
@@ -11681,423 +12026,412 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Pine.\n"
 "�Gostar�alle importalos a Evolution?"
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 #, fuzzy
 msgid "Pine"
 msgstr "Imprimir"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
 #, fuzzy
 msgid "Composer Preferences"
 msgstr "Preferencias da Axenda"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "F�brica para o compositor de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "F�brica para o compo�ente da axenda de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Mailer."
-msgstr "F�brica para o compositor de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "F�brica para o compositor de 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 "F�brica para o compositor de 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 "Crear ou editar contas de correo e outras preferencias"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Compo�ente de evolution para manexar o correo."
+#: 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 "F�brica para o compo�ente de correo de 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 "Compositor de correo de Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Compo�ente de resumo executivo do 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.oaf.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Compo�ente de mostra de cartafoles de correo de Evolution."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "F�brica para o compo�ente de correo de Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
-msgstr "Compo�ente de f�brica de cartafoles de correo de Evolution."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Interface de configuraci�n do correo"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
-msgstr "F�brica para o compositor de Evolution."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Compo�ente de mostra de cartafoles de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "F�brica para o compo�ente de correo de Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
-msgstr "F�brica para a compo�ente Resumo de Correo."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Compo�ente de resumo executivo do correo de Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 #, fuzzy
 msgid "Font Preferences"
 msgstr "Modifica-las preferencias"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Contas"
 
-#: 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 "Preferencias da Axenda"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-msgid "Mail configuration interface"
-msgstr "Interface de configuraci�n do correo"
-
-#: mail/component-factory.c:102
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Cartafol que cont�n correo"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public Mail"
 msgstr "P�blico"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "Cartafol que cont�n correo"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Lixo Virtual"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Cartafol de Lixo Virtual"
 
-#: mail/component-factory.c:132
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Este cartafol non pode conter mensaxes."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Modificar as propiedades deste cartafol"
 
-#: 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 "Non definiu ning�n m�todo de env�o de correo"
 
-#: 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 "Mensaxe Remitida"
-
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Nova Mensaxe de Correo"
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "Enviar _Mensaxe"
 
-#: mail/component-factory.c:1041
+#: mail/component-factory.c:1061
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Compo�er unha mensaxe"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "New Message Post"
 msgstr "Seguinte Mensaxe"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "_Post Message"
 msgstr "Anterior Mensaxe"
 
-#: mail/component-factory.c:1050
+#: mail/component-factory.c:1070
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Nova Mensaxe de Correo"
 
-#: mail/component-factory.c:1078
-#, fuzzy
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
-
-#: mail/component-factory.c:1087
-#, fuzzy
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
-
-#: mail/component-factory.c:1093
-#, fuzzy
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
-
-#: mail/component-factory.c:1334 mail/component-factory.c:1364
+#: mail/component-factory.c:1353
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conectando ao servidor..."
 
-#: mail/component-factory.c:1375
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Non se pode rexistrar o armacenamento co shell"
 
-#: mail/folder-browser-ui.c:471
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades de \"%s\""
 
-#: mail/folder-browser-ui.c:473
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Propiedades"
 
-#: 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 "Non foi posible crear o directorio temporal: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr "%d nova(s)"
 
-#: 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 oculta(s)"
 
-#: 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 seleccionada(s)"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr "%d sen enviar"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:801
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d sen enviar"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1118
+#: mail/folder-browser.c:1182
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear Cartafol _Virtual Dende Mensaxe"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "CartafolV polo A_sunto"
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "CartafolV polos _Destinatarios"
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV pola _Lista de Correo"
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "Filtrar polo As_unto"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "Filtrar polo Au_tor"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "Filtrar polos D_estinatarios"
 
-#: 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 "Filtrar pola Lista de _Correo"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: 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 "_Responder � Autor"
 
-#: 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 "Responder � _Lista"
 
-#: 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 "Responder a _Todos"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "_Remitir"
 
-#: 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 "Completada"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1772
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Limpar"
 
 #. 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 "Marcar como _Lida"
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1777
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _Non Lida"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "Marcar coma _Importante"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1779
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar coma Non Im_portante"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1784
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1788
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover � Cartafol.."
 
-#: 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 "_Copiar a un Cartafol..."
 
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1797
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Engadir o Autor ao Libro de Enderezos"
 
-#: mail/folder-browser.c:1774
+#: mail/folder-browser.c:1801
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1805
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: mail/folder-browser.c:2036
+#: mail/folder-browser.c:2064
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "CartafolV pola Lista de Correo"
 
-#: mail/folder-browser.c:2038
+#: mail/folder-browser.c:2066
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrar pola Lista de Correo (%s)"
 
-#: mail/folder-browser.c:2039
+#: mail/folder-browser.c:2067
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "CartafolV pola Lista de Correo (%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 "Por de_fecto"
 
-#: mail/folder-info.c:71
+#: mail/folder-info.c:70
 msgid "Getting Folder Information"
 msgstr "Obtendo Informaci�n do Cartafol"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "F�brica para importar mbox a Evolution."
+#: 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
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Compositor de correo de Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Importa ficheiros mbox a 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"
-msgstr "F�brica para importar correo de Outlook Express 4 a Evolution"
+#: 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.oaf.in.h:2
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Importa ficheiros de Outlook Express 4 a 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 "Compositor de correo de Evolution."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -12135,100 +12469,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 "Non encheu toda a informaci�n requirida."
 
 #. 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 "Editor de Contas de 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 "_Servidor:"
 
-#: 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 "Nome de _Usuario:"
 
-#: 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 "_Ruta:"
 
-#: mail/mail-account-gui.c:1847
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr "Non pode crear d�as contas co mesmo nome"
 
-#: mail/mail-accounts.c:224
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr "�Est� seguro de que quere borrar esta conta?"
 
-#: mail/mail-accounts.c:228
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "Non borrar"
 
-#: mail/mail-accounts.c:231
-msgid "Really delete account?"
-msgstr "�Borrar esta conta de verdade?"
-
-#: 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 "Desactivar"
 
-#: 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 "Activado"
 
-#: 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 "Por de_fecto"
+
+#: 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 "Activado"
 
-#: 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 "Nome da Cont_a:"
 
-#: 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 Rico"
 
-#: mail/mail-autofilter.c:78
+#: mail/mail-autofilter.c:74
 #, fuzzy, c-format
 msgid "Mail to %s"
 msgstr "Mensaxe para %s"
 
-#: mail/mail-autofilter.c:242
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "O asunto � %s"
 
-#: mail/mail-autofilter.c:258
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Mensaxe de %s"
 
-#: mail/mail-autofilter.c:275
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: mail/mail-autofilter.c:327
+#: mail/mail-autofilter.c:323
 msgid "Add Filter Rule"
 msgstr "Engadir Regra de Filtrado"
 
-#: 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"
@@ -12236,7 +12570,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 "Non amosar esta mensaxe outra vez"
+
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -12248,7 +12587,16 @@ msgstr ""
 "recibir ou compo�er correo.\n"
 "�Quere configuralo agora?"
 
-#: 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 ""
+"Ten que configurar unha identidade\n"
+"antes de poder escribir correo."
+
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -12256,7 +12604,7 @@ msgstr ""
 "Ten que configurar unha identidade\n"
 "antes de poder escribir correo."
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -12265,18 +12613,18 @@ msgstr ""
 "antes de poder compo�elo."
 
 #. 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 "Enviar unha mensaxe"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12284,7 +12632,7 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "�Enviar realmente?"
 
-#: 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."
@@ -12292,11 +12640,11 @@ msgstr ""
 "Xa que a lista de contactos � que env�a est� configurada para agocha-los "
 "enderezos da lista, esta mensaxe s� ha conter destinatarios Bcc."
 
-#: mail/mail-callbacks.c:360
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr "Esta mensaxe s� cont�n destinatarios 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"
@@ -12306,11 +12654,11 @@ msgstr ""
 "cabeceira Apparently-To.\n"
 "�Enviar de todas maneiras?"
 
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr "Ten que especificar destinatarios para poder enviar esta mensaxe."
 
-#: 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?"
@@ -12318,28 +12666,28 @@ msgstr ""
 "Incapaz de abrir o cartafol de borradores para esta conta.\n"
 "�Gostar�alle usar o cartafol de borradores por defecto?"
 
-#: mail/mail-callbacks.c:1207
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "un remitente desco�ecido"
 
-#: mail/mail-callbacks.c:1211
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "O %a, %Y-%m-%d �s %H:%M, %%s escribiu:"
 
-#: 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 "Mover mensaxe(s) 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 "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "�Est� seguro de que quere editar todas as %d mensaxes?"
 
-#: mail/mail-callbacks.c:2406
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12347,7 +12695,7 @@ msgstr ""
 "S� pode editar mensaxes gardadas\n"
 "no cartafol de Borradores."
 
-#: mail/mail-callbacks.c:2445
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12355,42 +12703,46 @@ msgstr ""
 "S� pode reenviar mensaxes\n"
 "do cartafol de Enviadas."
 
-#: mail/mail-callbacks.c:2459
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "�Est� seguro de que quere re-enviar as %d mensaxes?"
 
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "Ningunha Mensaxe Seleccionada"
 
-#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
-msgid "Overwrite file?"
-msgstr "�Sobrescribir ficheiro?"
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"Non � posible obter a mensaxe: %s\n"
+"  %s"
+
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"%s xa existe\n"
+"�Quere sobrescribilo?"
 
-#: mail/mail-callbacks.c:2584
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/mail-callbacks.c:2586
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "Gardar Mensaxes Como..."
 
-#: mail/mail-callbacks.c:2655
+#: mail/mail-callbacks.c:2687
 #, fuzzy
-msgid "Go to next folder with unread messages?"
-msgstr "Amosa-la seguinte mensaxe sen ler"
-
-#: 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 ""
@@ -12399,7 +12751,7 @@ msgstr ""
 "\n"
 "�Eliminar realmente estas mensaxes?"
 
-#: mail/mail-callbacks.c:3018
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12408,65 +12760,65 @@ msgstr ""
 "Erro ao cargar a informaci�n do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3030
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:3074
+#: mail/mail-callbacks.c:2831
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/mail-callbacks.c:3129
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: 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 "A impresi�n da mensaxe fallou"
 
-#: 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 ""
 "�Est� seguro de que quere abrir todas as %d mensaxes en fiestras separadas?"
 
-#: 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 "Contacto Sen Nome"
 
-#: 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 "descrici�n"
+msgid "You must specify a valid script name."
+msgstr "Nome do estilo:"
 
-#: 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 "descrici�n"
 
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
+#: mail/mail-composer-prefs.c:864
 #, fuzzy
-msgid "Unnamed"
-msgstr "Contacto Sen Nome"
+msgid "Language(s)"
+msgstr "Idioma"
 
-#: mail/mail-composer-prefs.c:875
+#: mail/mail-composer-prefs.c:906
 #, fuzzy
 msgid "Add script signature"
 msgstr "Engadir criterio"
 
-#: mail/mail-composer-prefs.c:876
+#: mail/mail-composer-prefs.c:926
 #, fuzzy
-msgid "Add Signature"
-msgstr "Gravar sinatura"
+msgid "Signature(s)"
+msgstr "Sinatura _HTML:"
+
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr "Identidade"
 
-#: 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 "
@@ -12477,7 +12829,12 @@ msgstr ""
 "de embaixo non precisan que se enchan,\n"
 "a menos que queira inclu�r esta informaci�n no correo que env�e."
 
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "Recepci�n de Correo"
+
+#: mail/mail-config-druid.c:390
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -12487,11 +12844,16 @@ msgstr ""
 "non est� seguro, pregunte\n"
 "ao seu administrador de sistemas ou fornecedor de acceso a Internet."
 
-#: mail/mail-config-druid.c:150
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Escolla unha das seguintes opci�ns"
 
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:400
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Enviando Correo"
+
+#: mail/mail-config-druid.c:402
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -12501,7 +12863,11 @@ msgstr ""
 "est� seguro, pregunte ao\n"
 "seu administrador de sistemas ou fornecedor de acceso a Internet."
 
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "Xesti�n de Contas"
+
+#: mail/mail-config-druid.c:409
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -12518,160 +12884,143 @@ msgstr ""
 "embaixo.\n"
 "Este nome s� se emprega para amosalo."
 
-#. set window title
-#: mail/mail-config-druid.c:637
-msgid "Evolution Account Assistant"
-msgstr "Asistente de Contas de Evolution"
-
-#: mail/mail-config.c:622
-#, fuzzy, c-format
-msgid "Account %d"
-msgstr "Conta"
-
-#: mail/mail-config.c:2316
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Comprobando Servicio"
 
-#: 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 "Conectando ao servidor..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid " _Check for supported types "
 msgstr "Dete_ctar tipos soportados "
 
-#: 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 non est� soportado nesta versi�n de 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 non est� soportado nesta versi�n de evolution)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Sempre cifrarme a min mesmo cando se env�e correo cifrado"
 
-#: 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 "Conta"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Informaci�n de Contas"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "Xesti�n de Contas"
-
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Engadir criterio"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Gravar sinatura"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Sempre cifrarme a min mesmo cando se env�e correo cifrado"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Asinar sempre as mensaxes sa�ntes cando se use esta conta"
 
-#: 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 "Anexar un ficheiro � mensaxe"
 
-#: 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 "Anexo"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autenticaci�n"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: 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 "Xogo de caracteres desco�ecido: %s"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "C_olors"
 msgstr "P_echar"
 
-#: 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 "Comprobando o novo correo"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Cor para tarefas para hoxe"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Compo�er unha mensaxe"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuraci�n do Correo"
 
-#: 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 ""
 "Noraboa, completou a configuraci�n do correo.\n"
 "\n"
@@ -12680,310 +13029,307 @@ msgstr ""
 "\n"
 "Prema \"Finalizar\" para gardar a nova configuraci�n."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Codificaci�n de caracteres por defecto: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digital IDs..."
 msgstr "IDs dixitais..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: 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 "Feito"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Cartafol de borradores:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "A_ctivar"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Emacs"
 msgstr "Este"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Enderezo cont�n"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Email _address:"
 msgstr "Enderezo de Correo:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_Baleirar os cartafoles de lixo ao sair"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr "Asistente de Contas de Evolution"
+
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Executar acci�ns"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "remata en"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propiedades"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr "Obter ID Dixital..."
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Resaltar as citas con "
 
-#: 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 "Identidade"
-
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Inline"
 
-#: 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 "Gardar e Pechar"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "Cargar _Imaxes"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Configuraci�n do Correo"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Localizaci�n da caixa do correo"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Cabeceira da Mensaxe"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "Visualizaci�n das _Mensaxes"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "A mensaxe cont�n"
+
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Microsoft"
 msgstr "Micronesia"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configuraci�n do Correo"
 
-#: 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 "Informaci�n Opcional"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zaci�n:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da Clave PGP:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Escoller unha cor"
 
-#: 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 "Avisar cando se env�en mensaxes con s� destinatarios _Bcc definidos"
 
-#: 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 "Imprimi-los contactos seleccionados"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr "Maildir de Qmail "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Quote original message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Lembrar este contrasinal"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Responder-A:"
 
-#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr "Recepci�n de Correo"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Opci�ns de Recepci�n"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Lembrar este contrasinal"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "Informaci�n Requirida"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Opci�ns por defecto"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Seguridade"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME Seguro"
 
-#: 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 "Enviando Correo"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Cartafol de mensaxes enviadas:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "Mensaxes Enviadas e Borradores"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "O servidor require _autenticaci�n"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Configuraci�n do Servidor"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Atallos"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nome do estilo:"
 
-#: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
-msgstr ""
-
 #: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
@@ -13018,10 +13364,11 @@ msgid "V_ariable-width:"
 msgstr "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 ""
 "Benvido � Asistente da Configuraci�n de Correo de Evolution.\n"
 "\n"
@@ -13100,120 +13447,125 @@ msgid "_Enable"
 msgstr "Activado"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr ""
-
-#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Remitir Coma"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Nome Completo:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "En correo HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "_Cargar imaxes se o autor est� no libro de enderezos"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Facer esta a mi�a conta por _defecto"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensaxes como Lidas despois de"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "_Nunca cargar as imaxes da rede"
 
-#: 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 "Avisar cando se env�en mensaxes cun asunto baleiro"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Avisar cando se env�en mensaxes cun asunto baleiro"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Recepci�n de Correo"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Responder a Todos"
 
-#: 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 "_Seguridade"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Amosa-lo Tempo Coma"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "Sinatura _HTML:"
 
+#: 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 "Usar conexi�n segura (_SSL)"
+msgid "_Terminal Font:"
+msgstr "Contacto Orixinal:"
 
 #: mail/mail-config.glade.h:176
 #, fuzzy
-msgid "_Variable-width:"
-msgstr "Variable"
+msgid "_Use secure connection (SSL):"
+msgstr "Usar conexi�n segura (_SSL)"
 
 #: 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 " cor"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "descrici�n"
 
@@ -13237,190 +13589,192 @@ msgstr "Non foi posible crear un contexto de sobre S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Non foi posible crear un contexto de descodificaci�n S/MIME."
 
-#: mail/mail-display.c:321
+#: mail/mail-display.c:193
+#, fuzzy, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Xa existe un ficheiro con ese nome.\n"
+"�Sobrescribilo?"
+
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:386
+#: mail/mail-display.c:406
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:454
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:433
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr "Ver Inline"
 
-#: mail/mail-display.c:434
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:494
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver Inline (mediante %s)"
 
-#: mail/mail-display.c:498
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-display.c:519
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "Visualizador Externo"
 
-#: mail/mail-display.c:1319
+#: mail/mail-display.c:1365
 #, fuzzy
 msgid "Downloading images"
 msgstr "Cargar _Imaxes"
 
-#: mail/mail-display.c:1496
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "Cargado o contido da mensaxe"
 
-#: mail/mail-display.c:1783
+#: mail/mail-display.c:1879
 #, fuzzy
 msgid "Overdue:"
 msgstr "Tarefas _retrasadas:"
 
-#: mail/mail-display.c:1787
+#: mail/mail-display.c:1883
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "O %d de %B �s %k:%M"
 
-#: mail/mail-display.c:2114
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Abrir Ligaz�n no Navegador"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Copiar Localizaci�n da Ligaz�n"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Gardar Ligaz�n coma (AM��AME)"
 
-#: mail/mail-display.c:2119
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Gardar Imaxe coma..."
 
-#: mail/mail-folder-cache.c:743
+#: mail/mail-folder-cache.c:744
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Examinando %s"
 
-#: mail/mail-format.c:656
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: 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 "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: 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 "Enderezo Incorrecto"
 
-#: 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 "De"
 
-#: mail/mail-format.c:917
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Responder-A"
 
-#: 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 "Para"
 
-#: mail/mail-format.c:927
+#: mail/mail-format.c:900
 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 ""
-"\n"
-"Cliente de Correo: "
-
-#: mail/mail-format.c:1848
+#: mail/mail-format.c:1451
 #, fuzzy
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr "Esta mensaxe est� asinada dixitalmente e comprobouse a autenticidade."
 
-#: mail/mail-format.c:1875
+#: mail/mail-format.c:1479
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Non foi posible crear un contexto de verificaci�n PGP."
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Esta mensaxe est� asinada dixitalmente e comprobouse a autenticidade."
 
-#: 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 ""
 "Esta mensaxe est� asinada dixitalmente pero non se puido comprobar a s�a "
 "autenticidade"
 
-#: mail/mail-format.c:2157
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio 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 "Punteiro a ficheiro local (%s) v�lido no sitio \"%s\""
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/mail-format.c:2205
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro a datos remotos (%s)"
 
-#: mail/mail-format.c:2213
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos desco�ecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:2218
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr "Parte external-body mal formada."
 
-#: 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 "Cartafoles Locais"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Refrescando o cartafol"
 
-#: 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"
@@ -13429,12 +13783,12 @@ msgstr ""
 "Non foi posible garda-la metainformaci�n do cartafol, seguramente\n"
 "non poder� abrir este cartafol outra vez: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:804
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
@@ -13446,7 +13800,7 @@ msgstr ""
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando o cartafol \"%s\" � formato \"%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."
@@ -13454,12 +13808,12 @@ msgstr ""
 "Se non pode abrir m�is esta caixa de correo, poida\n"
 "que te�a que reparala a man."
 
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigurar %s"
 
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
 msgstr "Non se pode cambia-lo formato dun cartafol non local."
 
@@ -13481,108 +13835,108 @@ msgstr ""
 "Erro ao efectuar a operaci�n:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Traballando"
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Filtrando o Cartafol"
 
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Recibindo Correo"
 
-#: 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 "Enviando \"%s\""
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fallou na mensaxe %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
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:853
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-ops.c:1277
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo armacenamento %s"
 
-#: mail/mail-ops.c:1422
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1507
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1567
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Refrescando o cartafol"
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1594
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Recibindo %d mensaxe(s)"
 
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1801
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gardando %d mensaxe(s)"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13591,7 +13945,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de sa�da: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13600,11 +13954,11 @@ msgstr ""
 "Erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:2041
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13613,54 +13967,54 @@ msgstr ""
 "Non � posible crear ficheiro de sa�da: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2071
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "_Buscar"
-
-#: mail/mail-search.c:137
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(Mensaxe Sen T�tulo)"
 
-#: mail/mail-search.c:240
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "Mensaxes Sen T�tulo"
 
-#: mail/mail-search.c:244
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "Mensaxe Baleira"
 
-#: mail/mail-search.c:291
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "Buscar na Mensaxe"
 
-#: mail/mail-search.c:321
+#: mail/mail-search.c:285
+msgid "Search"
+msgstr "Buscar"
+
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "Distinguir Mai�sculas"
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr "Buscar Cara a Adiante"
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "Buscar:"
 
-#: mail/mail-search.c:346
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "Aparici�ns:"
 
@@ -13668,73 +14022,69 @@ msgstr "Aparici�ns:"
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:248
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tipo de 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 "Tipo:"
 
-#: mail/mail-send-recv.c:293
+#: mail/mail-send-recv.c:297
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Enviar e Recibir correo"
 
-#: mail/mail-send-recv.c:295
+#: mail/mail-send-recv.c:299
 #, fuzzy
 msgid "Cancel All"
 msgstr "Cancelar"
 
-#: mail/mail-send-recv.c:355
+#: mail/mail-send-recv.c:378
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: 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 "Agardando..."
 
-#: mail/mail-session.c:221
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operaci�n."
 
-#: mail/mail-session.c:272
-msgid "_Remember this password"
-msgstr "_Lembrar este contrasinal"
-
-#: 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 "Introduza o seu contrasinal para %s"
 
-#: mail/mail-session.c:333
+#: mail/mail-session.c:260
 #, fuzzy
 msgid "Enter Password"
 msgstr "Contrasinal"
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-session.c:280
+msgid "_Remember this password"
+msgstr "_Lembrar este contrasinal"
+
+#: 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 ""
 "Non foi posible abrir o ficheiro de sinatura %s:\n"
 "%s"
 
-#: mail/mail-signature-editor.c:175
-msgid "Save signature"
-msgstr "Gravar sinatura"
-
-#: 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"
@@ -13744,44 +14094,52 @@ msgstr ""
 "\n"
 "�Desexa gardar os cambios?"
 
-#: 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 "Gravar sinatura"
+
+#: mail/mail-signature-editor.c:389
 #, fuzzy
 msgid "Edit signature"
 msgstr "Engadir criterio"
 
-#: mail/mail-signature-editor.c:372
+#: mail/mail-signature-editor.c:429
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "Sinatura _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 "Nome:"
 
-#: mail/mail-tools.c:262
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe remitida - %s"
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "Mensaxe remitida"
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "Mensaxe Remitida"
 
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:92
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:210
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13790,99 +14148,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 "CartafolesV"
 
-#: mail/mail-vfolder.c:819
+#: mail/mail-vfolder.c:835
 #, fuzzy
 msgid "vFolders"
 msgstr "Cartafoles"
 
-#: mail/mail-vfolder.c:861
+#: mail/mail-vfolder.c:874
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editar CartafolesV"
 
-#: 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 "Novo CartafolV"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(Sen asunto)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Mensaxe"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:740
 msgid "Unseen"
 msgstr "Non vista"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:741
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:743
 msgid "Multiple Unseen Messages"
 msgstr "M�ltiples Mensaxes Non Vistas"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:744
 msgid "Multiple Messages"
 msgstr "M�ltiples Mensaxes"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:748
 msgid "Lowest"
 msgstr "A m�is baixa"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:749
 msgid "Lower"
 msgstr "M�is baixa"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:753
 msgid "Higher"
 msgstr "M�is alta"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:754
 msgid "Highest"
 msgstr "A m�is alta"
 
-#: 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 "Hoxe �s %k:%M"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Onte �s %k:%M"
 
-#: mail/message-list.c:1094
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "O %A �s %k:%M"
 
-#: mail/message-list.c:1102
+#: mail/message-list.c:1116
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B �s %k:%M"
 
-#: mail/message-list.c:1104
+#: mail/message-list.c:1118
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: mail/message-list.c:2568
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
@@ -13917,47 +14275,47 @@ msgstr "Recibido"
 msgid "Size"
 msgstr "Tama�o"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:62
 #, fuzzy
 msgid "Call"
 msgstr "Resposta"
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Adiante"
 
-#: 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 "Informaci�n da Fonte"
 
-#: 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 "Remitir"
 
-#: 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 "Responder"
 
-#: 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 "Responder a Todos"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:71
 #, fuzzy
 msgid "Review"
 msgstr "Previsualizar"
 
-#: 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 ""
 
@@ -13987,53 +14345,44 @@ msgstr "Pendente "
 msgid "_Flag:"
 msgstr "Nome do ficheiro:"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Examinando os cartafoles baixo %s en \"%s\""
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Examinando os cartafoles de nivel ra�z en \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Subscrib�ndose ao cartafol \"%s\""
 
-#: mail/subscribe-dialog.c:338
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Desubscrib�ndose do cartafol \"%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 "Cartafol"
 
-#: mail/subscribe-dialog.c:1450
+#: mail/subscribe-dialog.c:1389
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Gardar no cartafol..."
 
-#: mail/subscribe-dialog.c:1557
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Non se seleccionou ning�n servidor"
 
-#: mail/subscribe-dialog.c:1621
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "All folders"
-msgstr "Todos os cartafoles"
-
-#: 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
@@ -14044,66 +14393,47 @@ msgid "Close"
 msgstr "Pechar"
 
 #: mail/subscribe-dialog.glade.h:4
-#, fuzzy
-msgid "Display Options"
-msgstr "Opci�ns de Vista"
-
-#: mail/subscribe-dialog.glade.h:5
-msgid "Folders whose names begin with:"
-msgstr "Cartafoles con nomes que comezan por:"
-
-#: mail/subscribe-dialog.glade.h:6
 msgid "Manage Subscriptions"
 msgstr "Xestionar Subscripci�ns"
 
-#: 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 "Actualizar Lista"
 
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:6
 #, fuzzy
 msgid "S_elect server: "
 msgstr "Seleccionar todo"
 
-#: mail/subscribe-dialog.glade.h:9
-#, fuzzy
-msgid "Salve file"
-msgstr "Seleccionar un ficheiro"
-
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "_Subscribir"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "_Desubscribir"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for the Evolution Summary."
-msgstr "Cartafol que cont�n o Resumo de 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 "Cartafol que cont�n o Resumo de 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 "Compositor de correo de 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 "F�brica para o compo�ente de correo de Evolution."
+msgid "Evolution Summary component"
+msgstr "Compositor de correo de 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 "F�brica para o compo�ente de Resume Executivo de Evolution."
+msgid "Evolution Summary configuration control"
+msgstr "F�brica para o compo�ente de correo de 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 "Preferencias da Axenda"
@@ -17905,7 +18235,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 "Pedrisco"
 
@@ -19750,6547 +20080,6536 @@ msgid "Marion-Wytheville"
 msgstr ""
 
 #: my-evolution/Locations.h:1325
-#, fuzzy
-msgid "Marquette"
-msgstr "Martinica"
-
-#: 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 "Illas Marshall"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 #, fuzzy
 msgid "Marshalltown"
 msgstr "Illas Marshall"
 
-#: 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 "Martinica"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "Marcar como _Non Lida"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Martinsburg"
 msgstr "Martinica"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsville"
 msgstr "Martinica"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Maryland"
 msgstr "Irlanda"
 
-#: 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 "Malaisia"
 
-#: 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 "Macedonia"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Matamoros"
 msgstr "Comores"
 
-#: 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 "maio"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mayaguez"
 msgstr "Xestor"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayport"
 msgstr "Maiote"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mazatlan"
 msgstr "Kazakhst�n"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mazu"
 msgstr "Macau"
 
-#: 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 "Todas"
 
-#: 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 "marzo"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McClellan"
 msgstr "Islandia"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 #, fuzzy
 msgid "McComb"
 msgstr "Copiar"
 
-#: 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 "Macau"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Medford"
 msgstr "antes"
 
-#: 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 "maio"
 
-#: 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 "Macedonia"
 
-#: 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
 #, fuzzy
 msgid "Merced"
 msgstr "m_�tricas"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 #, fuzzy
 msgid "Merida"
 msgstr "Venres"
 
-#: 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 "Campo _Desde"
 
-#: 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 "M�xico"
 
-#: 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 "_Outros nomes:"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 #, fuzzy
 msgid "Middleton Island"
 msgstr "Illas Salom�n"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 #, fuzzy
 msgid "Middletown"
 msgstr "_Outros nomes:"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Midland"
 msgstr "Finlandia"
 
-#: 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 "Tipo de ficheiro:"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Milford"
 msgstr "para"
 
-#: 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 "Mensaxe para %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
 #, fuzzy
 msgid "Minatitlan"
 msgstr "Mauritania"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 #, fuzzy
 msgid "Minchumina"
 msgstr "entrante"
 
-#: 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 "Micronesia"
 
-#: 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 "non �"
 
-#: 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 "Sri�a."
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 #, fuzzy
 msgid "Missouri"
 msgstr "Sri�a."
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 #, fuzzy
 msgid "Mitchell"
 msgstr "Aparici�ns:"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 msgid "Mitilini"
 msgstr "Lista de Correo"
 
-#: 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 "Tel�fono 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 "N�boa moderada"
 
-#: 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 "Mover"
 
-#: 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 "Luns"
 
-#: 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 "Malaui"
 
-#: 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 "M�naco"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Moncton"
 msgstr "M�naco"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Monida"
 msgstr "Luns"
 
-#: 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 "M�naco"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Montague"
 msgstr "Xestor"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montana"
 msgstr "Botsuana"
 
-#: 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 "Neve moderada"
 
-#: 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 "Vista Mensual"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Montego Bay"
 msgstr "Mongolia"
 
-#: 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 "M�naco"
 
-#: 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 "Mongolia"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morgantown"
 msgstr "Organizaci�n"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Moriarty"
 msgstr "Principal"
 
-#: 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 "Vista Mensual"
 
-#: 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 "Sureste"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "Vista Mensual"
 
-#: 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 "maio"
 
-#: 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 "xu�o"
 
-#: 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 "Mauritania"
 
-#: 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 "Ocupado"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Muscatine"
 msgstr "Martinica"
 
-#: 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 "n�s"
 
-#: 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 "Bahrain"
 
-#: 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 "Nome:"
 
-#: 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 "Advertencia"
 
-#: 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 "Xap�n"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Naples"
 msgstr "Nome:"
 
-#: 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 "Alcume"
 
-#: 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 "Italia"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natchez"
 msgstr "Aparici�ns:"
 
-#: 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 "Nova Tarefa"
 
-#: 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 "Granada"
 
-#: 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 "Granada"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 #, fuzzy
 msgid "Newark"
 msgstr "Nova Tarefa"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "New Bedford"
 msgstr "Fonte de Novas"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bern"
 msgstr "Novo _Evento"
 
-#: 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 "Novas"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "Nova Celandia"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "Newfoundland"
 msgstr "Nova Celandia"
 
-#: 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 "Novo _Evento"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Iberia"
 msgstr "Nova Caledonia"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Jersey"
 msgstr "Nova Mensaxe"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Mexico"
 msgstr "M�xico"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 #, fuzzy
 msgid "New Orleans"
 msgstr "Pa�ses Baixos"
 
-#: 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 "Norte"
 
-#: 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 "Novo _Evento"
 
-#: 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 "Novo"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "New York"
 msgstr "Novo CartafolV"
 
-#: 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 "Dimensi�ns:"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nipawin"
 msgstr "Espa�a"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 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 "Normal"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nome"
 msgstr "Nome:"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Norfolk"
 msgstr "Illa Norfolk"
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 #, fuzzy
 msgid "Norfolk NAS"
 msgstr "Illa Norfolk"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 #, fuzzy
 msgid "Norrkoping"
 msgstr "Traballando"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "North Adams"
 msgstr "Nord�s"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Bend"
 msgstr "Norte"
 
-#: 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 "Noruega"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Dakota"
 msgstr "Nord�s"
 
-#: 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 "Nord�s"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "Northway"
 msgstr "Noruega"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "Territorios Franceses do Sul"
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 #, fuzzy
 msgid "Norwich"
 msgstr "Norte"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwood"
 msgstr "Noruega"
 
-#: 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 "Non Iniciada"
 
-#: 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 "Opaco"
 
-#: 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 "Tailandia"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oaxaca"
 msgstr "Xamaica"
 
-#: 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 "Islandia"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 #, fuzzy
 msgid "Odense"
 msgstr "�nico"
 
-#: 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 "Abrir"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Ogden"
 msgstr "Abrir"
 
-#: 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 "Outro"
 
-#: 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 "Illas Cook"
 
-#: 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 "Illas Virxes Brit�nicas"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 #, fuzzy
 msgid "Olathe"
 msgstr "Outro"
 
-#: 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 "Albania"
 
-#: 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 "Om�n"
 
-#: 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 "Om�n"
 
-#: 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 "Aceptar"
 
-#: 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�n"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Oostende"
 msgstr "Asistente"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Oran"
 msgstr "Om�n"
 
-#: 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 ""
 "\n"
 "Org: "
 
-#: 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 ""
 "\n"
 "Org: "
 
-#: 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 "Irlanda"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orlando"
 msgstr "Irlanda"
 
-#: 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 "Erro"
 
-#: 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 "segundo"
 
-#: 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 "Australia"
 
-#: 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 "semana"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Oxford"
 msgstr "para"
 
-#: 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�xina"
 
-#: 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 "Buscapersoas"
 
-#: 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 "Buscapersoas"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palm Springs"
 msgstr "Configuraci�n de Correo"
 
-#: 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 "Panam�"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Pantelleria"
 msgstr "Cancelada"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Papa"
 msgstr "Xap�n"
 
-#: 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 "Principal"
 
-#: 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 "Orballo parcial"
 
-#: 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 "Contrasinal"
 
-#: 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 "Panam�"
 
-#: 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 "Area forte"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Payson"
 msgstr "Tocar un son:"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Pellston"
 msgstr "Pregunta"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pelotas"
 msgstr "Recargar"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pendleton"
 msgstr "Selecci�n:"
 
-#: 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 "Xeorxia"
 
-#: 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 "Principal"
 
-#: 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 "Per�"
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 #, fuzzy
 msgid "Perugia"
 msgstr "Per�"
 
-#: 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 "Filipinas"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 #, fuzzy
 msgid "Philipsburg"
 msgstr "Filipinas"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 #, fuzzy
 msgid "Phillips"
 msgstr "Filipinas"
 
-#: 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 "Per�"
 
-#: 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 "Previsualizar"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 #, fuzzy
 msgid "Pine Bluff"
 msgstr "Correo de Pine"
 
-#: 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 "Paquist�n"
 
-#: 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
 #, fuzzy
 msgid "Podgorica Titograd"
 msgstr "Tornado parcial"
 
-#: 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 "Imprimir Sobre"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Lay"
 msgstr "Imprimir Resumo"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Mugu"
 msgstr "Imprimir Mensaxe"
 
-#: 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 "Propiedades"
 
-#: 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 "Lista de Tel�fonos"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 #, fuzzy
 msgid "Ponce"
 msgstr "Nada"
 
-#: 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 "Contactos"
 
-#: 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 "Polonia"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Port Alexander"
 msgstr "Imprimir Axenda"
 
-#: 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 "Imprimir Sobre"
 
-#: 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 "Previsualizar"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Port Hardy"
 msgstr "Imprimir tarxeta"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hedland"
 msgstr "Polonia"
 
-#: 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 "Polonia"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Porto"
 msgstr "_Porto:"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "En Progreso"
 
-#: 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 "Polonia"
 
-#: 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 "Costa Rica"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 #, fuzzy
 msgid "Poznan"
 msgstr "Polonia"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Praha"
 msgstr "Paraguai"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 #, fuzzy
 msgid "Pratica di Mare"
 msgstr "Chuvisca parcial"
 
-#: 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 "Previsualizaci�n da Impresi�n"
 
-#: 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 "Xeorxia"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Preveza"
 msgstr "Ant"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 #, fuzzy
 msgid "Price-Carbon"
 msgstr "Pitcairn"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 #, fuzzy
 msgid "Pristina"
 msgstr "Tradicional"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Providence"
 msgstr "E_stado/Provincia:"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Provincetown"
 msgstr "Previsualizar"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provo"
 msgstr "Ant"
 
-#: 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 "P�blico"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Pueblo"
 msgstr "P�blico"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 #, fuzzy
 msgid "Puerto Barrios"
 msgstr "Porto Rico"
 
-#: 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 Rico"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 #, fuzzy
 msgid "Puerto Lempira"
 msgstr "Porto Rico"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "Porto Rico"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 #, fuzzy
 msgid "Puerto Maldonado"
 msgstr "Tornado parcial"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 #, fuzzy
 msgid "Puerto Montt"
 msgstr "Porto Rico"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 #, fuzzy
 msgid "Puerto Plata"
 msgstr "Porto Rico"
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "Imprimir Resumo"
 
-#: 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 "Polonia"
 
-#: 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 "Imprimir Axenda"
 
-#: 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 "Pregunta"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quebec"
 msgstr "Asunto"
 
-#: 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 "Respondido a"
 
-#: 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 "Choiva"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 msgid "Reading"
 msgstr "Encabezados"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Rebun Island"
 msgstr "Illa Bouvet"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 #, fuzzy
 msgid "Recife"
 msgstr "Recibido"
 
-#: 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 "Encabezados"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redig"
 msgstr "Ler"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redmond"
 msgstr "Refacer"
 
-#: 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 "Rexi�ns"
 
-#: 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 "Recordatorios"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Reno"
 msgstr "Refacer"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Renton"
 msgstr "Xuntanza"
 
-#: 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 "Regras"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reyes"
 msgstr "anos"
 
-#: 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 "Recargar"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Rhinelander"
 msgstr "Finlandia"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhode Island"
 msgstr "Illa Bouvet"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 #, fuzzy
 msgid "Riberalta"
 msgstr "Xibraltar"
 
-#: 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 "Alcume"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rieti"
 msgstr "Hait�"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rifle"
 msgstr "Papel"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rijeka"
 msgstr "Ler"
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rimini"
 msgstr "Roman�a"
 
-#: 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 "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
 #, fuzzy
 msgid "Rishiri Island"
 msgstr "Illas Virxes Brit�nicas"
 
-#: 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 "Liberia"
 
-#: 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 "Imprimir"
 
-#: 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 "Ler"
 
-#: 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 "Croacia"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Robore"
 msgstr "antes"
 
-#: 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 "Polonia"
 
-#: 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 "Cuarto"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rogers"
 msgstr "Cartafoles"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1907
 #, fuzzy
 msgid "Roma/Ciampino"
 msgstr "Roman�a"
 
-#: 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 "Comores"
 
-#: 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 "Papel"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Rost"
 msgstr "Servidor"
 
-#: 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 "Recorrencia"
 
-#: 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 "Austria"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1929
 #, fuzzy
 msgid "Rutland"
 msgstr "But�n"
 
-#: 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 "Departamento"
 
-#: 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 "Espa�a"
 
-#: 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 "Santa Luc�a"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1946
 #, fuzzy
 msgid "Saiq"
 msgstr "Espa�a"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1947
 #, fuzzy
 msgid "Salalah"
 msgstr "Refachos de vento"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1948
 #, fuzzy
 msgid "Salem"
 msgstr "Gardar"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salida"
 msgstr "Somalia"
 
-#: 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 "Somalia"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salinas"
 msgstr "Somalia"
 
-#: 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 "_S�b"
 
-#: 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 "O Salvador"
 
-#: 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 "_Dom"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Sana'A"
 msgstr "Area"
 
-#: 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 "Area"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandberg"
 msgstr "Autor"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sanderson"
 msgstr "Autor"
 
-#: 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 "Area"
 
-#: 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 "Sombreado"
 
-#: 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 "Gardar e Pechar"
 
-#: 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 "Somalia"
 
-#: 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 "Illa Norfolk"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2002
 #, fuzzy
 msgid "San Salvador"
 msgstr "O Salvador"
 
-#: 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 "Santa Luc�a"
 
-#: 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 "Santa Luc�a"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2011
 #, fuzzy
 msgid "Santander"
 msgstr "Autor"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santarem"
 msgstr "Treboada de area"
 
-#: 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 "Santa Luc�a"
 
-#: 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 "Treboada de area"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2019
 #, fuzzy
 msgid "Santos"
 msgstr "Estado"
 
-#: 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 "Santa Luc�a"
 
-#: 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 "Sri 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 "_Dom"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Scatsta"
 msgstr "Estado"
 
-#: 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 "Organizaci�n"
 
-#: 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 "Opci�ns"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Sedalia"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Seeb"
 msgstr "Vista"
 
-#: 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 "Comezando a importaci�n"
 
-#: 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 "Buscar"
 
-#: 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 "Sombreado"
 
-#: 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 "Buscar"
 
-#: 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 "S�bado"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Shawbury"
 msgstr "S�bado"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shearwater"
 msgstr "Data de _Inicio:"
 
-#: 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 "Suecia"
 
-#: 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 "Selecci�n:"
 
-#: 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 "Sud�n"
 
-#: 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 "Tama�o"
 
-#: 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�n"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Show Low"
 msgstr "Neve superficial"
 
-#: 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 "Imprimir"
 
-#: 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 "Seguridade"
 
-#: 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 "Tama�o"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skopje"
 msgstr "Parar"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skwentna"
 msgstr "Enviada"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Slana"
 msgstr "Albania"
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2102
 #, fuzzy
 msgid "Smithers"
 msgstr "minutos"
 
-#: 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 "Neve abundante"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2105
 #, fuzzy
 msgid "Sochi"
 msgstr "Sur"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Socorro"
 msgstr "Puntuaci�n"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Socotra"
 msgstr "Puntuaci�n"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2108
 #, fuzzy
 msgid "Soda Springs"
 msgstr "Folerpas de neve"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2109
 #, fuzzy
 msgid "Sofia"
 msgstr "Somalia"
 
-#: 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 "Eslovenia"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2112
 #, fuzzy
 msgid "Somerset"
 msgstr "Chuvieira"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Sonderborg"
 msgstr "Autor"
 
-#: 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 "Sureste"
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "South Bend"
 msgstr "Sur"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Carolina"
 msgstr "Sud�frica"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
 #, fuzzy
 msgid "South Dakota"
 msgstr "Sureste"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "Southend"
 msgstr "Sur"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "South Marsh Island"
 msgstr "Illas Marshall"
 
-#: 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 "Autor"
 
-#: 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 "Br�tema"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Spokane"
 msgstr "Espa�a"
 
-#: 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 "Simplificado"
 
-#: 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 Completada:"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "Stauning"
 msgstr "Opci�ns"
 
-#: 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 "Opci�ns"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Stavropol"
 msgstr "Parar"
 
-#: 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 "Seichelles"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2143
 #, fuzzy
 msgid "St. George"
 msgstr "Santa 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 "Parar"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Louis"
 msgstr "Santa Luc�a"
 
-#: 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 "Sri Lanka"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Stornoway"
 msgstr "Noruega"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "St Paul"
 msgstr "Estado"
 
-#: 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 "Sub�rbore"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2162
 #, fuzzy
 msgid "St Simon's Island"
 msgstr "Illas Salom�n"
 
-#: 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 "S�bado"
 
-#: 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�n"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sumburgh"
 msgstr "Luxemburgo"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2168
 #, fuzzy
 msgid "Sumter"
 msgstr "Resumo"
 
-#: 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 "_Dom"
 
-#: 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 "Tradicional"
 
-#: 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 "Tarefa"
 
-#: 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 "Gana"
 
-#: 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 "Ent�n"
 
-#: 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 "Taiw�n"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Tainan"
 msgstr "Taiw�n"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2203
 #, fuzzy
 msgid "Taiyuan"
 msgstr "Taiw�n"
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiz"
 msgstr "Taiw�n"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Tajima"
 msgstr "Taiw�n"
 
-#: 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 "Taiw�n"
 
-#: 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 "Xap�n"
 
-#: 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 "Papel"
 
-#: 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 "Laos"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taoyuan"
 msgstr "Taiw�n"
 
-#: 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 "Taiw�n"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Tarbes"
 msgstr "Tarefa"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarija"
 msgstr "Taiw�n"
 
-#: 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 "Tradicional"
 
-#: 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 "Toquelau"
 
-#: 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 "Tarefa"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2243
 #, fuzzy
 msgid "The Dalles"
 msgstr "Seichelles"
 
-#: 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�tulo"
 
-#: 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 "Xoves"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Tianjin"
 msgstr "Taiw�n"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2251
 #, fuzzy
 msgid "Tijuana"
 msgstr "Lituania"
 
-#: 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 "Taiw�n"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2255
 #, fuzzy
 msgid "Tiree"
 msgstr "Libre"
 
-#: 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�tulo"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Tivat"
 msgstr "Privado"
 
-#: 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 "Illa Christmas"
 
-#: 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 "Trocar"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2271
 #, fuzzy
 msgid "Toluca"
 msgstr "Toquelau"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2272
 #, fuzzy
 msgid "Tonopah"
 msgstr "Tonga"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Topeka"
 msgstr "Toquelau"
 
-#: 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 "Superior:"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torrance"
 msgstr "Francia"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torreon"
 msgstr "Coreano"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "Comezando a importaci�n"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Toulouse"
 msgstr "Pechar"
 
-#: 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 "Gab�n"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2289
 #, fuzzy
 msgid "Trapani"
 msgstr "Xap�n"
 
-#: 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 "Orientaci�n"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trevico"
 msgstr "Anterior"
 
-#: 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 "Proba"
 
-#: 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 "Turqu�a"
 
-#: 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 "Martes"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulsa"
 msgstr "Tunicia"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tupelo"
 msgstr "_Mar"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Turaif"
 msgstr "Turco"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turin"
 msgstr "Turco"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2319
 #, fuzzy
 msgid "Turku"
 msgstr "Turqu�a"
 
-#: 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 "Tentativa"
 
-#: 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 "Tipo:"
 
-#: 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 "_Mar"
 
-#: 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 "Emiratos �rabes Unidos"
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2341
 #, fuzzy
 msgid "Unst"
 msgstr "Non vista"
 
-#: 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 "Xap�n"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2344
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "Uruguai"
 
-#: 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 "Variable"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vagar"
 msgstr "Buscapersoas"
 
-#: 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 "Eslovenia"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2359
 #, fuzzy
 msgid "Valentine"
 msgstr "Ver Inline"
 
-#: 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 "maio"
 
-#: 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 "Cancelar"
 
-#: 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 "despois"
 
-#: 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 "Unicode"
 
-#: 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 "Xeral"
 
-#: 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 "Nome do ficheiro:"
 
-#: 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 "Alarmas Visuais"
 
-#: 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 "Australia"
 
-#: 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 "Finlandia"
 
-#: 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 "Toquelau"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volk Field"
 msgstr "Campo _Desde"
 
-#: 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 "Toquelau"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2415
 #, fuzzy
 msgid "Waco"
 msgstr "M�naco"
 
-#: 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 "Illas Falkland (Malvinas)"
 
-#: 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 "Advertencia"
 
-#: 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 "Tempo"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterloo"
 msgstr "Tempo"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Watertown"
 msgstr "Tempo"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Waterville"
 msgstr "Categor�as"
 
-#: 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 "Sitio Web"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2437
 #, fuzzy
 msgid "Wejh"
 msgstr "Me"
 
-#: 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 "Tempo"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wendover"
 msgstr "Autor"
 
-#: 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 "Europeo Occidental"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "Westerland"
 msgstr "Pa�ses Baixos"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westfield"
 msgstr "Oeste"
 
-#: 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 "_Programar Xuntanza"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2451
 #, fuzzy
 msgid "Whidbey Island"
 msgstr "Illa Christmas"
 
-#: 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 "Alcume"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wien"
 msgstr "Me"
 
-#: 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 "Br�tema"
 
-#: 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 "Liechtenstein"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2471
 #, fuzzy
 msgid "Windsor"
 msgstr "Treboada de area"
 
-#: 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 "agora"
 
-#: 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 "Contrasinal"
 
-#: 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 "Micronesia"
 
-#: 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 "Me"
 
-#: 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 "Hong Kong"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Wooster"
 msgstr "Ao p�:"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Worcester"
 msgstr "para sempre"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worland"
 msgstr "Polonia"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worthington"
 msgstr "Traballando"
 
-#: 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 "Traballando"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Xiamen"
 msgstr "Nome:"
 
-#: 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 "Non importar"
 
-#: 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 "Iemen"
 
-#: 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 "Axenda"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zagreb"
 msgstr "P�xina"
 
-#: 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 "Cancelada"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2532
 #, fuzzy
 msgid "Zaragoza"
 msgstr "Paraguai"
 
-#: 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 "Turco"
 
-#: my-evolution/component-factory.c:51
+#: my-evolution/component-factory.c:56
 msgid "Folder containing the Evolution Summary"
 msgstr "Cartafol que cont�n o Resumo de 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 "Citas"
 
-#: my-evolution/e-summary-calendar.c:382
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
 msgstr "Non hai citas"
 
-#: 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 "descrici�n"
 
-#: my-evolution/e-summary-mail.c:153
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "Resumo de correo"
 
-#: 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 "Cartafoles Locais"
 
-#. 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 "Palabra do D�a de Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:602
+#: my-evolution/e-summary-preferences.c:374
 msgid "Quotes of the Day"
 msgstr "Citas do D�a"
 
-#: my-evolution/e-summary-preferences.c:840
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr "Engadir fonte de novas"
 
-#: 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 "Introduza o URL da fonte de novas que desexe engadir"
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Erro descargando o RDF</b>"
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr "Fonte de Novas"
 
-#: my-evolution/e-summary-shown.c:519
+#: my-evolution/e-summary-shown.c:518
 msgid "All"
 msgstr "Todas"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:531
+#: my-evolution/e-summary-shown.c:530
 #, fuzzy
 msgid "Add"
 msgstr "Enga_dir"
 
-#: 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 "Chuvieira"
 
-#: my-evolution/e-summary-tasks.c:328
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "Non hai tarefas"
 
-#: my-evolution/e-summary-tasks.c:372
+#: my-evolution/e-summary-tasks.c:365
 #, fuzzy
 msgid "(No Description)"
 msgstr "Descrici�n:"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:73
 msgid "My Weather"
 msgstr "O Meu Tempo"
 
-#: my-evolution/e-summary-weather.c:268
+#: my-evolution/e-summary-weather.c:262
 #, fuzzy
 msgid "There was an error downloading data for"
 msgstr "Houbo un erro ao descarga-la fonte de novas"
 
-#: my-evolution/e-summary-weather.c:489
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr "Tempo"
 
-#: 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 "%A, %e de %B de %Y"
 
-#: my-evolution/e-summary.c:504
+#: my-evolution/e-summary.c:523
 #, fuzzy
 msgid "Please wait..."
 msgstr "Agarde, por favor"
 
-#: 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 "Imprimir Resumo"
 
-#: my-evolution/e-summary.c:640
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "A impresi�n do Resumo fallou"
 
-#: my-evolution/main.c:68
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "O compo�ente Resumo Executivo non puido inicializar Bonobo.\n"
-
-#: 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 ", "
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 #, fuzzy
 msgid "knots"
 msgstr "n�s"
 
-#: 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 "polHg"
 
-#: 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 "millas"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "kilometers"
 msgstr "quil�metros"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Clear sky"
 msgstr "Ceo limpo"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Broken clouds"
 msgstr "Nubes escachadas"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Scattered clouds"
 msgstr "Nubes espalladas"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Few clouds"
 msgstr "Poucas nubes"
 
-#: my-evolution/metar.c:48
+#: my-evolution/metar.c:49
 msgid "Overcast"
 msgstr "Nubrado"
 
-#: 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 "Non v�lido"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Variable"
 msgstr "Variable"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North"
 msgstr "Norte"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North - NorthEast"
 msgstr "Norte - Nord�s"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Northeast"
 msgstr "Nord�s"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - NorthEast"
 msgstr "Este - Nord�s"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East"
 msgstr "Este"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East - Southeast"
 msgstr "Este - Sureste"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southeast"
 msgstr "Sureste"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southeast"
 msgstr "Sur - Sureste"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South"
 msgstr "Sur"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South - Southwest"
 msgstr "Sur - Suroeste"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Southwest"
 msgstr "Suroeste"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Southwest"
 msgstr "Oeste - Suroeste"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West"
 msgstr "Oeste"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West - Northwest"
 msgstr "Oeste - Noroeste"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "Northwest"
 msgstr "Noroeste"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
 #. DRIZZLE
-#: my-evolution/metar.c:127
+#: my-evolution/metar.c:128
 msgid "Drizzle"
 msgstr "Chuvisca"
 
-#: my-evolution/metar.c:128
+#: my-evolution/metar.c:129
 msgid "Drizzle in the vicinity"
 msgstr "Chuvisca nas proximidades"
 
-#: my-evolution/metar.c:129
+#: my-evolution/metar.c:130
 msgid "Light drizzle"
 msgstr "Chuvisca lene"
 
-#: my-evolution/metar.c:130
+#: my-evolution/metar.c:131
 msgid "Moderate drizzle"
 msgstr "Chuvisca moderada"
 
-#: my-evolution/metar.c:131
+#: my-evolution/metar.c:132
 msgid "Heavy drizzle"
 msgstr "Chuvisca forte"
 
-#: my-evolution/metar.c:132
+#: my-evolution/metar.c:133
 msgid "Shallow drizzle"
 msgstr "Chuvisca superficial"
 
-#: my-evolution/metar.c:133
+#: my-evolution/metar.c:134
 msgid "Patches of drizzle"
 msgstr "Chuviscas espalladas"
 
-#: my-evolution/metar.c:134
+#: my-evolution/metar.c:135
 msgid "Partial drizzle"
 msgstr "Chuvisca parcial"
 
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
 msgid "Thunderstorm"
 msgstr "Treboada"
 
-#: my-evolution/metar.c:136
+#: my-evolution/metar.c:137
 msgid "Windy drizzle"
 msgstr "Chuvisca con ventos"
 
-#: my-evolution/metar.c:137
+#: my-evolution/metar.c:138
 msgid "Showers"
 msgstr "Chuvieira"
 
-#: my-evolution/metar.c:138
+#: my-evolution/metar.c:139
 msgid "Drifting drizzle"
 msgstr "Chuvisca cambiante"
 
-#: my-evolution/metar.c:139
+#: my-evolution/metar.c:140
 msgid "Freezing drizzle"
 msgstr "Chuvisca conxelante"
 
 #. RAIN
-#: my-evolution/metar.c:142
+#: my-evolution/metar.c:143
 msgid "Rain"
 msgstr "Choiva"
 
-#: my-evolution/metar.c:143
+#: my-evolution/metar.c:144
 msgid "Rain in the vicinity"
 msgstr "Chuvia nas proximidades"
 
-#: my-evolution/metar.c:144
+#: my-evolution/metar.c:145
 msgid "Light rain"
 msgstr "Chuvia lene"
 
-#: my-evolution/metar.c:145
+#: my-evolution/metar.c:146
 msgid "Moderate rain"
 msgstr "Chuvia moderada"
 
-#: my-evolution/metar.c:146
+#: my-evolution/metar.c:147
 msgid "Heavy rain"
 msgstr "Chuvia forte"
 
-#: my-evolution/metar.c:147
+#: my-evolution/metar.c:148
 msgid "Shallow rain"
 msgstr "Chuvia superficial"
 
-#: my-evolution/metar.c:148
+#: my-evolution/metar.c:149
 msgid "Patches of rain"
 msgstr "Chuvia espallada"
 
-#: my-evolution/metar.c:149
+#: my-evolution/metar.c:150
 msgid "Partial rainfall"
 msgstr "Chuvia parcial"
 
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:152
 msgid "Blowing rainfall"
 msgstr "Chuvascada con vento"
 
-#: my-evolution/metar.c:152
+#: my-evolution/metar.c:153
 msgid "Rain showers"
 msgstr "Chuvia abundante"
 
-#: my-evolution/metar.c:153
+#: my-evolution/metar.c:154
 msgid "Drifting rain"
 msgstr "Chuvia cambiante"
 
-#: my-evolution/metar.c:154
+#: my-evolution/metar.c:155
 msgid "Freezing rain"
 msgstr "Chuvia conxelante"
 
 #. SNOW
-#: my-evolution/metar.c:157
+#: my-evolution/metar.c:158
 msgid "Snow"
 msgstr "Neve"
 
-#: my-evolution/metar.c:158
+#: my-evolution/metar.c:159
 msgid "Snow in the vicinity"
 msgstr "Neve nas proximidades"
 
-#: my-evolution/metar.c:159
+#: my-evolution/metar.c:160
 msgid "Light snow"
 msgstr "Neve lene"
 
-#: my-evolution/metar.c:160
+#: my-evolution/metar.c:161
 msgid "Moderate snow"
 msgstr "Neve moderada"
 
-#: my-evolution/metar.c:161
+#: my-evolution/metar.c:162
 msgid "Heavy snow"
 msgstr "Neve forte"
 
-#: my-evolution/metar.c:162
+#: my-evolution/metar.c:163
 msgid "Shallow snow"
 msgstr "Neve superficial"
 
-#: my-evolution/metar.c:163
+#: my-evolution/metar.c:164
 msgid "Patches of snow"
 msgstr "Neve espallada"
 
-#: my-evolution/metar.c:164
+#: my-evolution/metar.c:165
 msgid "Partial snowfall"
 msgstr "Neve parcial"
 
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr "Treboada de neve"
 
-#: my-evolution/metar.c:166
+#: my-evolution/metar.c:167
 msgid "Blowing snowfall"
 msgstr "Treboada de vento e neve"
 
-#: my-evolution/metar.c:167
+#: my-evolution/metar.c:168
 msgid "Snow showers"
 msgstr "Neve abundante"
 
-#: my-evolution/metar.c:168
+#: my-evolution/metar.c:169
 msgid "Drifting snow"
 msgstr "Neve cambiante"
 
-#: my-evolution/metar.c:169
+#: my-evolution/metar.c:170
 msgid "Freezing snow"
 msgstr "Neve conxelante"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:172
+#: my-evolution/metar.c:173
 msgid "Snow grains"
 msgstr "Folerpas de neve"
 
-#: my-evolution/metar.c:173
+#: my-evolution/metar.c:174
 msgid "Snow grains in the vicinity"
 msgstr "Folerpas de neve nas proximidades"
 
-#: my-evolution/metar.c:174
+#: my-evolution/metar.c:175
 msgid "Light snow grains"
 msgstr "Folerpas de neve lenes"
 
-#: my-evolution/metar.c:175
+#: my-evolution/metar.c:176
 msgid "Moderate snow grains"
 msgstr "Folerpas de neve moderadas"
 
-#: my-evolution/metar.c:176
+#: my-evolution/metar.c:177
 msgid "Heavy snow grains"
 msgstr "Folerpas de neve fortes"
 
-#: my-evolution/metar.c:177
+#: my-evolution/metar.c:178
 msgid "Shallow snow grains"
 msgstr "Folerpas de neve pouco intensas"
 
-#: my-evolution/metar.c:178
+#: my-evolution/metar.c:179
 msgid "Patches of snow grains"
 msgstr "Folerpas de neve espalladas"
 
-#: my-evolution/metar.c:179
+#: my-evolution/metar.c:180
 msgid "Partial snow grains"
 msgstr "Folerpas de neve parciais"
 
-#: my-evolution/metar.c:181
+#: my-evolution/metar.c:182
 msgid "Blowing snow grains"
 msgstr "Folerpas de neve con vento"
 
-#: my-evolution/metar.c:182
+#: my-evolution/metar.c:183
 msgid "Snow grain showers"
 msgstr "Folerpas de neve abundantes"
 
-#: my-evolution/metar.c:183
+#: my-evolution/metar.c:184
 msgid "Drifting snow grains"
 msgstr "Folerpas de neve cambiantes"
 
-#: my-evolution/metar.c:184
+#: my-evolution/metar.c:185
 msgid "Freezing snow grains"
 msgstr "Folerpas de neve conxelantes"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:187
+#: my-evolution/metar.c:188
 msgid "Ice crystals"
 msgstr "Cristais de xeo"
 
-#: my-evolution/metar.c:188
+#: my-evolution/metar.c:189
 msgid "Ice crystals in the vicinity"
 msgstr "Cristais de xeo nas proximidades"
 
-#: my-evolution/metar.c:189
+#: my-evolution/metar.c:190
 msgid "Few ice crystals"
 msgstr "Poucos cristais de xeo"
 
-#: my-evolution/metar.c:190
+#: my-evolution/metar.c:191
 msgid "Moderate ice crystals"
 msgstr "Cristais de xeo moderados"
 
-#: my-evolution/metar.c:191
+#: my-evolution/metar.c:192
 msgid "Heavy ice crystals"
 msgstr "Moitos cristais de xeo"
 
-#: my-evolution/metar.c:193
+#: my-evolution/metar.c:194
 msgid "Patches of ice crystals"
 msgstr "Cristais de xeo espallados"
 
-#: my-evolution/metar.c:194
+#: my-evolution/metar.c:195
 msgid "Partial ice crystals"
 msgstr "Cristais de xeo parciais"
 
-#: my-evolution/metar.c:195
+#: my-evolution/metar.c:196
 msgid "Ice crystal storm"
 msgstr "Treboada de cristais de xeo"
 
-#: my-evolution/metar.c:196
+#: my-evolution/metar.c:197
 msgid "Blowing ice crystals"
 msgstr "Cristais de xeo con vento"
 
-#: my-evolution/metar.c:197
+#: my-evolution/metar.c:198
 msgid "Showers of ice crystals"
 msgstr "Precipitaci�ns abundantes de cristais de xeo"
 
-#: my-evolution/metar.c:198
+#: my-evolution/metar.c:199
 msgid "Drifting ice crystals"
 msgstr "Cristais de xeo cambiantes"
 
-#: my-evolution/metar.c:199
+#: my-evolution/metar.c:200
 msgid "Freezing ice crystals"
 msgstr "Cristais de xeo conxelantes"
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:202
+#: my-evolution/metar.c:203
 msgid "Ice pellets"
 msgstr "Boli�as de xeo"
 
-#: my-evolution/metar.c:203
+#: my-evolution/metar.c:204
 msgid "Ice pellets in the vicinity"
 msgstr "Boli�as de xeo nas proximidades"
 
-#: my-evolution/metar.c:204
+#: my-evolution/metar.c:205
 msgid "Few ice pellets"
 msgstr "Poucas boli�as de xeo"
 
-#: my-evolution/metar.c:205
+#: my-evolution/metar.c:206
 msgid "Moderate ice pellets"
 msgstr "Boli�as de xeo moderadas"
 
-#: my-evolution/metar.c:206
+#: my-evolution/metar.c:207
 msgid "Heavy ice pellets"
 msgstr "Moitas boli�as de xeo"
 
-#: my-evolution/metar.c:207
+#: my-evolution/metar.c:208
 msgid "Shallow ice pellets"
 msgstr "Boli�as de xeo superficiais"
 
-#: my-evolution/metar.c:208
+#: my-evolution/metar.c:209
 msgid "Patches of ice pellets"
 msgstr "Boli�as de xeo espalladas"
 
-#: my-evolution/metar.c:209
+#: my-evolution/metar.c:210
 msgid "Partial ice pellets"
 msgstr "Boli�as de xeo parciais"
 
-#: my-evolution/metar.c:210
+#: my-evolution/metar.c:211
 msgid "Ice pellet storm"
 msgstr "Treboada de boli�as de xeo"
 
-#: my-evolution/metar.c:211
+#: my-evolution/metar.c:212
 msgid "Blowing ice pellets"
 msgstr "Boli�as de xeo con vento"
 
-#: my-evolution/metar.c:212
+#: my-evolution/metar.c:213
 msgid "Showers of ice pellets"
 msgstr "Precipitaci�ns abundantes de boli�as de xeo"
 
-#: my-evolution/metar.c:213
+#: my-evolution/metar.c:214
 msgid "Drifting ice pellets"
 msgstr "Boli�as de xeo cambiantes"
 
-#: my-evolution/metar.c:214
+#: my-evolution/metar.c:215
 msgid "Freezing ice pellets"
 msgstr "Boli�as de xeo conxelantes"
 
-#: my-evolution/metar.c:218
+#: my-evolution/metar.c:219
 msgid "Hail in the vicinity"
 msgstr "Pedrisco nas proximidades"
 
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
+#: my-evolution/metar.c:220 my-evolution/metar.c:235
 msgid "Light hail"
 msgstr "Pedrisco lene"
 
-#: my-evolution/metar.c:220
+#: my-evolution/metar.c:221
 msgid "Moderate hail"
 msgstr "Pedrisco moderado"
 
-#: my-evolution/metar.c:221
+#: my-evolution/metar.c:222
 msgid "Heavy hail"
 msgstr "Pedrisco forte"
 
-#: my-evolution/metar.c:222
+#: my-evolution/metar.c:223
 msgid "Shallow hail"
 msgstr "Pedrisco superficial"
 
-#: my-evolution/metar.c:223
+#: my-evolution/metar.c:224
 msgid "Patches of hail"
 msgstr "Pedrisco espallado"
 
-#: my-evolution/metar.c:224
+#: my-evolution/metar.c:225
 msgid "Partial hail"
 msgstr "Pedrisco parcial"
 
-#: my-evolution/metar.c:225
+#: my-evolution/metar.c:226
 msgid "Hailstorm"
 msgstr "Treboada de pedrisco"
 
-#: my-evolution/metar.c:226
+#: my-evolution/metar.c:227
 msgid "Blowing hail"
 msgstr "Pedrisco con vento"
 
-#: my-evolution/metar.c:227
+#: my-evolution/metar.c:228
 msgid "Hail showers"
 msgstr "Precipitaci�ns abundantes de pedrisco"
 
-#: my-evolution/metar.c:228
+#: my-evolution/metar.c:229
 msgid "Drifting hail"
 msgstr "Pedrisco cambiante"
 
-#: my-evolution/metar.c:229
+#: my-evolution/metar.c:230
 msgid "Freezing hail"
 msgstr "Pedrisco conxelante"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:232
+#: my-evolution/metar.c:233
 msgid "Small hail"
 msgstr "Sarabia"
 
-#: my-evolution/metar.c:233
+#: my-evolution/metar.c:234
 msgid "Small hail in the vicinity"
 msgstr "Sarabia nas proximidades"
 
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:236
 msgid "Moderate small hail"
 msgstr "Sarabia moderada"
 
-#: my-evolution/metar.c:236
+#: my-evolution/metar.c:237
 msgid "Heavy small hail"
 msgstr "Sarabia forte"
 
-#: my-evolution/metar.c:237
+#: my-evolution/metar.c:238
 msgid "Shallow small hail"
 msgstr "Sarabia superficial"
 
-#: my-evolution/metar.c:238
+#: my-evolution/metar.c:239
 msgid "Patches of small hail"
 msgstr "Sarabia espallada"
 
-#: my-evolution/metar.c:239
+#: my-evolution/metar.c:240
 msgid "Partial small hail"
 msgstr "Sarabia parcial"
 
-#: my-evolution/metar.c:240
+#: my-evolution/metar.c:241
 msgid "Small hailstorm"
 msgstr "Treboada de sarabia"
 
-#: my-evolution/metar.c:241
+#: my-evolution/metar.c:242
 msgid "Blowing small hail"
 msgstr "Treboada de vento e sarabia"
 
-#: my-evolution/metar.c:242
+#: my-evolution/metar.c:243
 msgid "Showers of small hail"
 msgstr "Precipitaci�ns abundantes de sarabia"
 
-#: my-evolution/metar.c:243
+#: my-evolution/metar.c:244
 msgid "Drifting small hail"
 msgstr "Sarabia cambiante"
 
-#: my-evolution/metar.c:244
+#: my-evolution/metar.c:245
 msgid "Freezing small hail"
 msgstr "Sarabia conxelante"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:247
+#: my-evolution/metar.c:248
 msgid "Unknown precipitation"
 msgstr "Precipitaci�n desco�ecida"
 
-#: my-evolution/metar.c:248
+#: my-evolution/metar.c:249
 msgid "Precipitation in the vicinity"
 msgstr "Precipitaci�n nas proximidades"
 
-#: my-evolution/metar.c:249
+#: my-evolution/metar.c:250
 msgid "Light precipitation"
 msgstr "Precipitaci�n lene"
 
-#: my-evolution/metar.c:250
+#: my-evolution/metar.c:251
 msgid "Moderate precipitation"
 msgstr "Precipitaci�n moderada"
 
-#: my-evolution/metar.c:251
+#: my-evolution/metar.c:252
 msgid "Heavy precipitation"
 msgstr "Precipitaci�n forte"
 
-#: my-evolution/metar.c:252
+#: my-evolution/metar.c:253
 msgid "Shallow precipitation"
 msgstr "Precipitaci�n superficial"
 
-#: my-evolution/metar.c:253
+#: my-evolution/metar.c:254
 msgid "Patches of precipitation"
 msgstr "Precipitaci�ns espalladas"
 
-#: my-evolution/metar.c:254
+#: my-evolution/metar.c:255
 msgid "Partial precipitation"
 msgstr "Precipitaci�n parcial"
 
-#: my-evolution/metar.c:255
+#: my-evolution/metar.c:256
 msgid "Unknown thunderstorm"
 msgstr "Treboada desco�ecida"
 
-#: my-evolution/metar.c:256
+#: my-evolution/metar.c:257
 msgid "Blowing precipitation"
 msgstr "Precipitaci�n con vento"
 
-#: my-evolution/metar.c:257
+#: my-evolution/metar.c:258
 msgid "Showers, type unknown"
 msgstr "Precipitaci�ns abundantes, tipo desco�ecido"
 
-#: my-evolution/metar.c:258
+#: my-evolution/metar.c:259
 msgid "Drifting precipitation"
 msgstr "Precipitaci�n cambiante"
 
-#: my-evolution/metar.c:259
+#: my-evolution/metar.c:260
 msgid "Freezing precipitation"
 msgstr "Precipitaci�n conxelante"
 
 #. MIST
-#: my-evolution/metar.c:262
+#: my-evolution/metar.c:263
 msgid "Mist"
 msgstr "Br�tema"
 
-#: my-evolution/metar.c:263
+#: my-evolution/metar.c:264
 msgid "Mist in the vicinity"
 msgstr "Br�tema nas proximidades"
 
-#: my-evolution/metar.c:264
+#: my-evolution/metar.c:265
 msgid "Light mist"
 msgstr "Br�tema lene"
 
-#: my-evolution/metar.c:265
+#: my-evolution/metar.c:266
 msgid "Moderate mist"
 msgstr "Br�tema moderada"
 
-#: my-evolution/metar.c:266
+#: my-evolution/metar.c:267
 msgid "Thick mist"
 msgstr "Br�tema espesa"
 
-#: my-evolution/metar.c:267
+#: my-evolution/metar.c:268
 msgid "Shallow mist"
 msgstr "Br�tema pouco intensa"
 
-#: my-evolution/metar.c:268
+#: my-evolution/metar.c:269
 msgid "Patches of mist"
 msgstr "Br�tema espallada"
 
-#: my-evolution/metar.c:269
+#: my-evolution/metar.c:270
 msgid "Partial mist"
 msgstr "Br�tema parcial"
 
-#: my-evolution/metar.c:271
+#: my-evolution/metar.c:272
 msgid "Mist with wind"
 msgstr "Br�tema con vento"
 
-#: my-evolution/metar.c:273
+#: my-evolution/metar.c:274
 msgid "Drifting mist"
 msgstr "Br�tema parcial"
 
-#: my-evolution/metar.c:274
+#: my-evolution/metar.c:275
 msgid "Freezing mist"
 msgstr "Br�tema conxelante"
 
 #. FOG
-#: my-evolution/metar.c:277
+#: my-evolution/metar.c:278
 msgid "Fog"
 msgstr "N�boa"
 
-#: my-evolution/metar.c:278
+#: my-evolution/metar.c:279
 msgid "Fog in the vicinity"
 msgstr "N�boa nas proximidades"
 
-#: my-evolution/metar.c:279
+#: my-evolution/metar.c:280
 msgid "Light fog"
 msgstr "N�boa lene"
 
-#: my-evolution/metar.c:280
+#: my-evolution/metar.c:281
 msgid "Moderate fog"
 msgstr "N�boa moderada"
 
-#: my-evolution/metar.c:281
+#: my-evolution/metar.c:282
 msgid "Thick fog"
 msgstr "N�boa espesa"
 
-#: my-evolution/metar.c:282
+#: my-evolution/metar.c:283
 msgid "Shallow fog"
 msgstr "N�boa pouco intensa"
 
-#: my-evolution/metar.c:283
+#: my-evolution/metar.c:284
 msgid "Patches of fog"
 msgstr "N�boa espallada"
 
-#: my-evolution/metar.c:284
+#: my-evolution/metar.c:285
 msgid "Partial fog"
 msgstr "N�boa parcial"
 
-#: my-evolution/metar.c:286
+#: my-evolution/metar.c:287
 msgid "Fog with wind"
 msgstr "N�boa con vento"
 
-#: my-evolution/metar.c:288
+#: my-evolution/metar.c:289
 msgid "Drifting fog"
 msgstr "N�boa cambiante"
 
-#: my-evolution/metar.c:289
+#: my-evolution/metar.c:290
 msgid "Freezing fog"
 msgstr "N�boa conxelante"
 
 #. SMOKE
-#: my-evolution/metar.c:292
+#: my-evolution/metar.c:293
 msgid "Smoke"
 msgstr "Fume"
 
-#: my-evolution/metar.c:293
+#: my-evolution/metar.c:294
 msgid "Smoke in the vicinity"
 msgstr "Fume nas proximidades"
 
-#: my-evolution/metar.c:294
+#: my-evolution/metar.c:295
 msgid "Thin smoke"
 msgstr "Fume lixeiro"
 
-#: my-evolution/metar.c:295
+#: my-evolution/metar.c:296
 msgid "Moderate smoke"
 msgstr "Fume moderado"
 
-#: my-evolution/metar.c:296
+#: my-evolution/metar.c:297
 msgid "Thick smoke"
 msgstr "Fume espeso"
 
-#: my-evolution/metar.c:297
+#: my-evolution/metar.c:298
 msgid "Shallow smoke"
 msgstr "Fume pouco intenso"
 
-#: my-evolution/metar.c:298
+#: my-evolution/metar.c:299
 msgid "Patches of smoke"
 msgstr "Fume espallado"
 
-#: my-evolution/metar.c:299
+#: my-evolution/metar.c:300
 msgid "Partial smoke"
 msgstr "Fume parcial"
 
-#: my-evolution/metar.c:300
+#: my-evolution/metar.c:301
 #, fuzzy
 msgid "Thunderous smoke"
 msgstr "Refachos treboentos de vento"
 
-#: my-evolution/metar.c:301
+#: my-evolution/metar.c:302
 msgid "Smoke with wind"
 msgstr "Fume con vento"
 
-#: my-evolution/metar.c:303
+#: my-evolution/metar.c:304
 msgid "Drifting smoke"
 msgstr "Fume cambiante"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:307
+#: my-evolution/metar.c:308
 msgid "Volcanic ash"
 msgstr "Cinza volc�nica"
 
-#: my-evolution/metar.c:308
+#: my-evolution/metar.c:309
 msgid "Volcanic ash in the vicinity"
 msgstr "Cinza volc�nica nas proximidades"
 
-#: my-evolution/metar.c:310
+#: my-evolution/metar.c:311
 msgid "Moderate volcanic ash"
 msgstr "Cinza volc�nica moderada"
 
-#: my-evolution/metar.c:311
+#: my-evolution/metar.c:312
 msgid "Thick volcanic ash"
 msgstr "Cinza volc�nica espesa"
 
-#: my-evolution/metar.c:312
+#: my-evolution/metar.c:313
 msgid "Shallow volcanic ash"
 msgstr "Cinza volc�nica superficial"
 
-#: my-evolution/metar.c:313
+#: my-evolution/metar.c:314
 msgid "Patches of volcanic ash"
 msgstr "Cinza volc�nica espallada"
 
-#: my-evolution/metar.c:314
+#: my-evolution/metar.c:315
 msgid "Partial volcanic ash"
 msgstr "Cinza volc�nica parcial"
 
-#: my-evolution/metar.c:315
+#: my-evolution/metar.c:316
 #, fuzzy
 msgid "Thunderous volcanic ash"
 msgstr "Cinza volc�nica espesa"
 
-#: my-evolution/metar.c:316
+#: my-evolution/metar.c:317
 msgid "Blowing volcanic ash"
 msgstr "Cinza volc�nica con vento"
 
-#: my-evolution/metar.c:317
+#: my-evolution/metar.c:318
 #, fuzzy
 msgid "Showers of volcanic ash"
 msgstr "Precipitaci�ns abundantes de cinza volc�nica "
 
-#: my-evolution/metar.c:318
+#: my-evolution/metar.c:319
 msgid "Drifting volcanic ash"
 msgstr "Cinza volc�nica cambiante"
 
-#: my-evolution/metar.c:319
+#: my-evolution/metar.c:320
 msgid "Freezing volcanic ash"
 msgstr "Cinza volc�nica conxelante"
 
 #. SAND
-#: my-evolution/metar.c:322
+#: my-evolution/metar.c:323
 msgid "Sand"
 msgstr "Area"
 
-#: my-evolution/metar.c:323
+#: my-evolution/metar.c:324
 msgid "Sand in the vicinity"
 msgstr "Area nas proximidades"
 
-#: my-evolution/metar.c:324
+#: my-evolution/metar.c:325
 msgid "Light sand"
 msgstr "Area suave"
 
-#: my-evolution/metar.c:325
+#: my-evolution/metar.c:326
 msgid "Moderate sand"
 msgstr "Area moderada"
 
-#: my-evolution/metar.c:326
+#: my-evolution/metar.c:327
 msgid "Heavy sand"
 msgstr "Area forte"
 
-#: my-evolution/metar.c:328
+#: my-evolution/metar.c:329
 msgid "Patches of sand"
 msgstr "Area espallada"
 
-#: my-evolution/metar.c:329
+#: my-evolution/metar.c:330
 msgid "Partial sand"
 msgstr "Area parcial"
 
-#: my-evolution/metar.c:331
+#: my-evolution/metar.c:332
 msgid "Blowing sand"
 msgstr "Area con vento"
 
-#: my-evolution/metar.c:333
+#: my-evolution/metar.c:334
 msgid "Drifting sand"
 msgstr "Area cambiante"
 
 #. HAZE
-#: my-evolution/metar.c:337
+#: my-evolution/metar.c:338
 msgid "Haze"
 msgstr "Calixe"
 
-#: my-evolution/metar.c:338
+#: my-evolution/metar.c:339
 msgid "Haze in the vicinity"
 msgstr "Calixe nas proximidades"
 
-#: my-evolution/metar.c:339
+#: my-evolution/metar.c:340
 msgid "Light haze"
 msgstr "Calixe lixeira"
 
-#: my-evolution/metar.c:340
+#: my-evolution/metar.c:341
 msgid "Moderate haze"
 msgstr "Calixe moderada"
 
-#: my-evolution/metar.c:341
+#: my-evolution/metar.c:342
 msgid "Thick haze"
 msgstr "Calixe espesa"
 
-#: my-evolution/metar.c:342
+#: my-evolution/metar.c:343
 msgid "Shallow haze"
 msgstr "Calixe pouco intensa"
 
-#: my-evolution/metar.c:343
+#: my-evolution/metar.c:344
 msgid "Patches of haze"
 msgstr "Calixe espallada"
 
-#: my-evolution/metar.c:344
+#: my-evolution/metar.c:345
 msgid "Partial haze"
 msgstr "Calixe parcial"
 
-#: my-evolution/metar.c:346
+#: my-evolution/metar.c:347
 msgid "Haze with wind"
 msgstr "Calixe con vento"
 
-#: my-evolution/metar.c:348
+#: my-evolution/metar.c:349
 msgid "Drifting haze"
 msgstr "Calixe cambiante"
 
-#: my-evolution/metar.c:349
+#: my-evolution/metar.c:350
 msgid "Freezing haze"
 msgstr "Calixe conxelante"
 
 #. SPRAY
-#: my-evolution/metar.c:352
+#: my-evolution/metar.c:353
 #, fuzzy
 msgid "Spray"
 msgstr "Orballo"
 
-#: my-evolution/metar.c:353
+#: my-evolution/metar.c:354
 #, fuzzy
 msgid "Spray in the vicinity"
 msgstr "Orballo nas proximidades"
 
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
 #, fuzzy
 msgid "Light spray"
 msgstr "Orballo lene"
 
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
 #, fuzzy
 msgid "Moderate spray"
 msgstr "Orballo moderado"
 
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
 #, fuzzy
 msgid "Heavy spray"
 msgstr "Orballo forte"
 
-#: my-evolution/metar.c:357
+#: my-evolution/metar.c:358
 #, fuzzy
 msgid "Shallow spray"
 msgstr "Orballo pouco intenso"
 
-#: my-evolution/metar.c:358
+#: my-evolution/metar.c:359
 #, fuzzy
 msgid "Patches of spray"
 msgstr "Orballo espallado"
 
-#: my-evolution/metar.c:359
+#: my-evolution/metar.c:360
 #, fuzzy
 msgid "Partial spray"
 msgstr "Orballo parcial"
 
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
 #, fuzzy
 msgid "Blowing spray"
 msgstr "Orballo con vento"
 
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
 #, fuzzy
 msgid "Drifting spray"
 msgstr "Orballo cambiante"
 
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
 #, fuzzy
 msgid "Freezing spray"
 msgstr "Orballo conxelante"
 
 #. DUST
-#: my-evolution/metar.c:367
+#: my-evolution/metar.c:368
 msgid "Dust"
 msgstr "Po"
 
-#: my-evolution/metar.c:368
+#: my-evolution/metar.c:369
 msgid "Dust in the vicinity"
 msgstr "Po nas proximidades"
 
-#: my-evolution/metar.c:369
+#: my-evolution/metar.c:370
 msgid "Light dust"
 msgstr "Po suave"
 
-#: my-evolution/metar.c:370
+#: my-evolution/metar.c:371
 msgid "Moderate dust"
 msgstr "Po moderado"
 
-#: my-evolution/metar.c:371
+#: my-evolution/metar.c:372
 msgid "Heavy dust"
 msgstr "Po forte"
 
-#: my-evolution/metar.c:373
+#: my-evolution/metar.c:374
 msgid "Patches of dust"
 msgstr "Po espallado"
 
-#: my-evolution/metar.c:374
+#: my-evolution/metar.c:375
 msgid "Partial dust"
 msgstr "Po parcial"
 
-#: my-evolution/metar.c:376
+#: my-evolution/metar.c:377
 msgid "Blowing dust"
 msgstr "Po con vento"
 
-#: my-evolution/metar.c:378
+#: my-evolution/metar.c:379
 msgid "Drifting dust"
 msgstr "Po cambiante"
 
 #. SQUALL
-#: my-evolution/metar.c:382
+#: my-evolution/metar.c:383
 msgid "Squall"
 msgstr "Refachos de vento"
 
-#: my-evolution/metar.c:383
+#: my-evolution/metar.c:384
 msgid "Squall in the vicinity"
 msgstr "Refachos de vento nas proximidades"
 
-#: my-evolution/metar.c:384
+#: my-evolution/metar.c:385
 msgid "Light squall"
 msgstr "Refachos lenes de vento"
 
-#: my-evolution/metar.c:385
+#: my-evolution/metar.c:386
 msgid "Moderate squall"
 msgstr "Refachos moderados de vento"
 
-#: my-evolution/metar.c:386
+#: my-evolution/metar.c:387
 msgid "Heavy squall"
 msgstr "Refachos fortes de vento"
 
-#: my-evolution/metar.c:389
+#: my-evolution/metar.c:390
 msgid "Partial squall"
 msgstr "Refachos de vento espallados"
 
-#: my-evolution/metar.c:390
+#: my-evolution/metar.c:391
 msgid "Thunderous squall"
 msgstr "Refachos treboentos de vento"
 
-#: my-evolution/metar.c:391
+#: my-evolution/metar.c:392
 msgid "Blowing squall"
 msgstr "Refachos con vento"
 
-#: my-evolution/metar.c:393
+#: my-evolution/metar.c:394
 msgid "Drifting squall"
 msgstr "Refachos de vento cambiantes"
 
-#: my-evolution/metar.c:394
+#: my-evolution/metar.c:395
 msgid "Freezing squall"
 msgstr "Refachos de vento conxelantes"
 
 #. SANDSTORM
-#: my-evolution/metar.c:397
+#: my-evolution/metar.c:398
 msgid "Sandstorm"
 msgstr "Treboada de area"
 
-#: my-evolution/metar.c:398
+#: my-evolution/metar.c:399
 msgid "Sandstorm in the vicinity"
 msgstr "Treboada de area nas proximidades"
 
-#: my-evolution/metar.c:399
+#: my-evolution/metar.c:400
 msgid "Light standstorm"
 msgstr "Treboada de area lene"
 
-#: my-evolution/metar.c:400
+#: my-evolution/metar.c:401
 msgid "Moderate sandstorm"
 msgstr "Treboada de area moderada"
 
-#: my-evolution/metar.c:401
+#: my-evolution/metar.c:402
 msgid "Heavy sandstorm"
 msgstr "Treboada de area forte"
 
-#: my-evolution/metar.c:402
+#: my-evolution/metar.c:403
 msgid "Shallow sandstorm"
 msgstr "Treboada de area superficial"
 
-#: my-evolution/metar.c:404
+#: my-evolution/metar.c:405
 msgid "Partial sandstorm"
 msgstr "Treboada de area parcial"
 
-#: my-evolution/metar.c:405
+#: my-evolution/metar.c:406
 msgid "Thunderous sandstorm"
 msgstr "Treboada de area con tronos"
 
-#: my-evolution/metar.c:406
+#: my-evolution/metar.c:407
 msgid "Blowing sandstorm"
 msgstr "Treboada de area con vento"
 
-#: my-evolution/metar.c:408
+#: my-evolution/metar.c:409
 msgid "Drifting sandstorm"
 msgstr "Treboada de area cambiante"
 
-#: my-evolution/metar.c:409
+#: my-evolution/metar.c:410
 msgid "Freezing sandstorm"
 msgstr "Treboada de area conxelante"
 
 #. DUSTSTORM
-#: my-evolution/metar.c:412
+#: my-evolution/metar.c:413
 msgid "Duststorm"
 msgstr "Treboada de po"
 
-#: my-evolution/metar.c:413
+#: my-evolution/metar.c:414
 msgid "Duststorm in the vicinity"
 msgstr "Treboada de po nas proximidades"
 
-#: my-evolution/metar.c:414
+#: my-evolution/metar.c:415
 msgid "Light duststorm"
 msgstr "Treboada de po lene"
 
-#: my-evolution/metar.c:415
+#: my-evolution/metar.c:416
 msgid "Moderate duststorm"
 msgstr "Treboada de po moderada"
 
-#: my-evolution/metar.c:416
+#: my-evolution/metar.c:417
 msgid "Heavy duststorm"
 msgstr "Treboada de po forte"
 
-#: my-evolution/metar.c:417
+#: my-evolution/metar.c:418
 msgid "Shallow duststorm"
 msgstr "Treboada de po superficial"
 
-#: my-evolution/metar.c:419
+#: my-evolution/metar.c:420
 msgid "Partial duststorm"
 msgstr "Treboada de po parcial"
 
-#: my-evolution/metar.c:420
+#: my-evolution/metar.c:421
 msgid "Thunderous duststorm"
 msgstr "Treboada de po con tronos"
 
-#: my-evolution/metar.c:421
+#: my-evolution/metar.c:422
 msgid "Blowing duststorm"
 msgstr "Treboada de po con vento"
 
-#: my-evolution/metar.c:423
+#: my-evolution/metar.c:424
 msgid "Drifting duststorm"
 msgstr "Treboada de po cambiante"
 
-#: my-evolution/metar.c:424
+#: my-evolution/metar.c:425
 msgid "Freezing duststorm"
 msgstr "Treboada de po conxelante"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
+#: my-evolution/metar.c:428
 msgid "Funnel cloud"
 msgstr "Nube funil"
 
-#: my-evolution/metar.c:428
+#: my-evolution/metar.c:429
 msgid "Funnel cloud in the vicinity"
 msgstr "Nube funil nas proximidades"
 
-#: my-evolution/metar.c:429
+#: my-evolution/metar.c:430
 msgid "Light funnel cloud"
 msgstr "Nube funil lixeira"
 
-#: my-evolution/metar.c:430
+#: my-evolution/metar.c:431
 msgid "Moderate funnel cloud"
 msgstr "Nube funil moderada"
 
-#: my-evolution/metar.c:431
+#: my-evolution/metar.c:432
 msgid "Thick funnel cloud"
 msgstr "Nube funil espesa"
 
-#: my-evolution/metar.c:432
+#: my-evolution/metar.c:433
 msgid "Shallow funnel cloud"
 msgstr "Nube funil pouco intensa"
 
-#: my-evolution/metar.c:433
+#: my-evolution/metar.c:434
 msgid "Patches of funnel clouds"
 msgstr "Nubes funil espalladas"
 
-#: my-evolution/metar.c:434
+#: my-evolution/metar.c:435
 msgid "Partial funnel clouds"
 msgstr "Nubes funil parciais"
 
-#: my-evolution/metar.c:436
+#: my-evolution/metar.c:437
 msgid "Funnel cloud w/ wind"
 msgstr "Nube funil con vento"
 
-#: my-evolution/metar.c:438
+#: my-evolution/metar.c:439
 msgid "Drifting funnel cloud"
 msgstr "Nube funil cambiante"
 
 #. 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 "Tornado nas proximidades"
 
-#: my-evolution/metar.c:445
+#: my-evolution/metar.c:446
 msgid "Moderate tornado"
 msgstr "Tornado moderado"
 
-#: my-evolution/metar.c:446
+#: my-evolution/metar.c:447
 msgid "Raging tornado"
 msgstr "Tornado furioso"
 
-#: my-evolution/metar.c:449
+#: my-evolution/metar.c:450
 msgid "Partial tornado"
 msgstr "Tornado parcial"
 
-#: my-evolution/metar.c:450
+#: my-evolution/metar.c:451
 msgid "Thunderous tornado"
 msgstr "Tornado treboento"
 
-#: my-evolution/metar.c:453
+#: my-evolution/metar.c:454
 msgid "Drifting tornado"
 msgstr "Tornado cambiante"
 
-#: my-evolution/metar.c:454
+#: my-evolution/metar.c:455
 msgid "Freezing tornado"
 msgstr "Tornado conxelante"
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:457
+#: my-evolution/metar.c:458
 msgid "Dust whirls"
 msgstr "Remu��os de po"
 
-#: my-evolution/metar.c:458
+#: my-evolution/metar.c:459
 msgid "Dust whirls in the vicinity"
 msgstr "Remu��os de po nas proximidades"
 
-#: my-evolution/metar.c:459
+#: my-evolution/metar.c:460
 msgid "Light dust whirls"
 msgstr "Remu��os de po lenes"
 
-#: my-evolution/metar.c:460
+#: my-evolution/metar.c:461
 msgid "Moderate dust whirls"
 msgstr "Remu��os de po moderados"
 
-#: my-evolution/metar.c:461
+#: my-evolution/metar.c:462
 msgid "Heavy dust whirls"
 msgstr "Remu��os de po intensos"
 
-#: my-evolution/metar.c:462
+#: my-evolution/metar.c:463
 msgid "Shallow dust whirls"
 msgstr "Remu��os de po pouco intensos"
 
-#: my-evolution/metar.c:463
+#: my-evolution/metar.c:464
 msgid "Patches of dust whirls"
 msgstr "Remu��os de po espallados"
 
-#: my-evolution/metar.c:464
+#: my-evolution/metar.c:465
 msgid "Partial dust whirls"
 msgstr "Remu��os de po parciais"
 
-#: my-evolution/metar.c:466
+#: my-evolution/metar.c:467
 msgid "Blowing dust whirls"
 msgstr "Remu��os de po con vento"
 
-#: my-evolution/metar.c:468
+#: my-evolution/metar.c:469
 msgid "Drifting dust whirls"
 msgstr "Remu��os de po cambiantes"
 
@@ -26391,33 +26710,34 @@ msgstr "_Programar"
 msgid "_Weather"
 msgstr "_Tempo"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for Evolution folder settings."
-msgstr "F�brica para o compositor de 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 "O shell de Evolution."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "F�brica para o compo�ente de correo de Evolution."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
 #, fuzzy
 msgid "Folder Settings"
 msgstr "Opci�ns"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "The Evolution shell."
-msgstr "O shell de Evolution."
-
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr "Amosa-los Detalles"
 
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
 msgid "Cancel Operation"
 msgstr "Cancelar Operaci�n"
 
-#: shell/e-folder-dnd-bridge.c:53
+#: shell/e-folder-dnd-bridge.c:55
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -26426,57 +26746,40 @@ msgstr ""
 "Non foi posible borrar o cartafol:\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 "Abrir en %s..."
 
-#: shell/e-folder-list.c:312
+#: shell/e-folder-list.c:338
 #, fuzzy
 msgid "Add a Folder"
 msgstr "Seleccionar Cartafol"
 
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
 #, fuzzy
 msgid "Drafts"
 msgstr "Borrador"
 
-#: 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 "Entrada"
 
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:181
 msgid "Outbox"
 msgstr "Sa�da"
 
-#: shell/e-local-storage.c:181
+#: shell/e-local-storage.c:182
 #, fuzzy
 msgid "Sent"
 msgstr "Vista"
 
-#: shell/e-setup.c:126
-msgid "Evolution installation"
-msgstr "Instalaci�n de Evolution"
-
-#: shell/e-setup.c:130
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Esta nova versi�n de Evolution necesita instalar ficheiros\n"
-"adicionais no seu directorio persoal de Evolution"
-
-#: shell/e-setup.c:131
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Prema \"Aceptar\" para instalar os ficheiros, ou \"Cancelar\" para sa�r."
-
-#: shell/e-setup.c:171
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: shell/e-setup.c:194
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -26487,7 +26790,7 @@ msgstr ""
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -26496,33 +26799,7 @@ msgstr ""
 "Ocorreu un erro ao copiar ficheiros a\n"
 "`%s'."
 
-#: shell/e-setup.c:282
-#, fuzzy, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Non foi posible crear o directorio %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"
@@ -26533,20 +26810,7 @@ msgstr ""
 "M�vao para poder instalar os ficheiros de\n"
 "usuario de 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 ""
-"Evolution detectou un directorio de\n"
-"Resumo Executivo antigo. Ten que se\n"
-"eliminar antes de executar Evolution.\n"
-"�Quere eliminar este directorio?"
-
-#: shell/e-setup.c:368
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -26561,27 +26825,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 "Data na que se completa"
 
-#: shell/e-shell-config-default-folders.c:133
+#: shell/e-shell-config-default-folders.c:149
 #, fuzzy
 msgid "Select Default Folder"
 msgstr "Cartafoles Especiais"
 
-#: shell/e-shell-config-folder-settings.c:71
+#: shell/e-shell-config-folder-settings.c:70
 #, fuzzy
 msgid "Default Folders"
 msgstr "Cartafoles Especiais"
 
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
 #, fuzzy
 msgid "Offline Folders"
 msgstr "Cartafoles Especiais"
 
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 #, fuzzy
 msgid "Autocompletion Folders"
 msgstr "Data na que se completa"
@@ -26591,44 +26855,44 @@ msgstr "Data na que se completa"
 msgid "Cannot copy folder: %s"
 msgstr "Non � posible obter o cartafol: %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 ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr "Non se pode mover un cartafol a si mesmo."
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr "Non se pode copiar un cartafol a si mesmo."
 
-#: 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 "Non se pode mover un cartafol a un dos seus descendentes"
 
-#: 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 "Indique un cartafol no que copia-lo cartafol \"%s\":"
 
-#: shell/e-shell-folder-commands.c:325
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr "Copiar cartafol"
 
-#: 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 "Indique un cartafol no que move-lo cartafol \"%s\":"
 
-#: shell/e-shell-folder-commands.c:369
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "Mover cartafol"
 
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -26637,17 +26901,17 @@ msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:406
-#, fuzzy, c-format
-msgid "Delete \"%s\""
-msgstr "Eliminar"
-
-#: shell/e-shell-folder-commands.c:407
+#: shell/e-shell-folder-commands.c:405
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "Elimina-lo cartafol '%s'"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:412
+#, fuzzy, c-format
+msgid "Delete \"%s\""
+msgstr "Eliminar"
+
+#: shell/e-shell-folder-commands.c:485
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -26656,27 +26920,27 @@ msgstr ""
 "Non foi posible borrar o cartafol:\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 "Renomea-lo cartafol '%s'"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:540
 #, fuzzy
 msgid "Rename folder"
 msgstr "Renomea-lo cartafol '%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 "O nome de cartafol indicado non � v�lido: %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"
@@ -26685,7 +26949,7 @@ msgstr ""
 "Non foi posible borrar o cartafol:\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"
@@ -26694,24 +26958,20 @@ msgstr ""
 "Non se pode crear o cartafol indicado:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:308
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Crear un _Novo Cartafol..."
 
-#: shell/e-shell-folder-selection-dialog.c:393
-msgid "New..."
-msgstr "Nova..."
-
-#: 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 "(Sen_t�tulo)"
 
-#: 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"
@@ -26725,11 +26985,11 @@ msgstr ""
 "Pode seleccionar \"Autom�tico\" se non o sabe, e Evolution tentar� "
 "averigualo."
 
-#: 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"
@@ -26738,23 +26998,23 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento %d."
 
-#: shell/e-shell-importer.c:355
+#: shell/e-shell-importer.c:351
 #, fuzzy
 msgid "Select importer"
 msgstr "Seleccionar Cartafol"
 
-#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:492
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "O cartafol `%s' non existe."
 
-#: 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"
@@ -26763,11 +27023,11 @@ msgstr ""
 "Non hai importador capaz de manexar\n"
 "%s"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:522
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -26776,17 +27036,17 @@ msgstr ""
 "Importando %s.\n"
 "Comezando %s"
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "Erro ao iniciar %s"
 
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro ao cargar %s"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26795,32 +27055,32 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "Autom�tico"
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Nome do ficheiro:"
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Tipo de ficheiro:"
 
-#: 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 "Importar un formato de ficheiro externo"
 
-#: 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"
@@ -26828,197 +27088,195 @@ msgstr ""
 "Agarde...\n"
 "Buscando configuraci�ns existentes"
 
-#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Iniciando os Importadores Intelixentes"
 
-#: 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
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Escolla un cartafol de destino para importar estes datos"
 
-#: 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 "Importar"
 
-#: shell/e-shell-offline-handler.c:582
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "Pechando as conexi�ns..."
 
-#: shell/e-shell-offline-sync.c:161
+#: shell/e-shell-offline-sync.c:163
 #, fuzzy, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
 "%s"
 msgstr "Sincronizando '%s'"
 
-#: shell/e-shell-offline-sync.c:239
+#: shell/e-shell-offline-sync.c:232
 #, fuzzy
 msgid "Syncing Folder"
 msgstr "Sincronizando cartafol"
 
 #. 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 "Sincronizando '%s'"
 
-#: 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 "Seleccione un servidor."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Abrindo cartafol %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 "Abrindo cartafol %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 "Abrir en %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 "Non foi posible renomear o cartafol: %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 ""
 "Non se pode crear o cartafol indicado:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:159
-#, fuzzy, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-"Non se puido inicia-la interface do Mago de Correo de Evolution\n"
-"%s"
-
-#: shell/e-shell-startup-wizard.c:169
-#, fuzzy
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr ""
-"Non se puido inicia-la interface do Mago de Correo de Evolution\n"
-"%s"
-
-#: 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 "Novo"
 
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Non se especificou un nome de cartafol"
 
-#: shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr "O nome do cartafol non pode conter o car�cter Return."
 
-#: shell/e-shell-utils.c:127
+#: shell/e-shell-utils.c:129
 #, fuzzy
-msgid "Folder name cannot contain slashes."
-msgstr "Este cartafol non pode conter mensaxes."
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "O nome do cartafol non pode conter o car�cter Return."
+
+#: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "O nome do cartafol non pode conter o car�cter Return."
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' e '..' son nomes de cartafol reservados."
 
-#: 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 "Erro ao executar o filtro: %s: %s"
 
-#: shell/e-shell-view-menu.c:196
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Non se atopou o Bug buddy no seu $PATH."
+#: shell/e-shell-view-menu.c:193
+#, fuzzy
+msgid "Bug buddy is not installed."
+msgstr "Non foi posible executar o Bug buddy."
 
-#: shell/e-shell-view-menu.c:204
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
 msgstr "Non foi posible executar o Bug buddy."
 
-#: shell/e-shell-view-menu.c:248
+#: shell/e-shell-view-menu.c:247
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Acerca de Evolution..."
 
-#: shell/e-shell-view-menu.c:503
+#: shell/e-shell-view-menu.c:502
 msgid "Go to folder..."
 msgstr "Ir � cartafol..."
 
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:503
 msgid "Select the folder that you want to open"
 msgstr "Seleccione o cartafol a abrir"
 
-#: shell/e-shell-view-menu.c:625
+#: shell/e-shell-view-menu.c:617
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Crear un novo atallo"
 
-#: 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 "Escolla o cartafol ao que quere que apunte o atallo:"
 
-#: shell/e-shell-view-menu.c:788
+#: shell/e-shell-view-menu.c:769
 #, fuzzy
 msgid "_Work Online"
 msgstr "Traballar Conectado"
 
-#: 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 "_Traballar Desconectado"
 
-#: 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 "Traballar Desconectado"
 
-#: shell/e-shell-view.c:226
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "(Ning�n cartafol visualizado)"
 
-#: 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 "(Nada)"
 
-#: shell/e-shell-view.c:1910
+#: shell/e-shell-view.c:2091
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr "Evolucion est� conectado. Prema neste bot�n para desconectar."
 
-#: shell/e-shell-view.c:1917
+#: shell/e-shell-view.c:2098
 #, fuzzy
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution est� desconect�ndose"
 
-#: shell/e-shell-view.c:1923
+#: shell/e-shell-view.c:2104
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
@@ -27032,12 +27290,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:739
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Non se pode activar o armacenamento 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"
@@ -27045,150 +27303,144 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2178
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Argumentos non v�lidos"
 
-#: shell/e-shell.c:2180
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "Non se pode rexistrar en OAF"
 
-#: shell/e-shell.c:2182
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "Non se atopou a Base de Datos de configuraci�ns"
 
-#: shell/e-shell.c:2184 shell/e-storage.c:571
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Erro xen�rico"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:80
 msgid "Create new shortcut group"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:77
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
-#: 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 ""
 "�Realmente desexa eliminar o grupo\n"
 "`%s' da barra de atallos?"
 
-#: shell/e-shortcuts-view.c:178
-msgid "Don't remove"
-msgstr "Non eliminar"
-
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr "Renomear Grupo de Atallos"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr "Renomear o grupo de atallos seleccionado a:"
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "Iconas _Pequenas"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr "Amosar os atallos como iconas pequenas"
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr "Iconas _Grandes"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr "Amosar os atallos como iconas grandes"
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr "_Novo Grupo..."
 
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
 msgstr "_Eliminar este Grupo..."
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
 msgstr "Re_nomear este Grupo..."
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr "Renomear este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr "Agochar a Barra de _Atallos"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr "Agochar a barra de atallos"
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:281
 #, fuzzy
 msgid "Create _Default Shortcuts"
 msgstr "Crear un novo atallo"
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:282
 #, fuzzy
 msgid "Create Default Shortcuts"
 msgstr "Crear un novo atallo"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr "Renomear atallo"
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr "Renomea-lo atallo seleccionado a:"
 
-#: shell/e-shortcuts-view.c:408
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr "Abrir o cartafol ligado a este atallo"
 
-#: 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 "Abrir nunha Nova _Fiestra"
 
-#: 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 "Abri-lo cartafol ligado a este atallo nunha nova fiestra"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr "Renomear este atallo"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Re_move"
 msgstr "Eli_minar"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eliminar este atallo da barra de atallos"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr "Erro ao gardar os atallos."
 
-#: shell/e-shortcuts.c:1080
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr "Atallos"
 
@@ -27196,74 +27448,74 @@ msgstr "Atallos"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:569
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "Sen erros"
 
-#: shell/e-storage.c:573
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr "Xa existe un cartafol co mesmo nome"
 
-#: shell/e-storage.c:575
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr "O tipo do cartafol indicado non � v�lido"
 
-#: shell/e-storage.c:577
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:579
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr "Non hai espacio dabondo para crear o cartafol"
 
-#: 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 "Non se atopou o cartafol indicado"
 
-#: shell/e-storage.c:585
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr "Funci�n non implementada neste medio de armacenamento"
 
-#: shell/e-storage.c:589
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr "Operaci�n non soportada"
 
-#: shell/e-storage.c:591
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado non est� soportado neste almacenamento"
 
-#: shell/e-storage.c:593
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr "O cartafol especificado non se pode modificar ou eliminar"
 
-#: shell/e-storage.c:595
+#: shell/e-storage.c:596
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Non se pode converter un cartafol nun fillo dun dos seus descendentes"
 
-#: shell/e-storage.c:597
+#: shell/e-storage.c:598
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Non se pode crear bloqueo de cartafol en %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 "%s (...)"
 
-#: shell/e-task-widget.c:196
+#: shell/e-task-widget.c:216
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completa)"
 
-#: shell/evolution-folder-selector-button.c:94
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<prema aqu� para seleccionar un cartafol>"
 
@@ -27293,95 +27545,92 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1145
+#: shell/evolution-shell-component.c:1182
 #, fuzzy
 msgid "CORBA error"
 msgstr "Erro de 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 "Argumentos non v�lidos"
 
-#: 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 "Nada"
 
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1192
 #, fuzzy
 msgid "Not found"
 msgstr "Tarxeta non atopada"
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1194
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Dete_ctar tipos soportados "
 
-#: 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 "O usuario cancelou a operaci�n."
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1200
 #, fuzzy
 msgid "Internal error"
 msgstr "Outro erro"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1204
 #, fuzzy
 msgid "Exists"
 msgstr "Existe"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1206
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Non v�lido"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1210
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Non existe o cartafol %s"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1212
 #, fuzzy
 msgid "No space left"
 msgstr "Ningunha Mensaxe Seleccionada"
 
-#: 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 "Tipo de ficheiro:"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr "Conexi�ns activas"
+#: shell/evolution-test-component.c:703
+#, fuzzy
+msgid "Evolution Test Component"
+msgstr "Compositor de correo de 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 "Prema en Aceptar para pechar estas conexi�ns e desconectar"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "Servidor"
-
-#: 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 "As seguintes conexi�ns est�n activas nestes intres:"
 
@@ -27405,15 +27654,15 @@ msgstr "_Correo"
 msgid "_Tasks:"
 msgstr "Tarefas"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder name:"
 msgstr "Nome do cartafol:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder type:"
 msgstr "Tipo do cartafol:"
 
-#: 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 "Especifica �nde crear o cartafol:"
 
@@ -27437,39 +27686,39 @@ msgstr "Nome do cartafol:"
 msgid "_User:"
 msgstr "Nome de _Usuario:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Evolution Setup Assistant"
 msgstr "Asistente de Importaci�n de Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 #, fuzzy
 msgid "Importing Files"
 msgstr "Importando"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Fuso horario "
 
-#: 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
@@ -27510,42 +27759,43 @@ msgstr ""
 "Este asistente guiarao no proceso de importaci�n de\n"
 "ficheiros externos a Evolution."
 
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
 msgid "Importers"
 msgstr "Importadores"
 
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Non importar"
 
-#: shell/importer/intelligent.c:198
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Non preguntar de novo"
 
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution pode importar datos dos seguintes ficheiros:"
 
-#: 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 "_Fiestra de Evolution"
 
-#: 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"
@@ -27567,7 +27817,7 @@ msgstr ""
 "Esperamos que desfrute do resultado do noso duro traballo, e\n"
 "agardamos con impaciencia polas s�as colaboraci�ns.\n"
 
-#: shell/main.c:250
+#: shell/main.c:290
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -27576,77 +27826,111 @@ msgstr ""
 "Graci�as\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:259
+#: shell/main.c:298
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Non preguntar de novo"
 
-#: shell/main.c:394
+#: shell/main.c:387
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Non se pode acceder ao shell de Evolution."
 
-#: shell/main.c:403
+#: shell/main.c:396
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Non se pode inicializar o shell de Evolution: %s"
 
-#: shell/main.c:485
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Desactivar a pantalla inicial"
 
-#: shell/main.c:487
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Comezando a importaci�n"
 
-#: shell/main.c:489
+#: shell/main.c:532
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Iniciando os Importadores Intelixentes"
 
-#: 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 "Enviar a sa�da da depuraci�n de todos os compo�entes a un ficheiro."
 
-#: 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 "Non se pode inicializar o sistema de compo�entes de 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 "Erro ao cargar o ficheiro: %s"
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 #, fuzzy
 msgid "Input File"
 msgstr "Inserir Ficheiro"
 
-#: tools/evolution-addressbook-export.c:46
-#, fuzzy
-msgid "Output File"
-msgstr "Abrir ficheiro"
-
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 #, fuzzy
 msgid "No filename provided."
 msgstr "Non se especificou un nome de cartafol"
 
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "Engadir anexo..."
+
+#: 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 "A descrici�n cont�n"
+
+#: 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 "Borrar esta mensaxe"
+
+#. 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 "Non foi posible renomear o cartafol: %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..."
@@ -27740,7 +28024,7 @@ msgstr "a 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 "_Acci�ns"
 
@@ -27859,7 +28143,7 @@ msgid "Print this item"
 msgstr "Imprimir este elemento"
 
 #: 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 "Gardar"
 
@@ -27886,7 +28170,7 @@ msgstr "Gravar este elemento no disco"
 #: 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 "_Ficheiro"
 
@@ -28142,7 +28426,7 @@ msgstr "Lista de Mensaxes por F�os"
 msgid "_Expunge"
 msgstr "_Limpar"
 
-#: 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 "_Cartafol"
 
@@ -28409,7 +28693,7 @@ msgstr "Resposta � Tarefa"
 
 #: 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 "Comprobar as novas mensaxes en t�dolos cartafoles"
 
 #: ui/evolution-mail-message.xml.h:64
@@ -28575,7 +28859,7 @@ msgstr "Citado"
 msgid "_Resend..."
 msgstr "_Renomear..."
 
-#: 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 "_Ferramentas"
 
@@ -28590,12 +28874,12 @@ msgstr "Pechar esta fiestra"
 #: 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 "_Pechar"
 
 #: 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 "_Vista"
 
@@ -28603,6 +28887,10 @@ msgstr "_Vista"
 msgid "Attach"
 msgstr "Anexar"
 
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Anexar un ficheiro"
+
 #: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
@@ -28775,7 +29063,7 @@ msgstr "HTML"
 msgid "Save the current file and close the window"
 msgstr "Gardar o elemento e pechar a caixa de di�logo"
 
-#: 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_xuda"
 
@@ -28963,132 +29251,122 @@ msgstr "_Preferencias de Correo..."
 
 #: ui/evolution.xml.h:27
 #, fuzzy
-msgid "Pilot Con_duit Settings..."
-msgstr "_Preferencias de Correo..."
-
-#: ui/evolution.xml.h:28
-#, fuzzy
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "Crear un _Novo Cartafol..."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar o correo na cola e recibir o correo novo"
 
-#: ui/evolution.xml.h:31
-#, fuzzy
-msgid "Set up Pilot conduit configuration"
-msgstr "Configuraci�n do Correo"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Configuraci�n do Correo"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Amosar informaci�n sobre Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "Trocar"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "Trocar a mostra da barra de cartafoles"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Trocar a mostra da barra de atallos"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr "Trocar entre traballo conectado e desconectado"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "Ver o cartafol seleccionado"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ de Evolution"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "_Acerca de Evolution..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Barra de _Cartafoles"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Cartafol"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "_Ir � Cartafol..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 #, fuzzy
 msgid "_Import..."
 msgstr "Importando..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "_Novo Cartafol"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Remove Other User's Folder"
 msgstr "Crear un _Novo Cartafol..."
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "Barra de _Atallos"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Atallo"
@@ -29175,9 +29453,8 @@ msgstr "Coa Categor�a"
 msgid "_Tasks"
 msgstr "_Tarefa"
 
-#. 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 ""
 
@@ -29203,22 +29480,22 @@ msgstr ""
 "escoller un fuso horario.\n"
 " Empregue o bot�n dereito para alonxarse."
 
-#: widgets/menus/gal-view-menus.c:295
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr "_Vista 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 "Personalizar"
 
-#: widgets/menus/gal-view-menus.c:366
+#: widgets/menus/gal-view-menus.c:359
 #, fuzzy
 msgid "Save Custom View"
 msgstr "Personalizar"
 
-#: widgets/menus/gal-view-menus.c:379
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr "Definir Vistas"
 
@@ -29229,19 +29506,19 @@ msgid "MTWTFSS"
 msgstr "LMMXVSD"
 
 #. 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 de %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 "Agora"
 
-#: 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 "Hoxe"
 
-#: 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 "A data ten que ser introducida no formato: %s"
@@ -29250,81 +29527,81 @@ msgstr "A data ten que ser introducida no formato: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "A porcentaxe ten que ser un valor entre 0 e 100, inclusive"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "B�ltico"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "Europeo Central"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "Chin�s"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "Cir�lico"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr "Grego"
 
-#: 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 "Xapon�s"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "Coreano"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "Turco"
 
-#: 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 "Europeo Occidental"
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "Tradicional"
 
-#: 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 "Simplificado"
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:97
 #, fuzzy
 msgid "Visual"
 msgstr "Alarmas Visuais"
 
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Xogo de caracteres desco�ecido: %s"
 
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr "Introduza o conxunto de caracteres a usar"
 
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "Outro..."
 
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr "Codificaci�n dos Caracteres"
 
@@ -29332,11 +29609,12 @@ msgstr "Codificaci�n dos Caracteres"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:189
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr "Editor de Buscas"
 
-#: widgets/misc/e-filter-bar.c:211
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "Gardar Busca"
 
@@ -29355,66 +29633,608 @@ msgstr "Engadir �s Buscas Gardadas"
 msgid "_Advanced..."
 msgstr "Avanzado..."
 
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
 msgid "Information"
 msgstr "Informaci�n"
 
-#: widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:168
 msgid "Error"
 msgstr "Erro"
 
-#: widgets/misc/e-messagebox.c:173
+#: widgets/misc/e-messagebox.c:175
 msgid "Question"
 msgstr "Pregunta"
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
 msgid "Message"
 msgstr "Mensaxe"
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
-msgstr "Non amosar esta mensaxe outra vez"
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "_Buscar"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:537
 #, fuzzy
 msgid "_Find Now"
 msgstr "Buscar Agora"
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 #, fuzzy
 msgid "_Clear"
 msgstr "Limpar"
 
-#: widgets/misc/e-search-bar.c:895
+#: widgets/misc/e-search-bar.c:833
+#, fuzzy
+msgid "Item ID"
+msgstr "_Elemento (AM��AME)"
+
+#: 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 "Limpar"
 
-#: widgets/misc/e-search-bar.c:897
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Buscar Agora"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "O Servidor Persoal de Libro de Enderezos"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Visor de minitarxetas do Libro de Enderezos de 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 "Compo�ente do resumo executivo da axenda de Evolution."
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#, fuzzy
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "F�brica para importar ficheiros VCard a Evolution."
+
+#, fuzzy
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Importa ficheiros VCard a Evolution."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "F�brica para importar ficheiros VCard a Evolution."
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Importa ficheiros VCard a Evolution."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "Un control de Bonobo para un men� emerxente de enderezo."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Un control de Bonobo para amosar un enderezo."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Un control Bonobo de exemplo que amosa un libro de enderezos."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr "F�brica para o compo�ente Libro de Enderezos de Evolution."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr ""
+#~ "Control que amosa unha minitarxeta de libro de enderezos de Evolution."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Compo�ente de Evolution para manexar contactos."
+
+#~ msgid "Factory for the Addressbook Minicard control"
+#~ msgstr "F�brica para o control de Minitarxetas do Libro de Enderezos"
+
+#~ msgid "Factory for the Addressbook's address displayer"
+#~ msgstr "F�brica para o visor de enderezos do Libro de Enderezos"
+
+#, fuzzy
+#~ msgid ""
+#~ "Factory for the configuration controls for the Evolution Addressbook."
+#~ msgstr "F�brica para o compo�ente Libro de Enderezos de Evolution."
+
+#~ msgid "Factory for the sample Addressbook control"
+#~ msgstr "F�brica para o control de exemplo do Libro de Enderezos"
+
+#, fuzzy
+#~ msgid "1234"
+#~ msgstr "123"
+
+#, fuzzy
+#~ msgid "380"
+#~ msgstr "389"
+
+#, fuzzy
+#~ msgid "<- _Remove"
+#~ msgstr "_Eliminar"
+
+#, fuzzy
+#~ msgid "<< Fewer Options"
+#~ msgstr "Opci�ns"
+
+#, fuzzy
+#~ msgid "DN Customization"
+#~ msgstr "Personalizar"
+
+#, fuzzy
+#~ msgid "Evolution Attribute"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "LDAP Attribute"
+#~ msgstr "Autenticaci�n LDAP"
+
+#, fuzzy
+#~ msgid "Mappings"
+#~ msgstr "Marxes"
+
+#, fuzzy
+#~ msgid "R_estore Defaults"
+#~ msgstr "Opci�ns por defecto"
+
+#, fuzzy
+#~ msgid "Re_store Defaults"
+#~ msgstr "Opci�ns por defecto"
+
+#, fuzzy
+#~ msgid "Select"
+#~ msgstr "Seleccionar Todo"
+
+#, fuzzy
+#~ msgid "_Add ->"
+#~ msgstr "_Engadir"
+
+#, fuzzy
+#~ msgid "_Add Mapping"
+#~ msgstr "Engadir acci�n"
+
+#, fuzzy
+#~ msgid "_Add to DN"
+#~ msgstr "Engadir acci�n"
+
+#, fuzzy
+#~ msgid "_Always"
+#~ msgstr "Alarmas"
+
+#, fuzzy
+#~ msgid "_Delete Mapping"
+#~ msgstr "_Borrar todo"
+
+#, fuzzy
+#~ msgid "_Edit Mapping"
+#~ msgstr "_Editar cita"
+
+#, fuzzy
+#~ msgid "_Evolution attribute:"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "_More Options >>"
+#~ msgstr "_Opci�ns"
+
+#, fuzzy
+#~ msgid "_Restore Defaults"
+#~ msgstr "Opci�ns por defecto"
+
+#, fuzzy
+#~ msgid "account-druid"
+#~ msgstr "Conta"
+
+#, fuzzy
+#~ msgid "account-editor"
+#~ msgstr "editor-de-contactos"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Edit Contact List"
+#~ msgstr "Lista de _Contactos"
+
+#, fuzzy
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Contacto Sen Nome"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontactos..."
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "O Servidor Persoal de Axenda; f�brica de axendas"
+#~ msgid "Phone Types"
+#~ msgstr "Tipos de Tel�fono"
 
-#: wombat/wombat.c:199
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): non foi posible inicializar GNOME-VFS"
+#~ msgid "Delete Contact?"
+#~ msgstr "�Borrar Contacto?"
 
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): non foi posible inicializar GNOME"
+#, fuzzy
+#~ msgid "Display Cards?"
+#~ msgstr "Amosar"
+
+#, fuzzy
+#~ msgid "Display Cards"
+#~ msgstr "Amosar"
+
+#, fuzzy
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Unha control Bonobo de exemplo que amosa unha axenda."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Unha control Bonobo de exemplo que amosa unha axenda."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "F�brica para o compo�ente da axenda de Evolution."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Compo�ente de Evolution para manexar a axenda."
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Tasks control"
+#~ msgstr "F�brica para o compo�ente de correo de Evolution."
+
+#~ msgid "Factory for the calendar iTip view control"
+#~ msgstr "F�brica para o control vista iTip da axenda"
+
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr "F�brica para o control Axenda de exemplo"
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr ""
+#~ "F�brica para centraliza-los di�logos editores de compo�entes da axenda"
+
+#, fuzzy
+#~ msgid "Factory to create a component editor factory"
+#~ msgstr ""
+#~ "F�brica para centraliza-los di�logos editores de compo�entes da axenda"
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Servicio de notificaci�n de alarma"
+
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "Non foi posible inicializar GNOME"
+
+#, 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 "Non foi posible inicializar Bonobo"
+
+#, fuzzy
+#~ msgid "Could not create the component editor factory"
+#~ msgstr ""
+#~ "Non foi posible crear a f�brica do servicio de notificaci�ns de alarma"
+
+#~ msgid "Print Calendar"
+#~ msgstr "Imprimir Axenda"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create the tasks view.  Please check your ORBit and OAF setup."
+#~ msgstr ""
+#~ "Non foi posible crear o visor da axenda. Comprobe a s�a configuraci�n de "
+#~ "ORBit e OAF."
+
+#~ msgid ""
+#~ "Evolution has taken the tasks that were in your calendar folder and "
+#~ "automatically migrated them to the new tasks folder."
+#~ msgstr ""
+#~ "Evolution colleu as tarefas que estaban no cartafol da axenda e migrounas "
+#~ "automaticamente ao novo cartafol de tarefas."
+
+#~ 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 tentou coller as tarefas que estaban no cartafol da axenda e "
+#~ "migralas automaticamente ao novo cartafol de tarefas.\n"
+#~ "Non foi posible migrar algunhas das tarefas, as� que pode tentar facerse "
+#~ "este proceso outra vez no futuro."
+
+#~ msgid ""
+#~ "Could not open `%s'; no items from the calendar folder will be migrated "
+#~ "to the tasks folder."
+#~ msgstr ""
+#~ "Non se puido abrir `%s'; non se migrar�n obxectos do cartafol da axenda "
+#~ "ao de tarefas."
+
+#~ msgid ""
+#~ "The method required to load `%s' is not supported; no items from the "
+#~ "calendar folder will be migrated to the tasks folder."
+#~ msgstr ""
+#~ "Non est� soportado o m�todo requirido para cargar `%s'; non se migrar�n "
+#~ "obxectos do cartafol da axenda ao de tarefas."
+
+#, fuzzy
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "F�brica para importar ficheiros VCard a Evolution."
+
+#, fuzzy
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Importa ficheiros VCard a Evolution."
+
+#, fuzzy
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Importa ficheiros VCard a Evolution."
+
+#, fuzzy
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr ""
+#~ "Non � posible obter a mensaxe: %s do cartafol %s\n"
+#~ "  %s"
+
+#, fuzzy
+#~ msgid "Can't call getFolderAtPath on storage: %s"
+#~ msgstr "Non foi posible conectarse � servidor: %s."
+
+#~ msgid "Warning!"
+#~ msgstr "�Aviso!"
+
+#~ msgid ""
+#~ "Could not create composer window, because you have not yet\n"
+#~ "configured any identities in the mail component."
+#~ msgstr ""
+#~ "Non foi posible crear a fiestra do compositor, porque a�nda\n"
+#~ "non configurou ningunha identidade no compo�ente de correo."
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "Non foi posible inicializar o compositor de Evolution."
+
+#~ msgid "minute"
+#~ msgstr "minuto"
+
+#~ msgid "hour"
+#~ msgstr "hora"
+
+#~ msgid "week"
+#~ msgstr "semana"
+
+#~ msgid "year"
+#~ msgstr "ano"
+
+#~ msgid "Add action"
+#~ msgstr "Engadir acci�n"
+
+#~ msgid "Add criterion"
+#~ msgstr "Engadir criterio"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "F�brica para o compositor de Evolution."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "F�brica para o compo�ente da axenda de Evolution."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "F�brica para o compositor de Evolution."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "F�brica para o compositor de Evolution."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Compo�ente de evolution para manexar o correo."
+
+#~ msgid "Evolution mail folder factory component."
+#~ msgstr "Compo�ente de f�brica de cartafoles de correo de Evolution."
+
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr "F�brica para o compositor de Evolution."
+
+#~ msgid "Factory for the Mail Summary component."
+#~ msgstr "F�brica para a compo�ente Resumo de Correo."
+
+#, fuzzy
+#~ msgid "Warning: Unsent Messages"
+#~ msgstr "Mensaxe Remitida"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "F�brica para importar mbox a Evolution."
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importa ficheiros mbox a Evolution"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "F�brica para importar correo de Outlook Express 4 a Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importa ficheiros de Outlook Express 4 a Evolution"
+
+#~ msgid "Really delete account?"
+#~ msgstr "�Borrar esta conta de verdade?"
+
+#, fuzzy
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "Amosa-la seguinte mensaxe sen ler"
+
+#, fuzzy
+#~ msgid "Add Signature"
+#~ msgstr "Gravar sinatura"
+
+#, fuzzy
+#~ msgid "Account %d"
+#~ msgstr "Conta"
+
+#, fuzzy
+#~ msgid "_Variable-width:"
+#~ msgstr "Variable"
+
+#~ msgid "All folders"
+#~ msgstr "Todos os cartafoles"
+
+#, fuzzy
+#~ msgid "Apri file"
+#~ msgstr "abril"
+
+#, fuzzy
+#~ msgid "Display Options"
+#~ msgstr "Opci�ns de Vista"
+
+#~ msgid "Folders whose names begin with:"
+#~ msgstr "Cartafoles con nomes que comezan por:"
+
+#, fuzzy
+#~ msgid "Salve file"
+#~ msgstr "Seleccionar un ficheiro"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Cartafol que cont�n o Resumo de Evolution"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Summary component."
+#~ msgstr "F�brica para o compo�ente de Resume Executivo de Evolution."
+
+#, fuzzy
+#~ msgid "Marquette"
+#~ msgstr "Martinica"
+
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "O compo�ente Resumo Executivo non puido inicializar Bonobo.\n"
+
+#, fuzzy
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "F�brica para o compositor de Evolution."
+
+#~ msgid "Evolution installation"
+#~ msgstr "Instalaci�n de Evolution"
+
+#~ msgid ""
+#~ "This new version of Evolution needs to install additional files\n"
+#~ "into your personal Evolution directory"
+#~ msgstr ""
+#~ "Esta nova versi�n de Evolution necesita instalar ficheiros\n"
+#~ "adicionais no seu directorio persoal de Evolution"
+
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr ""
+#~ "Prema \"Aceptar\" para instalar os ficheiros, ou \"Cancelar\" para sa�r."
+
+#, fuzzy
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible crear o directorio %s:\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 detectou un directorio de\n"
+#~ "Resumo Executivo antigo. Ten que se\n"
+#~ "eliminar antes de executar Evolution.\n"
+#~ "�Quere eliminar este directorio?"
+
+#~ msgid "New..."
+#~ msgstr "Nova..."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Non se puido inicia-la interface do Mago de Correo de Evolution\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr ""
+#~ "Non se puido inicia-la interface do Mago de Correo de Evolution\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Folder name cannot contain slashes."
+#~ msgstr "Este cartafol non pode conter mensaxes."
+
+#~ msgid "Bug buddy was not found in your $PATH."
+#~ msgstr "Non se atopou o Bug buddy no seu $PATH."
+
+#~ msgid "Don't remove"
+#~ msgstr "Non eliminar"
+
+#~ msgid "Active connections"
+#~ msgstr "Conexi�ns activas"
+
+#~ msgid "Host"
+#~ msgstr "Servidor"
+
+#~ msgid "Cannot initialize the Bonobo component system."
+#~ msgstr "Non se pode inicializar o sistema de compo�entes de Bonobo."
+
+#, fuzzy
+#~ msgid "Output File"
+#~ msgstr "Abrir ficheiro"
+
+#, fuzzy
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "_Preferencias de Correo..."
+
+#, fuzzy
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "Configuraci�n do Correo"
 
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): non foi posible inicializar Bonobo"
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "O Servidor Persoal de Libro de Enderezos"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "O Servidor Persoal de Axenda; f�brica de axendas"
+
+#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
+#~ msgstr "setup_vfs(): non foi posible inicializar GNOME-VFS"
+
+#~ msgid "init_corba(): could not initialize GNOME"
+#~ msgstr "init_corba(): non foi posible inicializar GNOME"
+
+#~ msgid "init_bonobo(): could not initialize Bonobo"
+#~ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 
 #, fuzzy
 #~ msgid "_Configure..."
@@ -29491,9 +30311,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ "O importador non est� preparado.\n"
 #~ "Agardando 5 segundos antes de tentalo de novo."
 
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Asistente Importador de Evolution"
-
 #, fuzzy
 #~ msgid "_Preferences..."
 #~ msgstr "Preferencias das Tarefas..."
@@ -29623,9 +30440,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ "que sexa cando se execute o filtro ou se\n"
 #~ "abra o cartafolv."
 
-#~ msgid "Evolution News Editor"
-#~ msgstr "Editor de Novas de Evolution"
-
 #~ msgid "Are you sure you want to delete this news account?"
 #~ msgstr "�Est� seguro de que quere borrar esta conta de novas?"
 
@@ -29639,9 +30453,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "News Servers"
 #~ msgstr "Fontes de _Novas"
 
-#~ msgid "Source"
-#~ msgstr "Fonte"
-
 #~ msgid "Source Information"
 #~ msgstr "Informaci�n da Fonte"
 
@@ -29704,9 +30515,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ "Informaci�n de traza opaca non v�lida:\n"
 #~ "%s"
 
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr "Compo�ente do resumo executivo da axenda de Evolution."
-
 #~ msgid "Factory for the Calendar Summary component."
 #~ msgstr "F�brica para o compo�ente Resume da Axenda."
 
@@ -29807,10 +30615,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgstr "Editar"
 
 #, fuzzy
-#~ msgid " New "
-#~ msgstr "Novo"
-
-#, fuzzy
 #~ msgid "Advanced Options"
 #~ msgstr "Cancelar Operaci�n"
 
@@ -30098,9 +30902,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "New Contact _List"
 #~ msgstr "Nova _Lista de Contactos"
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "Editar o Libro de Enderezos"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Engadir Libro de Enderezos"
 
@@ -30384,9 +31185,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "(No name)"
 #~ msgstr "(Sen nome)"
 
-#~ msgid "New List"
-#~ msgstr "Nova Lista"
-
 #~ msgid "Configure the calendar's settings"
 #~ msgstr "Configura-la axenda"
 
@@ -30919,9 +31717,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Select name from:"
 #~ msgstr "Seleccionar nome dende:"
 
-#~ msgid "Save calendar"
-#~ msgstr "Gardar axenda"
-
 #~ msgid "Transparent"
 #~ msgstr "Transparente"
 
@@ -31028,9 +31823,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ "Publicar\n"
 #~ "Evento"
 
-#~ msgid "Show a dialog"
-#~ msgstr "Amosar un di�logo"
-
 #~ msgid "Appointment Basics"
 #~ msgstr "B�sicos sobre Citas"
 
@@ -31043,9 +31835,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "%s is not a selectable folder"
 #~ msgstr "O cartafol %s non � seleccionable"
 
-#~ msgid "Send as:"
-#~ msgstr "Enviar como:"
-
 #~ msgid "That file exists but is not readable."
 #~ msgstr "O ficheiro existe pero non se pode ler."
 
@@ -31201,9 +31990,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Print the selected message"
 #~ msgstr "Imprimir a mensaxe seleccionada"
 
-#~ msgid "Delete this message"
-#~ msgstr "Borrar esta mensaxe"
-
 #~ msgid "Getting store for \"%s\""
 #~ msgstr "Conseguindo armacenamento para \"%s\""
 
@@ -31319,9 +32105,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "_Contact (FIXME)"
 #~ msgstr "_Contacto (AM��AME)"
 
-#~ msgid "_Item (FIXME)"
-#~ msgstr "_Elemento (AM��AME)"
-
 #~ msgid "_Journal Entry (FIXME)"
 #~ msgstr "_Entrada de Diario (AM��AME)"
 
diff --git a/po/hu.po b/po/hu.po
index 7e72bdaf6d..a5c3be37af 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.hu\n"
-"POT-Creation-Date: 2003-03-31 22:42+0200\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-03-31 00:54+0200\n"
 "Last-Translator: Zsiráf <zsiraf@mylinux.hu>\n"
 "Language-Team: Hungarian <hu@gnome.hu>\n"
@@ -17,20 +17,27 @@ msgstr ""
 "X-Generator: KBabel 1.0\n"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr "Factory az LDIF fájlok Evolutionbe importálásához"
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution importáló varázsló"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "LDIF fájlok importálása az Evolutionbe."
+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 "Factory a VCard fájlok Evolutionbe importálásához"
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution levélszerkesztő."
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "VCard fájlok importálása az Evolutionbe."
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution levélszerkesztő."
+
+#: 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
@@ -200,14 +207,14 @@ msgid "TTY"
 msgstr "TTY"
 
 #: 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 "2. email"
 
 #: 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"
@@ -498,74 +505,77 @@ msgstr "LDAP keresés eredményeinek letöltése..."
 msgid "Error performing search"
 msgstr "Hiba a keresés közben"
 
-#: addressbook/conduit/address-conduit.c:296
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Alapértelmezett szinkronizálási cím:"
 
-#: addressbook/conduit/address-conduit.c:539
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "A kurzort nem lehet betölteni\n"
 
-#: addressbook/conduit/address-conduit.c:552
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "Az EBook nincs betöltve\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 "Nem sikerült elindítani a wombat kiszolgálót"
 
-#: 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 "Nem sikerült a wombatot elindítani"
 
-#: 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 "Nem sikerült a pilot Address application blokkját olvasni"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Bonobo vezérlő a felugró címhez."
+msgid "Configure access to LDAP directory servers here"
+msgstr "Itt állíthatod be az LDAP címtárkiszolgálók elérését."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Bonobo vezérlő a cím megjelenítéséhez."
+msgid "Directory Servers"
+msgstr "Címtár-kiszolgálók"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Minta Bonobo vezérlő, amely a címjegyzéket jeleníti meg."
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Címjegyzék szerkesztése"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr "Beállító eszköz az Evolution Címtár-kiszolgálóhoz"
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Levelezés beállítása"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure access to LDAP directory servers here"
-msgstr "Itt állíthatod be az LDAP címtárkiszolgálók elérését."
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Factory a Címjegyzék előugró címeihez"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Evolution címjegyzék minikártyáját megjelenítő control."
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution címjegyzék minikártya-nézőke"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Directory Servers"
-msgstr "Címtár-kiszolgálók"
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution címjegyzék minikártya-nézőke"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution címjegyzék minikártya-nézőke"
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution levélszerkesztő."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Evolution komponens a névjegyek kezeléséhez."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Factory for the controls exported by the Evolution Addressbook"
-msgstr "Az Evolution címjegyzék által exportált \"Factory\" ellenőrzéshez"
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution címjegyzék minikártya-nézőke"
 
 #: addressbook/gui/component/addressbook-component.c:76
 #: addressbook/gui/component/addressbook-component.c:605
@@ -785,7 +795,7 @@ msgstr "Ez a keresés nem volt sikeres."
 
 #. 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 "Bármelyik kategória"
 
@@ -798,46 +808,46 @@ msgstr "Az URI amit a Mappaböngésző meg fog nyitni"
 #. * 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 "(semmi)"
 
-#: 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 "Elsődleges email"
 
-#: addressbook/gui/component/e-address-popup.c:608
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Válassz egy műveletet"
 
-#: 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 "Új névjegy készítése: %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 "Cím hozzáadása a létező %s névjegyhez"
 
-#: addressbook/gui/component/e-address-popup.c:913
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "A címjegyzék lekérdezése..."
 
-#: 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 "Névjegy adatainak szerkesztése"
 
-#: 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 "Hozzáadás a címjegyzékhez"
 
-#: addressbook/gui/component/e-address-popup.c:1051
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Email cím összefésülése"
 
@@ -973,7 +983,7 @@ msgid "LDAP Configuration Assistant"
 msgstr "LDAP Beállítás Segéd"
 
 #: 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 "Soha"
 
@@ -1003,8 +1013,8 @@ msgstr "Keresés _hatóköre: "
 
 #. 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:1674
-#: 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 "Keresés"
 
@@ -1298,49 +1308,38 @@ 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 "Evolution címjegyzék névkiválasztó felülete."
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Factory a címjegyzék névkiválasztó felületéhez"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Mindet törli"
 
 #. 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 "Törlés"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:177
-msgid "Remove All"
-msgstr "Mindet törli"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:201
-msgid "Send HTML Mail?"
-msgstr "HTML levél küldése?"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:300
-#, fuzzy
-msgid "View Contact Info"
-msgstr "Névjegy adatainak szerkesztése"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:399
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
 #, fuzzy
 msgid "View Contact List"
 msgstr "Új címlista"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:417
-msgid "Unnamed Contact List"
-msgstr "Névtelen címlista"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact Info"
+msgstr "Névjegy adatainak szerkesztése"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:434
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d nincs megjelenítve)"
+#: 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 levél küldése?"
 
-#: 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 "Névtelen névjegy"
 
@@ -1349,11 +1348,11 @@ msgstr "Névtelen névjegy"
 msgid "Source"
 msgstr "Forrás"
 
-#: 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 "Névjegyek kijelölése a címjegyzékből"
 
-#: 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 "Névjegy keresése"
 
@@ -1483,7 +1482,7 @@ msgstr "Tud fogadni _HTML levelet"
 #: 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:3714 calendar/gui/e-week-view.c:3557
+#: 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
@@ -1522,10 +1521,10 @@ msgstr "_Weblap címe:"
 #: 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 "Szekeszthető"
 
@@ -2555,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 "Címjegyzék"
@@ -2563,7 +2562,7 @@ msgstr "Címjegyzék"
 #: 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 "Névjegy"
 
@@ -2864,7 +2863,7 @@ msgstr "%d kártya"
 #: 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 "Lekérdezés"
@@ -2879,20 +2878,21 @@ msgstr "Minta"
 
 #: 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 "Hiba a kártya módosításakor"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr "Sikerült"
 
 #: 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 "Ismeretlen hiba"
 
@@ -2901,7 +2901,7 @@ msgid "Repository offline"
 msgstr "Kapcsolat nélküli tároló"
 
 #: 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 "Jogosultsági hiba"
 
@@ -2918,7 +2918,7 @@ msgid "Protocol not supported"
 msgstr "A protokoll nem támogatott"
 
 #: 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
@@ -3115,7 +3115,7 @@ msgid "Delete"
 msgstr "Törlés"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:904
-#: calendar/gui/e-day-view.c:3674 calendar/gui/e-week-view.c:3522
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 msgid "Current View"
 msgstr "Aktuális nézet"
 
@@ -3224,38 +3224,38 @@ msgstr "és egy másik kártya"
 msgid "Save in addressbook"
 msgstr "Mentés a címjegyzékbe"
 
-#: 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 "Szélesség"
 
-#: 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 "Magasság"
 
-#: 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 "Fókuszban"
 
-#: addressbook/gui/widgets/e-minicard-label.c:123
+#: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Mező"
 
-#: addressbook/gui/widgets/e-minicard-label.c:130
+#: addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Mezőnév"
 
-#: addressbook/gui/widgets/e-minicard-label.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Szöveg minta"
 
-#: addressbook/gui/widgets/e-minicard-label.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Mezőnév maximális hosszúsága"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:125
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
 msgstr "Oszlop szélessége"
 
@@ -3287,11 +3287,11 @@ msgstr ""
 msgid "Adapter"
 msgstr "Csatlakozó"
 
-#: addressbook/gui/widgets/e-minicard.c:165
+#: addressbook/gui/widgets/e-minicard.c:169
 msgid "Selected"
 msgstr "Kiválasztva"
 
-#: addressbook/gui/widgets/e-minicard.c:172
+#: addressbook/gui/widgets/e-minicard.c:176
 msgid "Has Cursor"
 msgstr "Megmutatva"
 
@@ -3622,7 +3622,7 @@ msgid "High"
 msgstr "Magas"
 
 #: 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"
@@ -3641,72 +3641,75 @@ msgstr "Alacsony"
 msgid "Undefined"
 msgstr "Nem megadott"
 
-#: calendar/conduits/calendar/calendar-conduit.c:208
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr "Többnapos események felosztása:"
 
-#: 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 "Hibás kommunikáció a naptár kiszolgálóval"
 
-#: 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 "Nem sikerült a pilot Calendar application blokkját olvasni"
 
-#: calendar/conduits/todo/todo-conduit.c:208
+#: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
 msgstr "Alapértelmezett prioritás:"
 
-#: 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 "Nem sikerült a pilot Calendar ToDo blokkját olvasni"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "Egy Bonono kontroll, amely feladatlistát jelenít meg."
+msgid "Calendar and Tasks"
+msgstr "Naptár és Feladatok"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Egy minta Bonono kontroll, amely naptárat jelenít meg."
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Állítsd be a Naptárhoz és a Feladat listához tartozó időzónát."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
 msgstr "Naptár és Feladatok"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Beállítási ellenőrzés az Evolution naptárhoz."
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution naptár vezetői összefoglaló komponense."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Állítsd be a Naptárhoz és a Feladat listához tartozó időzónát."
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Levelezés beállítása"
 
 #: 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 naptár iTip/iMip nézőke"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution összetevő a naptárkezeléshez."
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution naptár iTip/iMip nézőke"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 #, fuzzy
-msgid "Factory for the Evolution Calendar objects"
-msgstr "Factory az Evolution naptár komponenséhez."
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution naptár csatorna"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Factory a naptárkomponens komponensablakainak összefogására"
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution News-szerkesztő"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Alarm notification service"
-msgstr "Riasztó szolgáltatás"
-
-#: 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 "Factory a riasztó szolgáltatáshoz"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
@@ -3810,7 +3813,7 @@ msgstr "Leírás tartalmazza"
 msgid "Comment contains"
 msgstr "Megjegyzés tartalmazza"
 
-#: 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 "Ki nem válogatott"
 
@@ -3820,8 +3823,8 @@ msgstr "%Y %B %d, %A"
 
 #. 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:1392 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 "%b %d, %a"
 
@@ -3839,7 +3842,7 @@ msgstr "%Y %B %d"
 #. 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 "%B %d"
 
@@ -3871,7 +3874,7 @@ msgstr "Találkozókat és eseményeket tartalmazó nyilvános mappa"
 
 #: 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
@@ -3938,12 +3941,12 @@ msgstr "_Egész napos találkozó"
 msgid "Create a new all-day appointment"
 msgstr "Új egész napos esemény létrehozása"
 
-#: 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 "Személyes"
 
-#: 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 "Bizalmas"
@@ -3968,37 +3971,37 @@ msgstr "K"
 msgid "W"
 msgstr "Ny"
 
-#: 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 "Szabad"
 
 #: 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 "Foglalt"
 
-#: 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 "Nem indult még el"
 
-#: 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 "Folyamatban"
 
-#: 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 "Befejezve"
 
-#: calendar/gui/calendar-model.c:1028
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4009,32 +4012,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 "Semmi"
 
-#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Ismétlődő"
 
-#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Kiosztva"
 
-#: 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 "Igen"
 
-#: 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 "Nem"
@@ -4074,32 +4077,32 @@ msgstr "Jogosultsági hiba"
 msgid "Could not open the folder in '%s'"
 msgstr "Nem sikerült megnyitni a mappát '%s'-ben"
 
-#: calendar/gui/control-factory.c:163
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "Az URI, amit a naptár megjelenít"
 
-#: calendar/gui/control-factory.c:170
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr "A megjelenítendő nézettípus"
 
-#: calendar/gui/dialogs/alarm-options.c:473
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Hangos riasztás beállításai"
 
-#: calendar/gui/dialogs/alarm-options.c:482
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Riasztóüzenet beállításai"
 
-#: calendar/gui/dialogs/alarm-options.c:491
+#: calendar/gui/dialogs/alarm-options.c:438
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "Riasztólevél beállításai"
 
-#: calendar/gui/dialogs/alarm-options.c:500
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Riasztóprogram beállításai"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Ismeretlen típusú riasztás beállításai"
 
@@ -4142,14 +4145,19 @@ msgid "days"
 msgstr "naponként"
 
 #: 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 "-szer minden"
 
-#: 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 "óránként"
 
-#: 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 "percenként"
 
@@ -4215,7 +4223,7 @@ msgstr "találkozó vége"
 msgid "hour(s)"
 msgstr "óra"
 
-#: 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 "perc"
 
@@ -4395,7 +4403,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 "_Alap"
 
@@ -4580,8 +4588,8 @@ msgid "No summary"
 msgstr "Nincs összegzés"
 
 #: calendar/gui/dialogs/comp-editor.c:1230
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3932
-#: calendar/gui/e-week-view.c:3758 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 "Mentés másként..."
 
@@ -4676,19 +4684,19 @@ msgstr "Ütemezés"
 msgid "Meeting"
 msgstr "Értekezlet"
 
-#: 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 "Hibás a kezdés dátuma"
 
-#: calendar/gui/dialogs/event-page.c:664
+#: calendar/gui/dialogs/event-page.c:610
 msgid "End date is wrong"
 msgstr "Érvénytelen befejezési időpont"
 
-#: calendar/gui/dialogs/event-page.c:687
+#: calendar/gui/dialogs/event-page.c:633
 msgid "Start time is wrong"
 msgstr "Hibás a kezdés időpontja:"
 
-#: calendar/gui/dialogs/event-page.c:694
+#: calendar/gui/dialogs/event-page.c:640
 msgid "End time is wrong"
 msgstr "Helytelen befejezési időpont"
 
@@ -4745,15 +4753,10 @@ msgid "Su_mmary:"
 msgstr "Ö_sszegzés:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Névjegyek..."
-
-#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_End time:"
 msgstr "_Befejezés időpontja:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "_Kezdés időpontja:"
 
@@ -4813,7 +4816,7 @@ msgid "Member"
 msgstr "Tag"
 
 #: 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"
@@ -4835,7 +4838,7 @@ msgid "_Change Organizer"
 msgstr "_Szervező megváltoztatása"
 
 #: 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 "_Mások meghívása..."
 
@@ -5038,7 +5041,7 @@ msgstr "Kiosztás"
 msgid "Due date is wrong"
 msgstr "A lejárat dátuma érvénytelen"
 
-#: 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:"
@@ -5048,6 +5051,10 @@ msgstr "Leírás:"
 msgid "Sta_rt Date:"
 msgstr "Ke_zdés dátuma:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Névjegyek..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "Le_járat:"
@@ -5146,56 +5153,67 @@ msgid "%s for an unknown trigger type"
 msgstr "%s ismeretlen kiváltó okra"
 
 #: 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:2829
-#: 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 "Kijelölt objektumok törlése"
 
-#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3696
-#: calendar/gui/e-week-view.c:3539 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 "_Megnyitás"
@@ -5204,30 +5222,30 @@ msgstr "_Megnyitás"
 msgid "_Save as..."
 msgstr "_Mentés másként..."
 
-#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3698
-#: calendar/gui/e-week-view.c:3514 calendar/gui/e-week-view.c:3541
+#: 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 "_Nyomtatás..."
 
-#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3703
-#: calendar/gui/e-week-view.c:3546 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_ivágás"
 
-#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3704
-#: calendar/gui/e-week-view.c:3547 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 "_Másolás"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3669
-#: calendar/gui/e-day-view.c:3705 calendar/gui/e-week-view.c:3518
-#: calendar/gui/e-week-view.c:3548 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"
@@ -5253,8 +5271,8 @@ msgstr "_Kijelölt feladatok megjelölése készként"
 msgid "_Delete Selected Tasks"
 msgstr "_Kijelölt feladatok törlése"
 
-#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7634
-#: calendar/gui/e-week-view.c:4247
+#: 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 "Objektumok frissítése"
 
@@ -5297,7 +5315,7 @@ msgid "Start Date"
 msgstr "Kezdés dátuma"
 
 #: 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 "Összefoglaló"
@@ -5329,22 +5347,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 perces osztás"
 
 #. 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:1378
-#: 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 "%B %d, %A"
 
 #. 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:1405
-#: 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 "%b %d"
 
@@ -5360,67 +5378,67 @@ msgstr "de"
 msgid "pm"
 msgstr "du"
 
-#: calendar/gui/e-day-view.c:3653
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "Új _találkozó"
 
-#: calendar/gui/e-day-view.c:3655 calendar/gui/e-week-view.c:3508
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
 msgid "New All Day _Event"
 msgstr "Ú_j egész napos esemény"
 
-#: calendar/gui/e-day-view.c:3657 calendar/gui/e-week-view.c:3509
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
 msgid "New Meeting"
 msgstr "Új értekezlet"
 
-#: calendar/gui/e-day-view.c:3659 calendar/gui/e-week-view.c:3510
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
 msgid "New Task"
 msgstr "Új feladat"
 
-#: 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 "Nyomtatás..."
 
-#: calendar/gui/e-day-view.c:3676 calendar/gui/e-week-view.c:3524
+#: 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 "Ugrás a _mai napra"
 
-#: calendar/gui/e-day-view.c:3678 calendar/gui/e-week-view.c:3525
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
 msgid "_Go to Date..."
 msgstr "_Ugrás dátumra..."
 
-#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3529
+#: 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 "Szabad/foglalt információ _közzététele"
 
-#: calendar/gui/e-day-view.c:3688 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
 #: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "_Beállítások..."
 
-#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3540
+#: 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 "M_entés másként..."
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3552
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
 msgid "_Schedule Meeting..."
 msgstr "Értekezlet _tervezése..."
 
-#: calendar/gui/e-day-view.c:3710 calendar/gui/e-week-view.c:3553
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
 msgid "_Forward as iCalendar..."
 msgstr "_Továbbítás iCalendarként..."
 
-#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3558
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
 msgid "Make this Occurrence _Movable"
 msgstr "Az előfordulás _mozgathatóvá tétele"
 
-#: calendar/gui/e-day-view.c:3716 calendar/gui/e-week-view.c:3559
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
 msgid "Delete this _Occurrence"
 msgstr "Az _előfordulás törlése"
 
-#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3560
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
 msgid "Delete _All Occurrences"
 msgstr "Az ö_sszes előfordulás törlése"
 
@@ -5545,31 +5563,31 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Nincs</i>"
 
-#: calendar/gui/e-itip-control.c:1058
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "Hely:"
 
-#: calendar/gui/e-itip-control.c:1072
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr "Állapot:"
 
-#: 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 "Elfogadva"
 
-#: 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 "Kísérletileg elfogadva"
 
-#: 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 "Elutasítva"
 
-#: 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
@@ -5581,299 +5599,299 @@ msgstr "Elutasítva"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: 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 "Válassz egy műveletet:"
 
-#: calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Frissítés"
 
-#: 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 "Elfogadva"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Kísérletileg elfogadva"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Elutasítva"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Szabad/foglalt információ küldése"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Válaszoló állapotának frissítése"
 
-#: calendar/gui/e-itip-control.c:1225
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Legutóbbi információ küldése"
 
-#: 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 "Mégse"
 
-#: 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> információt tett közzé az értekezletről."
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Információ az értekezletről"
 
-#: 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> arra kér, hogy vegyél részt a(z) %s értekezleten."
 
-#: 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> arra kér, hogy vegyél részt az értekezleten."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Javaslat értekezletre"
 
-#: 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> szeretne hozzátenni egy létező értekezlethez."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Értekezlet frissítése"
 
-#: 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> szeretné megkapni a legújabb adatokat az értekezletről."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "Értekezletfrissítési kérés"
 
-#: 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> válaszolt egy értekezlet-összehívási kérésre."
 
-#: calendar/gui/e-itip-control.c:1346
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Válasz az értekezletre"
 
-#: 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> lemondta az értekezletet."
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Értekezlet lemondása"
 
-#: 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> egy értelmetlen levelet küldött."
 
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Rossz értekezletfelhívás"
 
-#: 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> feladatinformációt tett közzé."
 
-#: calendar/gui/e-itip-control.c:1387
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Feladatinformáció"
 
-#: 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> arra kér, %s hogy végezz el egy feladatot."
 
-#: 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> arra kér, hogy hajts végre egy feladatot."
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Feladatjavaslat"
 
-#: 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> szeretne hozzátenni egy létező feladathoz."
 
-#: calendar/gui/e-itip-control.c:1400
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Feladat frissítése"
 
-#: 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> szeretné megkapni a legújabb adatokat a feladatról."
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Feladatfrissítési felhívás"
 
-#: 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> válaszolt egy feladatfelkérésre."
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Válasz feladatra"
 
-#: 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> törölte a feladatot."
 
-#: calendar/gui/e-itip-control.c:1421
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Feladat lemondása"
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Rossz feladatüzenet"
 
-#: 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> szabad/foglalt információt tett közzé."
 
-#: calendar/gui/e-itip-control.c:1449
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Szabad/foglalt információ"
 
-#: 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> kéri a szabad/foglalt adataidat."
 
-#: calendar/gui/e-itip-control.c:1454
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Szabad/foglalt kérés"
 
-#: 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> válaszolt egy szabad/foglalt kérésre."
 
-#: calendar/gui/e-itip-control.c:1459
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Szabad/foglalt válasz"
 
-#: calendar/gui/e-itip-control.c:1464
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Rossz szabad/foglalt üzenet"
 
-#: 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 "A levél úgy tűnik, nem megfelelően formázott"
 
-#: calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "A levél csak nem támogatott kéréseket tartalmaz."
 
-#: 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 "A melléklet nem tartalmaz érvényes naptárüzenetet"
 
-#: calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "A melléklet nem tartalmaz megnézhető naptárelemet"
 
-#: 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 "Az objektum érvénytelen és nem lehet frissíteni\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 "CORBA hiba történt\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 "Az elem nem található\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 "Nincsenek megfelelő jogosultságaid a naptár frissítéséhez\n"
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Frissítés kész\n"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "A naptárfájlt nem lehetett frissíteni!\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 ""
 "A résztvevő állapotát nem lehetett frissíteni, mert az elem nem létezik többé"
 
-#: 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 ""
 "A válasz oylantól érkezett, aki nem résztvevő. Hozzáadod a résztvevőkhöz?"
 
-#: 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 ""
 "A résztvevő állapotát nem lehetett frissíteni, mert az állapot érvénytelen!\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 "Nincsenek megfelelő jogosultságaid a naptár frissítéséhez\n"
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "A résztvevő állapota frissítve\n"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "A résztvevő állapotát nem lehetett frissíteni!\n"
 
-#: calendar/gui/e-itip-control.c:2048
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Törlés befejezve"
 
-#: 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 "Elküldve!\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 "Az elemet nem lehetett elküldeni!\n"
 
-#: calendar/gui/e-itip-control.c:2205
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr "Válassz naptármappát"
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr "Válassz feladatmappát"
 
@@ -5976,7 +5994,7 @@ msgid "Needs Action"
 msgstr "Beavatkozás szükséges"
 
 #: 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 "Kísérleti"
 
@@ -5992,14 +6010,14 @@ msgstr "Folyamatban"
 #. 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:2059
+#: calendar/gui/e-meeting-time-sel.c:2092
 msgid "%A, %B %d, %Y"
 msgstr "%Y %B %d, %A"
 
 #. 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:2089 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"
@@ -6011,63 +6029,63 @@ msgstr "%a %m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: 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 "Nincs bent"
 
-#: calendar/gui/e-meeting-time-sel.c:410
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Nincs információ"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Beállítások"
 
-#: calendar/gui/e-meeting-time-sel.c:468
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Csak a _munkaórák megjelenítése"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "_Megjelenítés nagyítva"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "_Szabad/foglalt frissítése"
 
-#: 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 "_Automatikus kiszedés"
 
-#: 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 "_Minden ember és erőforrás"
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Minden _ember és egy erőforrás"
 
-#: calendar/gui/e-meeting-time-sel.c:594
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "_A kért emberek"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "A kért emberek és egy e_rőforrás"
 
-#: calendar/gui/e-meeting-time-sel.c:630
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Megbeszélés _kezdődik:"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Megbeszélés _vége:"
 
@@ -6113,7 +6131,7 @@ msgstr "Kijelölt objektumok törlése..."
 msgid "Expunging"
 msgstr "Tisztítás"
 
-#: calendar/gui/e-week-view.c:3507
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Új _találkozó..."
 
@@ -6221,57 +6239,57 @@ msgstr "október"
 msgid "September"
 msgstr "szeptember"
 
-#: 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 "A szervezőt be kell állítani."
 
-#: calendar/gui/itip-utils.c:297
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "Legalább egy résztvevő szükséges"
 
-#: 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 "Eseményinformáció"
 
-#: 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 "Feladatinformáció"
 
-#: 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 "Naplóinformáció"
 
-#: 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 "Szabad/foglalt információ"
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Naptárinformáció"
 
-#: calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr "Frissítve"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr "Frissítés"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr "Ellenjavaslat"
 
-#: calendar/gui/itip-utils.c:512
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Szabad/foglalt információ (%s - %s)"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "iCalendar információ"
 
-#: calendar/gui/itip-utils.c:672
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Részt kell venned az eseményen."
 
@@ -6371,7 +6389,7 @@ msgstr "Névjegyek: "
 
 #: 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 "Nyomtatási kép"
 
@@ -6407,31 +6425,43 @@ msgstr "Ne kérdezze meg többet."
 msgid "Print Tasks"
 msgstr "Feladatok nyomtatása"
 
-#: 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 "VHKSCPS"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "Factory az iCalendar típusú fájlok Evolutionbe importálásához"
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Evolution naptár csatorna"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "iCalendar típusú fájlok importálása az Evolution-be."
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Evolution naptár csatorna"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "vCalander típusú fájlok importálása az Evolution-be."
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Evolution naptár csatorna"
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Naptárüzenet"
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
+msgstr ""
 
-#: calendar/importers/icalendar-importer.c:380
+#: calendar/importers/icalendar-importer.c:404
 msgid "Reminder!!"
 msgstr "Emlékeztető!!"
 
-#: calendar/importers/icalendar-importer.c:588
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "Naptáresemények"
 
-#: 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?"
@@ -6439,7 +6469,7 @@ msgstr ""
 "Az Evolution Gnome Calendar fájlokat talált.\n"
 "Szeretnéd ezeket az Evolutionbe importálni?"
 
-#: calendar/importers/icalendar-importer.c:620
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
@@ -8661,7 +8691,7 @@ msgid "The referenced credentials have expired."
 msgstr ""
 
 #: 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."
@@ -8672,7 +8702,7 @@ msgstr "Rossz hitelesítési válasz a kiszolgálótól"
 msgid "Failed to resolve host `%s': %s"
 msgstr "Nem sikerült gyorstárazni %s üzenetet: %s"
 
-#: camel/camel-sasl-gssapi.c:295
+#: camel/camel-sasl-gssapi.c:299
 #, fuzzy
 msgid "Unsupported security layer."
 msgstr "Nem támogatott típus"
@@ -9249,7 +9279,7 @@ msgstr "Új levelek keresése"
 msgid "Check for new messages in all folders"
 msgstr "Új levelek keresése az összes mappában"
 
-#: 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 "Mappák"
 
@@ -10045,7 +10075,7 @@ msgstr ""
 "Nem sikerült kapcsolódni a %s POP-kiszolgálóhoz.\n"
 "Hiba a jelszó küldése közben: %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 "Nincs '%s' mappa."
@@ -10462,38 +10492,38 @@ msgstr "Válaszcím:"
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:521
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Feladó:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:527
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Tárgy:"
 
-#: composer/e-msg-composer-hdrs.c:536
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Címzett:"
 
-#: composer/e-msg-composer-hdrs.c:537
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Írd be a levél címzettjét"
 
-#: composer/e-msg-composer-hdrs.c:540
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Másolat:"
 
-#: 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 "Írd be, kik kapjanak másolatot a levélről"
 
-#: composer/e-msg-composer-hdrs.c:544
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Rejtett másolat:"
 
-#: 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."
@@ -10504,12 +10534,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:554
+#: composer/e-msg-composer-hdrs.c:549
 #, fuzzy
 msgid "Posting destination"
 msgstr "Nincs leírás"
@@ -10520,12 +10550,12 @@ msgstr "Nincs leírás"
 msgid "Attach file(s)"
 msgstr "Fájl csatolása"
 
-#: composer/e-msg-composer.c:530
+#: composer/e-msg-composer.c:533
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Nem sikerült létrehozni a PGP aláírás részt."
 
-#: composer/e-msg-composer.c:809
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10534,30 +10564,30 @@ msgstr ""
 "Fájlbeolvasási hiba: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "A fájl létezik, felülírod?"
 
-#: composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fájlmentési hiba: %s"
 
-#: composer/e-msg-composer.c:1213
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fájlbetöltési hiba: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fájlelérési hiba: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Nem sikerült betölteni a levelet a szerkesztőből"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10566,7 +10596,7 @@ msgstr ""
 "Nem sikerült keresni a fájlban: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1270
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10575,7 +10605,7 @@ msgstr ""
 "Nem sikerült csonkolni a  fájlt: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1279
+#: composer/e-msg-composer.c:1285
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10584,7 +10614,7 @@ msgstr ""
 "Nem sikerült keresni a fájlban: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10593,7 +10623,7 @@ msgstr ""
 "Hiba a levelek automatikus mentése közben: %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?"
@@ -10602,7 +10632,7 @@ msgstr ""
 "fájlokat.\n"
 "Szeretnéd megkísérelni a visszaállításukat?"
 
-#: composer/e-msg-composer.c:1544
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10613,33 +10643,33 @@ msgstr ""
 "\n"
 "Szeretnéd menteni a változtatásokat?"
 
-#: composer/e-msg-composer.c:1549
+#: composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: composer/e-msg-composer.c:1553
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Figyelem: Módosított levél"
 
-#: composer/e-msg-composer.c:1585
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Fájl megnyitás"
 
-#: composer/e-msg-composer.c:1943
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Signature:"
 msgstr "_Aláírás"
 
-#: 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 "Automatikusan létrehozott"
 
-#: 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 "Levél írása"
 
-#: 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."
@@ -10647,7 +10677,7 @@ msgstr ""
 "Nem sikerült létrehozni a szerkesztőablakot:\n"
 "Nem lehetett aktiválni a címkiválasztó kontrollt."
 
-#: composer/e-msg-composer.c:2816
+#: composer/e-msg-composer.c:2931
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10658,7 +10688,7 @@ msgstr ""
 "Nem sikerült létrehozni a szerkesztőablakot:\n"
 "A HTML-szerkesztő komponens aktiválása sikertelen."
 
-#: 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."
@@ -10666,7 +10696,7 @@ msgstr ""
 "Nem sikerült létrehozni a szerkesztőablakot:\n"
 "A HTML-szerkesztő komponens aktiválása sikertelen."
 
-#: 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>"
@@ -10840,11 +10870,11 @@ msgstr ""
 msgid "Overwrite file?"
 msgstr "Felülírod a fájlt?"
 
-#: e-util/e-passwords.c:345
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Jelszó megjegyzése"
 
-#: e-util/e-passwords.c:347
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Jelszó megjegyzése a munkafolyamat hátralevő részére"
 
@@ -11078,31 +11108,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 "Fontos"
 
 #. 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 "Munka"
 
 #. 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 "Személyes"
 
 #. 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 "Teendő"
 
 #. 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 "Később"
 
@@ -11210,7 +11240,7 @@ msgstr "óta"
 msgid "months"
 msgstr "hónapok"
 
-#: 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 " másodpercek"
 
@@ -11561,7 +11591,7 @@ msgid "Scanning %s"
 msgstr "%s pásztázása"
 
 #: 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"
@@ -11698,68 +11728,72 @@ msgid "Composer Preferences"
 msgstr "Levélszerkesztő beállításai"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-#, fuzzy
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Az Evolution naptár csatorna beállító eszköze.\n"
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Itt állíthatod be a levelezés tulajdonságait, beleértve a biztonsági és "
+"üzenet képernyőket is."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:3
-#, fuzzy
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Az Evolution naptár csatorna beállító eszköze.\n"
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Itt állíthatod be a helyesírás ellenőrzést, az aláírásokat és a "
+"levélszerkesztőt"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:4
 #, fuzzy
-msgid "Configuration control for the Evolution Mailer."
+msgid "Configure the fonts used by Evolution here"
 msgstr "Az Evolution naptár csatorna beállító eszköze.\n"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:5
 #, fuzzy
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Az Evolution naptár csatorna beállító eszköze.\n"
+msgid "Configure your email accounts here"
+msgstr "Postafiókok létrehozása, szerkesztése és egyéb beállítások"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Itt állíthatod be a levelezés tulajdonságait, beleértve a biztonsági és "
-"üzenet képernyőket is."
+#, 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 ""
-"Itt állíthatod be a helyesírás ellenőrzést, az aláírásokat és a "
-"levélszerkesztőt"
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Levelezés beállítása"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:8
 #, fuzzy
-msgid "Configure the fonts used by Evolution here"
-msgstr "Az Evolution naptár csatorna beállító eszköze.\n"
+msgid "Evolution Mail component"
+msgstr "Evolution levélszerkesztő."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Postafiókok létrehozása, szerkesztése és egyéb beállítások"
+msgid "Evolution Mail composer"
+msgstr "Evolution levélszerkesztő."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Levélkezelő Evolution összetevő."
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Levelezés beállítása"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution mail composer."
-msgstr "Evolution levélszerkesztő."
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Levelezést beállító felület"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Evolution vezetői összefoglaló komponens a levelekről."
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution levélmappa-megjelenítő komponens."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Evolution levélmappa-megjelenítő komponens."
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Levelezés beállítása"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:14
 #, fuzzy
-msgid "Factory for the controls exported by the Evolution Mailer"
-msgstr "Az Evolution címjegyzék által exportált \"Factory\" ellenőrzéshez"
+msgid "Evolution Mail preferences control"
+msgstr "Evolution vezetői összefoglaló komponens a levelekről."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:15
 msgid "Font Preferences"
@@ -11773,43 +11807,39 @@ msgstr "Postafiókok"
 msgid "Mail Preferences"
 msgstr "Levelezés beállításai"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:18
-msgid "Mail configuration interface"
-msgstr "Levelezést beállító felület"
-
-#: mail/component-factory.c:114
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Leveleket tartalmazó mappa"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "Nyilvános levélcím"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "Leveleket tartalmazó nyilvános mappa"
 
-#: mail/component-factory.c:116
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Virtuális kuka"
 
-#: mail/component-factory.c:116
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Virtuális kukamappa"
 
-#: mail/component-factory.c:144
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Ez a mappa nem tartalmazhat leveleket."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Tulajdonságok..."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Mappa tulajdonságainak módosítása"
 
-#: 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."
@@ -11817,46 +11847,46 @@ msgstr ""
 "A leveleződ egyes beállításai hibásnak tűnnek, ellenőrizd, hogy minden "
 "rendben van-e."
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "A levélküldés módja nincs beállítva"
 
-#: mail/component-factory.c:1016
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Vannak el nem küldött levelek. biztos hogy kilépsz?"
 
-#: mail/component-factory.c:1056
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Új levél"
 
-#: mail/component-factory.c:1056
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "_Levél"
 
-#: mail/component-factory.c:1057
+#: mail/component-factory.c:1061
 msgid "Compose a new mail message"
 msgstr "Új levél írása"
 
-#: mail/component-factory.c:1065
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "New Message Post"
 msgstr "Új levél"
 
-#: mail/component-factory.c:1065
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "_Post Message"
 msgstr "Levél _nyomtatása"
 
-#: mail/component-factory.c:1066
+#: mail/component-factory.c:1070
 msgid "Post a new mail message"
 msgstr "Egy új levél küldése"
 
-#: mail/component-factory.c:1349
+#: mail/component-factory.c:1353
 #, fuzzy
 msgid "Connecting..."
 msgstr "Kapcsolódás a kiszolgálóhoz..."
 
-#: mail/component-factory.c:1360
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Nem sikerült regisztrálni a tárolót a héjban"
 
@@ -12049,21 +12079,37 @@ msgstr "Alapértelmezett"
 msgid "Getting Folder Information"
 msgstr "Mappaadatok összegyűjtése"
 
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Evolution levélszerkesztő."
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "Factory az mbox fájlok Evolutionbe importálásához"
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolution levélszerkesztő."
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Mbox fájlok importálása az Evolutionbe"
+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 levélszerkesztő."
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Factory az Outlook Express 4 fájlok Evolutionbe importálásához"
+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 "Outlook Express 4 fájlok importálása az Evolutionbe"
+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 levélszerkesztő."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -12109,7 +12155,7 @@ msgstr "Nem adtad meg az összes szükséges információt."
 msgid "Evolution Account Editor"
 msgstr "Evolution Postafiók-szerkesztő"
 
-#: 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 "_Gép:"
 
@@ -12117,7 +12163,7 @@ msgstr "_Gép:"
 msgid "User_name:"
 msgstr "_Felhasználónév:"
 
-#: 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 "Ú_tvonal:"
 
@@ -12134,12 +12180,12 @@ msgid "Don't delete"
 msgstr "Nem töröl"
 
 #: 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 "Tiltás"
 
 #: 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 "Engedélyezés"
 
@@ -12150,7 +12196,7 @@ msgid "[Default]"
 msgstr "Alapértelmezett"
 
 #: 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 "Aktív"
 
@@ -12411,37 +12457,37 @@ msgstr "Levél nyomtatása"
 msgid "Printing of message failed"
 msgstr "Levél nyomtatása sikertelen"
 
-#: 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 "Tényleg külön ablakban akarod megnyitni mind a %d levelet?"
 
-#: 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 "Névtelen"
 
-#: mail/mail-composer-prefs.c:313
+#: mail/mail-composer-prefs.c:335
 #, fuzzy
 msgid "You must specify a valid script name."
 msgstr "Meg kell adnod egy címkenevet"
 
-#: mail/mail-composer-prefs.c:369 mail/mail-composer-prefs.c:431
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
 #, fuzzy
 msgid "[script]"
 msgstr "Nincs leírás"
 
-#: mail/mail-composer-prefs.c:840
+#: mail/mail-composer-prefs.c:864
 #, fuzzy
 msgid "Language(s)"
 msgstr "Nyelv"
 
-#: mail/mail-composer-prefs.c:882
+#: mail/mail-composer-prefs.c:906
 #, fuzzy
 msgid "Add script signature"
 msgstr "Feltétel hozzáadása"
 
-#: mail/mail-composer-prefs.c:902
+#: mail/mail-composer-prefs.c:926
 #, fuzzy
 msgid "Signature(s)"
 msgstr "_Aláírás"
@@ -12510,11 +12556,11 @@ msgstr ""
 "alkotja az Evolution postafiókot. Add meg lent a postafiók nevét. Ez a név "
 "csak az Evolution programban jelenik meg."
 
-#: mail/mail-config.c:924
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Szolgáltatás ellenőrzése"
 
-#: 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 "Kapcsolódás a kiszolgálóhoz..."
 
@@ -12764,14 +12810,19 @@ msgid "Message Display"
 msgstr "Levél megjelenítése"
 
 #: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "A levél tartalmazza"
+
+#: 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 "Értesítés új levélről"
 
-#: 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"
@@ -12779,10 +12830,6 @@ msgstr ""
 "Megjegyzés: az első bejelentkezésig  nem kapsz semmilyen figyelmeztetést a "
 "jelszó megadására."
 
-#: mail/mail-config.glade.h:80
-msgid "On Screen fonts"
-msgstr "Képernyőn használt betűk"
-
 #: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Egyéb információ"
@@ -13021,102 +13068,108 @@ msgid "_Enable"
 msgstr "_Engedélyezés"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr "F_ix szélességű:"
-
-#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "_Továbbítás stílusa"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "_Teljes név:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr "_HTML levél"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr "_Személyazonosság"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "_Képek betöltése, ha a feladó szerepel a címjegyzékben"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "L_egyen ez az alapértelmezett postafiók"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "_Várakozás a levél olvasottként megjelölése előtt:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Név:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "_Soha ne töltse le a képeket a hálózatról"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr "_Hangfájl lejátszása új üzenet beérkezésekor"
 
-#: 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 "_Kérdez, ha HTML levelet küldesz olyan címre, aki nem akar ilyet kapni"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Kérdez, ha ü_res tárggyal akarod elküldeni a levelet"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr "_Levelek fogadása"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "_Válasz stílusa:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr "_Alapértékek"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Parancsfájl:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "_Levél küldése"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Animált képek megjelenítése"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Aláírás"
 
+#: 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 "_Biztonságos kapcsolat használata (SSL):"
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "Eredeti névjegy:"
 
 #: mail/mail-config.glade.h:176
-msgid "_Variable-width:"
-msgstr "_Változó szélességű:"
+msgid "_Use secure connection (SSL):"
+msgstr "_Biztonságos kapcsolat használata (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 "_minden"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr "szín"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "leírás"
 
@@ -13200,19 +13253,19 @@ msgstr "Lejárt elemek:"
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%Y %B %d, %l:%M %P szerint"
 
-#: mail/mail-display.c:2234
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Hivatkozás megnyitása böngészőben"
 
-#: mail/mail-display.c:2235
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Hivatkozás helyének másolása"
 
-#: mail/mail-display.c:2237
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Hivatkozás mentése másként (FIXME)"
 
-#: mail/mail-display.c:2239
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Kép mentése másként..."
 
@@ -13754,31 +13807,31 @@ msgstr "Magasabb"
 msgid "Highest"
 msgstr "Legmagasabb"
 
-#: 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 "Ma %l:%M %p"
 
-#: mail/message-list.c:1092
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Tegnap %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 "%d %b %l:%M %p"
 
-#: mail/message-list.c:1114
+#: mail/message-list.c:1118
 msgid "%b %d %Y"
 msgstr "%Y %d %b"
 
-#: mail/message-list.c:2610
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "Levéllista létrehozása"
 
@@ -13875,40 +13928,40 @@ msgstr "_Esedékes"
 msgid "_Flag:"
 msgstr "_Jelölő:"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Mappák pásztázása %s alatt \"%s\"-en"
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Gyökérszintű mappák pásztázása \"%s\"-en"
 
-#: mail/subscribe-dialog.c:331
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Feliratkozás \"%s\" mappára"
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Leiratkozás \"%s\" mappáról"
 
-#: 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 "Mappa"
 
-#: mail/subscribe-dialog.c:1356
+#: mail/subscribe-dialog.c:1389
 msgid "Scanning folders..."
 msgstr "Mappák pásztázása..."
 
-#: mail/subscribe-dialog.c:1470
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Nincs kiszolgáló kiválasztva."
 
-#: mail/subscribe-dialog.c:1545
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Válassz egy kiszolgálót."
 
@@ -13944,20 +13997,25 @@ msgstr "_Leiratkozás"
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 #, fuzzy
-msgid "Configuration control for the Evolution Summary."
+msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Az Evolution tennivaló csatorna beállító eszköze.\n"
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 #, fuzzy
-msgid "Configure the appearance of the Evolution Summary here"
-msgstr "Az Evolution tennivaló csatorna beállító eszköze.\n"
+msgid "Evolution Summary"
+msgstr "Evolution levélszerkesztő."
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
 #, fuzzy
-msgid "Evolution Summary component."
+msgid "Evolution Summary component"
 msgstr "Evolution levélszerkesztő."
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Factory az Evolution Task kontrolljához"
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 msgid "Summary Preferences"
 msgstr "Összefoglaló beállításai"
 
@@ -23852,15 +23910,15 @@ msgstr "LHBP:LHSY"
 msgid "%A, %B %e %Y"
 msgstr "%Y %B %e, %A"
 
-#: my-evolution/e-summary.c:524
+#: my-evolution/e-summary.c:523
 msgid "Please wait..."
 msgstr "Várj..."
 
-#: 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 "Összefoglaló nyomtatása"
 
-#: my-evolution/e-summary.c:624
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Az összefoglaló nyomtatása sikertelen"
 
@@ -25132,23 +25190,24 @@ msgstr "_Időjárás"
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
 #, fuzzy
-msgid "Configuration control for Evolution folder settings."
-msgstr "Az Evolution tennivaló csatorna beállító eszköze.\n"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
 msgid "Configure special folders and offline folder behavior here"
 msgstr ""
 "Speciális mappák és kapcsolat nélküli módban használt mappák viselkedésének "
 "beállítása"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Az Evolution héj."
+
 #: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Folder Settings"
-msgstr "Mappabeállítások"
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Factory az Evolution Task kontrolljához"
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "The Evolution shell."
-msgstr "Az Evolution héj."
+msgid "Folder Settings"
+msgstr "Mappabeállítások"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25180,8 +25239,8 @@ msgstr "Mappa hozzáadása"
 msgid "Drafts"
 msgstr "Piszkozatok"
 
-#: 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 "Beérkezett levelek"
 
@@ -25217,40 +25276,7 @@ msgstr ""
 "Hiba történt a fájlok másolása közben ide: \n"
 "`%s'."
 
-#: shell/e-setup.c:243
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Az Evolution nem tudta létrehozni a könyvtárat\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 ""
-"%s könyvtár \n"
-"jogosultságai nem megfelelőek. Tedd olvashatóvá\n"
-"és végrehajthatóvá, és indítsd újra az Evolutiont."
-
-#: 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 ""
-"%s fájlt \n"
-"el kell távolítani, hogy az Evolution helyesen működhessen.\n"
-"Töröld le a fájlt és indítsd újra az Evolutiont."
-
-#: shell/e-setup.c:290
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -25261,7 +25287,7 @@ msgstr ""
 "Kérlek mozgasd el a fájlt, hogy az Evolution\n"
 "települni tudjon."
 
-#: shell/e-setup.c:299
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25406,7 +25432,7 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "Ú_j mappa létrehozása..."
 
-#: 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 "(Névtelen)"
 
@@ -25446,17 +25472,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "Válassz mappát"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "`%s' fájl nem létezik."
 
-#: 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 hiba"
 
-#: 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"
@@ -25465,11 +25491,11 @@ msgstr ""
 "Nincs olyan importáló, amely képes lenne kezelni\n"
 "%s-t"
 
-#: shell/e-shell-importer.c:517
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "Importálás folyamatban"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25478,17 +25504,17 @@ msgstr ""
 "%s importálása.\n"
 "%s indítása"
 
-#: shell/e-shell-importer.c:536
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "Hiba %s indításakor"
 
-#: shell/e-shell-importer.c:550
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Hiba %s betöltésekor"
 
-#: shell/e-shell-importer.c:567
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25497,31 +25523,31 @@ msgstr ""
 "%s importálása\n"
 "1. elem importálása."
 
-#: shell/e-shell-importer.c:621
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: shell/e-shell-importer.c:670
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Fájlnév:"
 
-#: shell/e-shell-importer.c:675
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Válassz egy fájlt"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Fájltípus:"
 
-#: shell/e-shell-importer.c:709
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "Adatok és beállítások importálása korábbi programokból"
 
-#: shell/e-shell-importer.c:713
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "Egyetlen fájl importálása"
 
-#: 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"
@@ -25529,24 +25555,24 @@ msgstr ""
 "Várj...\n"
 "Meglévő beállítások keresése"
 
-#: shell/e-shell-importer.c:782
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Az okos importálók indítása"
 
-#: 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 "Feladó %s:"
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Válassz mappát"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Válaszd ki az importálálandó adatok célkönyvtárát"
 
-#: 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 "Importálás"
 
@@ -25692,27 +25718,27 @@ msgstr "Kapcsolat nélküli munka"
 msgid "(No folder displayed)"
 msgstr "(Nem jeleníthető meg a mappa)"
 
-#: 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 "(semmi)"
 
-#: 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 ""
 "A Ximian Evolution a hálózatban van. Kattints erre a gombra a kapcsolat "
 "nélküli munkához."
 
-#: shell/e-shell-view.c:2107
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "A Ximian Evolution felkészül a kapcsolat nélküli munkára."
 
-#: 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 ""
@@ -25730,12 +25756,12 @@ msgstr ""
 "Az aktiválórendszer által adott hiba:\n"
 "%s"
 
-#: shell/e-shell.c:738
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nem sikerült beállítani a helyi tárterületet -- %s"
 
-#: shell/e-shell.c:1804
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25746,19 +25772,19 @@ msgstr ""
 "váratlanul kilépett. Ki kell lépned az Evolutionből, és újra\n"
 "el kell indítanod, hogy ismét elérhesd az adataidat."
 
-#: shell/e-shell.c:2069
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Érvénytelen argumentumok"
 
-#: shell/e-shell.c:2071
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "Nem sikerült regisztrálni az OAF-ban"
 
-#: shell/e-shell.c:2073
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "A beállítások adatbázisa nem található"
 
-#: shell/e-shell.c:2075 shell/e-storage.c:572
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Általános hiba"
 
@@ -25997,63 +26023,63 @@ msgstr ""
 "Az aktiválórendszer által adott hiba:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "CORBA hiba"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Megszakítva"
 
-#: shell/evolution-shell-component.c:1171
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Érvénytelen argumentum"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "Már van tulajdonos"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Nincs tulajdonos"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Nem található"
 
-#: shell/evolution-shell-component.c:1179
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Nem támogatott típus"
 
-#: shell/evolution-shell-component.c:1181
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Nem támogatott séma"
 
-#: shell/evolution-shell-component.c:1183
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Nem támogatott művelet"
 
-#: shell/evolution-shell-component.c:1185
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Belső hiba"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Létezik"
 
-#: shell/evolution-shell-component.c:1191
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "Érvénytelen URI"
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Van almappája."
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Nincs hely"
 
-#: shell/evolution-shell-component.c:1199
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "A régi tulajdonos meghalt"
 
@@ -26074,10 +26100,6 @@ msgstr "Kattints az OK gombra a kapcsolat bezárásához"
 msgid "The following connections are currently active:"
 msgstr "Pillanatnyilag a következő kapcsolatok aktívak:"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "dialog1"
-msgstr ""
-
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 #, fuzzy
 msgid "C_alendar:"
@@ -26220,16 +26242,16 @@ msgstr "Ne kérdezze meg többet."
 msgid "Evolution can import data from the following files:"
 msgstr "Az Evolution a következő fájlokból képes adatokat importálni:"
 
-#: 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 "Az Evolution most kilép..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:264
+#: shell/main.c:266
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26261,7 +26283,7 @@ msgstr ""
 "Reméljük, élvezni fogod a kemény munkánk eredményét, és várjuk\n"
 "hozzájárulásod! \n"
 
-#: shell/main.c:288
+#: shell/main.c:290
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -26269,40 +26291,44 @@ msgstr ""
 "Köszönettel\n"
 "A Ximian Evolution Csapat\n"
 
-#: shell/main.c:296
+#: shell/main.c:298
 msgid "Don't tell me again"
 msgstr "Ne jelenítse meg többet"
 
-#: shell/main.c:385
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "A Ximian Evolution héj nem elérhető."
 
-#: shell/main.c:394
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nem sikerült inicializálni a Ximian Evolution héjat: %s"
 
-#: shell/main.c:526
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Indítóképernyő letiltása"
 
-#: shell/main.c:528
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "Indítás kapcsolat nélküli módban"
 
-#: shell/main.c:530
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "Indítás online módban"
 
-#: 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 "Minden összetevő hibakereső üzeneteit fájlba irányítja."
 
-#: shell/main.c:535
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr "Erőlteti az Evolution 1.0.x beállítási fájljainak frissítését"
 
-#: shell/main.c:560
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26313,7 +26339,6 @@ msgstr ""
 "--Haználd a(z)%s --help parancsot további információk eléréséhez\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 "Hiba az alapértelmezett címjegyzék betöltése közben."
@@ -26323,10 +26348,6 @@ msgstr "Hiba az alapértelmezett címjegyzék betöltése közben."
 msgid "Input File"
 msgstr "Bemeneti fájl"
 
-#: tools/evolution-addressbook-export.c:51
-msgid "Output File"
-msgstr "Kimeneti fájl"
-
 #: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Nincs fájlnév megadva."
@@ -26358,6 +26379,19 @@ msgstr ""
 msgid "Default subject for the message."
 msgstr "A levél törlése"
 
+#. 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 "Az átnevezés nem sikerült '%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 "Névjegyek másolása másik mappába..."
@@ -27857,12 +27891,12 @@ msgstr "Nézetek meghatározása"
 
 #. 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 "HKSCPSV"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1114
+#: widgets/misc/e-calendar-item.c:1102
 msgid "%B %Y"
 msgstr "%Y %B"
 
@@ -28013,41 +28047,203 @@ msgstr "_Keresés most"
 msgid "_Clear"
 msgstr "_Törlés"
 
-#: widgets/misc/e-search-bar.c:839
+#: widgets/misc/e-search-bar.c:833
 msgid "Item ID"
 msgstr "Tétel azonosító"
 
-#: widgets/misc/e-search-bar.c:846
+#: widgets/misc/e-search-bar.c:840
 msgid "Subitem ID"
 msgstr "Altétel azonosító"
 
-#: widgets/misc/e-search-bar.c:853
+#: widgets/misc/e-search-bar.c:847
 msgid "Text"
 msgstr "Szöveg"
 
-#: widgets/misc/e-search-bar.c:931
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "Törlés"
 
-#: widgets/misc/e-search-bar.c:933
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Keresés most"
 
 #: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "A Személyes címjegyzék szerver"
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Evolution címjegyzék minikártya-nézőke"
 
 #: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
 #: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
 #, fuzzy
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "A Személyes Naptár Szerver; naptár factory"
+msgid "Evolution Calendar local file backend"
+msgstr "Evolution naptár csatorna"
 
-#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:3
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:3
-msgid "Wombat InterfaceCheck interface"
-msgstr ""
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Evolution címjegyzék minikártya-nézőke"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Factory az LDIF fájlok Evolutionbe importálásához"
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "LDIF fájlok importálása az Evolutionbe."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Factory a VCard fájlok Evolutionbe importálásához"
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "VCard fájlok importálása az Evolutionbe."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "Bonobo vezérlő a felugró címhez."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Bonobo vezérlő a cím megjelenítéséhez."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Minta Bonobo vezérlő, amely a címjegyzéket jeleníti meg."
+
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr "Beállító eszköz az Evolution Címtár-kiszolgálóhoz"
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Evolution címjegyzék minikártyáját megjelenítő control."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Evolution komponens a névjegyek kezeléséhez."
+
+#~ msgid "Factory for the controls exported by the Evolution Addressbook"
+#~ msgstr "Az Evolution címjegyzék által exportált \"Factory\" ellenőrzéshez"
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr "Factory a címjegyzék névkiválasztó felületéhez"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Névtelen címlista"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d nincs megjelenítve)"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Egy Bonono kontroll, amely feladatlistát jelenít meg."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Egy minta Bonono kontroll, amely naptárat jelenít meg."
+
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Beállítási ellenőrzés az Evolution naptárhoz."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Evolution összetevő a naptárkezeléshez."
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Calendar objects"
+#~ msgstr "Factory az Evolution naptár komponenséhez."
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr "Factory a naptárkomponens komponensablakainak összefogására"
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Riasztó szolgáltatás"
+
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Factory az iCalendar típusú fájlok Evolutionbe importálásához"
+
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "iCalendar típusú fájlok importálása az Evolution-be."
+
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "vCalander típusú fájlok importálása az Evolution-be."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Az Evolution naptár csatorna beállító eszköze.\n"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Az Evolution naptár csatorna beállító eszköze.\n"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Az Evolution naptár csatorna beállító eszköze.\n"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Az Evolution naptár csatorna beállító eszköze.\n"
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Levélkezelő Evolution összetevő."
+
+#, fuzzy
+#~ msgid "Factory for the controls exported by the Evolution Mailer"
+#~ msgstr "Az Evolution címjegyzék által exportált \"Factory\" ellenőrzéshez"
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Factory az mbox fájlok Evolutionbe importálásához"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Mbox fájlok importálása az Evolutionbe"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "Factory az Outlook Express 4 fájlok Evolutionbe importálásához"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Outlook Express 4 fájlok importálása az Evolutionbe"
+
+#~ msgid "On Screen fonts"
+#~ msgstr "Képernyőn használt betűk"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "F_ix szélességű:"
+
+#~ msgid "_Variable-width:"
+#~ msgstr "_Változó szélességű:"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Az Evolution tennivaló csatorna beállító eszköze.\n"
+
+#, fuzzy
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Az Evolution tennivaló csatorna beállító eszköze.\n"
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Az Evolution nem tudta létrehozni a könyvtárat\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 könyvtár \n"
+#~ "jogosultságai nem megfelelőek. Tedd olvashatóvá\n"
+#~ "és végrehajthatóvá, és indítsd újra az Evolutiont."
+
+#~ msgid ""
+#~ "File %s\n"
+#~ "should be removed to allow Evolution to work correctly.\n"
+#~ "Please remove this file and restart Evolution."
+#~ msgstr ""
+#~ "%s fájlt \n"
+#~ "el kell távolítani, hogy az Evolution helyesen működhessen.\n"
+#~ "Töröld le a fájlt és indítsd újra az Evolutiont."
+
+#~ msgid "Output File"
+#~ msgstr "Kimeneti fájl"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "A Személyes címjegyzék szerver"
+
+#, fuzzy
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "A Személyes Naptár Szerver; naptár factory"
 
 #~ msgid "1234"
 #~ msgstr "1234"
@@ -28427,9 +28623,6 @@ msgstr ""
 #~ msgid "Factory for the Addressbook's address displayer"
 #~ msgstr "Factory a címjegyzék címmegjelenítőjéhez"
 
-#~ msgid "Factory for the Addressbook's address popup"
-#~ msgstr "Factory a Címjegyzék előugró címeihez"
-
 #~ msgid "Factory for the sample Addressbook control"
 #~ msgstr "Factory a minta címjegyzék kontrollhoz"
 
@@ -28481,10 +28674,6 @@ msgstr ""
 #~ msgstr "Helyesírás-ellenőrzés nyelve"
 
 #, fuzzy
-#~ msgid "Factory for Evolution Summary's configuration control."
-#~ msgstr "Factory az Evolution Task kontrolljához"
-
-#, fuzzy
 #~ msgid "Factory for the Evolution Summary component."
 #~ msgstr "Factory a Vezetői összefoglaló Evolution komponens számára."
 
@@ -28587,9 +28776,6 @@ msgstr ""
 #~ "Az importáló nem felel.\n"
 #~ "Próbálkozás 5 másodperc múlva."
 
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Evolution importáló varázsló"
-
 #~ msgid "_Preferences..."
 #~ msgstr "_Beállítások..."
 
@@ -28793,9 +28979,6 @@ msgstr ""
 #~ msgid "You must specify a label name"
 #~ msgstr "Meg kell adnod egy címkenevet"
 
-#~ msgid "Evolution News Editor"
-#~ msgstr "Evolution News-szerkesztő"
-
 #~ msgid "Are you sure you want to delete this news account?"
 #~ msgstr "Tényleg törölni akarod ezt a news-hozzáférést?"
 
@@ -28942,9 +29125,6 @@ msgstr ""
 #~ msgid "Configuration control for the Evolution Addressbook."
 #~ msgstr "Az Evolution tennivaló csatorna beállító eszköze.\n"
 
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr "Evolution naptár vezetői összefoglaló komponense."
-
 #~ msgid "Factory for the Calendar Summary component."
 #~ msgstr "Factory a naptár összefoglaló komponenséhez."
 
@@ -29246,9 +29426,6 @@ msgstr ""
 #~ msgid "New Contact _List"
 #~ msgstr "Új _címlista"
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "Címjegyzék szerkesztése"
-
 #, fuzzy
 #~ msgid "A_uthenticate with server using:"
 #~ msgstr "Hitelesítés szükséges"
@@ -29588,9 +29765,6 @@ msgstr ""
 #~ msgid "_Displayed feeds:"
 #~ msgstr "_Megjelenített hírforrások:"
 
-#~ msgid "Evolution "
-#~ msgstr "Evolution "
-
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
@@ -31081,10 +31255,6 @@ msgstr ""
 #~ msgstr "Authentikáció:"
 
 #, fuzzy
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Levelezés beállítása"
-
-#, fuzzy
 #~ msgid "Keep mail on server"
 #~ msgstr "Kilépés a levélszerkesztőből"
 
@@ -31199,9 +31369,6 @@ msgstr ""
 #~ "Ifj.\n"
 #~ "Özv.\n"
 
-#~ msgid "Evolution Calendar Conduit"
-#~ msgstr "Evolution naptár csatorna"
-
 #~ msgid "Evolution ToDo Conduit"
 #~ msgstr "Evolution tennivaló csatorna"
 
@@ -31460,10 +31627,6 @@ msgstr ""
 #~ msgstr "Nincs az Evolúciónak ebben a példányában GPG/PGP támogatás."
 
 #, fuzzy
-#~ msgid "_Addressbook Configuration..."
-#~ msgstr "Levelezés beállítása"
-
-#, fuzzy
 #~ msgid "Ca_lendar"
 #~ msgstr "Naptár"
 
diff --git a/po/it.po b/po/it.po
index 17b5cb90dc..de5a5d2980 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2003-04-05 21:54+0200\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-04-06 16:25GMT\n"
 "Last-Translator: Marco Ciampa <ciampix@libero.it>\n"
 "Language-Team: italiano <tp@lists.linux.it>\n"
@@ -15,20 +15,27 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr "Fabbrica per importare i file LDIF in Evolution."
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Compositore della posta di Evolution."
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "Importa file LDIF 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 "Fabbrica per importare i file VCard in Evolution."
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Compositore della posta di Evolution."
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importa i file VCard in Evolution."
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Compositore della posta di 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
@@ -198,14 +205,14 @@ msgid "TTY"
 msgstr "TTY"
 
 #: 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 "Email 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"
@@ -491,74 +498,77 @@ msgstr "Ricezione dei risultati della ricerca LDAP in corso..."
 msgid "Error performing search"
 msgstr "Errore nell'esecuzione della ricerca"
 
-#: addressbook/conduit/address-conduit.c:296
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Indirizzo sync predefinito:"
 
-#: addressbook/conduit/address-conduit.c:539
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Il cursore non può essere caricato\n"
 
-#: addressbook/conduit/address-conduit.c:552
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EBook non caricato\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 "Impossibile avviare il server 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 "Impossibile avviare 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 "Impossibile leggere il blocco indirizzi del pilot"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Un controllo di Bonobo per il popup di un indirizzo."
+msgid "Configure access to LDAP directory servers here"
+msgstr "Configura qui l'accesso ai server di directory LDAP"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Un controllo di Bonobo per visualizzare un indirizzo."
+msgid "Directory Servers"
+msgstr "Server di directory"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Un semplice controllo di Bonobo che visualizza una rubrica."
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Visore di minicard per la rubrica di Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr "Controllo configurazione per gli storages della rubrica di Evolution."
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Interfaccia per la selezione dei nomi della rubrica di Evolution."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure access to LDAP directory servers here"
-msgstr "Configura qui l'accesso ai server di directory LDAP"
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Fabbrica per il popup di indirizzi della rubrica"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Controllo che visualizza una minicard per la rubrica di Evolution."
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Visore di minicard per la rubrica di Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Directory Servers"
-msgstr "Server di directory"
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Visore di minicard per la rubrica di Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Visore di minicard per la rubrica di Evolution"
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Componente di test di Evolution."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Componente di Evolution per gestire i contatti."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Factory for the controls exported by the Evolution Addressbook"
-msgstr "Fabbrica per i controlli esportati dalla rubrica di Evolution."
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Visore di minicard per la rubrica di Evolution"
 
 #: addressbook/gui/component/addressbook-component.c:76
 #: addressbook/gui/component/addressbook-component.c:605
@@ -765,7 +775,8 @@ msgstr ""
 
 #: addressbook/gui/component/addressbook.c:999
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr "Il backend per questa rubrica è incapace di elaborare questa interrogazione."
+msgstr ""
+"Il backend per questa rubrica è incapace di elaborare questa interrogazione."
 
 #: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
@@ -792,46 +803,46 @@ msgstr "La URI che mostrerà il browser delle cartelle"
 #. * 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 "(nessuno)"
 
-#: 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 "Email principale"
 
-#: addressbook/gui/component/e-address-popup.c:608
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Selezionare un'azione"
 
-#: 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 "Crea un nuovo contatto \"%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 "Aggiungi indirizzo al contatto esistente \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:908
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Interrogazione rubrica..."
 
-#: 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 "Modifica informazioni del contatto"
 
-#: 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 "Aggiungi ai contatti"
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Unisci indirizzo email"
 
@@ -844,63 +855,69 @@ msgid "Enable Queries (Dangerous!)"
 msgstr "Abilita query (pericoloso!)"
 
 #: 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 "  Mostra basi supportate"
 
-#: 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
-#: addressbook/gui/contact-list-editor/contact-list-editor.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:4
+#: 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
 msgid "1:00"
 msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "2:30"
 msgstr "2:30"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "5:00"
 msgstr "5:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "Add LDAP Server"
 msgstr "Aggiungi server LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
 msgstr "Sorgenti della rubrica"
 
-#: addressbook/gui/component/ldap-config.glade.h:11 mail/mail-account-gui.c:61
-#: 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 "Sempre"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Anonymously"
 msgstr "Anonimamente"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: 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"
@@ -914,53 +931,55 @@ msgstr ""
 "Prego premere il tasto \"Fine\" per salvare le impostazioni che si è sin qui "
 "inserite."
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
 msgstr "Connessione"
 
-#: addressbook/gui/component/ldap-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "E_limina"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "_Nome distintivo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Edit LDAP Server"
 msgstr "Modifica server LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Email Address:"
 msgstr "Indirizzo email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution utilizzerà questo DN per autenticarti con il server"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Evolution will use this email address to authenticate you with the server"
-msgstr "Evolution utilizzerà questo indirizzo di posta per autenticarsi con il server"
+#: addressbook/gui/component/ldap-config.glade.h:25
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"Evolution utilizzerà questo indirizzo di posta per autenticarsi con il server"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Finished"
 msgstr "Finito"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "General"
 msgstr "Generale"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "LDAP Configuration Assistant"
 msgstr "Assistente configurazione LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:63
-#: mail/mail-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr "Mai"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: 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"
@@ -976,26 +995,26 @@ msgstr ""
 "crittograficamente la connessione. Chiedi all'amministratore se il server "
 "LDAP usa questi protocolli."
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Uno"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "Campo della ricerca: "
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:33
-#: calendar/gui/calendar-model.c:1975 calendar/gui/e-day-view.c:1683
-#: calendar/gui/e-week-view.c:1229
+#: 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 "Ricerca in corso"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Selezionato:"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -1005,7 +1024,7 @@ msgstr ""
 "LDAP solo se\n"
 "il server LDAP supporta SSL o TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: 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"
@@ -1023,7 +1042,7 @@ msgstr ""
 "connessione è già\n"
 "sicura."
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: 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"
@@ -1037,7 +1056,7 @@ msgstr ""
 "vulnerabili\n"
 "ad attacchi sulla sicurezza."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
@@ -1047,7 +1066,7 @@ msgstr ""
 "Evolution per\n"
 "le ricerche e per la creazione e modifica dei contatti."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
@@ -1055,31 +1074,31 @@ msgstr ""
 "Specificare un nome da mostrare è l'ultimo passo necessario per la "
 "configurazione di un server LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 1: Server Information"
 msgstr "Passo 1: informazioni sul server"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Step 2: Connecting to Server"
 msgstr "Passo 2: connessione al server"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr "Passo 3: ricerca della directory"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr "Passo 4: mostra il nome"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Supported Search Bases"
 msgstr "Basi di ricerca supportate"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: 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"
@@ -1092,7 +1111,7 @@ msgstr ""
 "sistema se non si è\n"
 "sicuri di queste informazioni."
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1106,7 +1125,7 @@ msgstr ""
 "amministratore\n"
 "di sistema se avete bisogno di cambiare queste opzioni."
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: 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"
@@ -1118,14 +1137,15 @@ msgstr ""
 "Se si lascia in bianco questo campo la ricerca comincerà alla radice "
 "dell'albero delle directory."
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:62
+#, fuzzy
 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 ""
 "L'ampiezza ricerca definisce a che profondità si vuole venga estesa la "
 "ricerca lungo\n"
@@ -1134,7 +1154,7 @@ msgstr ""
 "Un'ampiezza di ricerca di \"uno\" includerà solo le voci un livello sotto la "
 "base."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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"
@@ -1151,7 +1171,7 @@ msgstr ""
 "circa il server. Prego contattare il Vostro amministratore di sistema se\n"
 "avete bisogno di aiuto per trovare queste informazioni."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1159,7 +1179,7 @@ msgstr ""
 "Questo è il nome completo del Vostro server ldap. Per esempio \"ldap."
 "miazienda.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -1168,7 +1188,7 @@ msgstr ""
 "Questo è il numero massimo di voci da scaricare. L'impostazione di un valore "
 "troppo grande rallenterà questa rubrica."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: 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 "
@@ -1178,7 +1198,7 @@ msgstr ""
 "impostare questo come \"indirizzo email\" richiede accesso anonimo al server "
 "ldap."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: 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"
@@ -1187,7 +1207,7 @@ msgstr ""
 "Questo nome viene usato per identificare il vostro account.\n"
 " Serve solo allo scopo di visualizzarlo."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: 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"
@@ -1200,45 +1220,45 @@ msgstr ""
 "amministratore di\n"
 "sistema che porta si dovrà specificare."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "This option controls how long a search will be run."
 msgstr "Quest'opzione controlla quanto una ricerca potrà estendersi."
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr "U_sa SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr "Uso nome distintivo (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using email address"
 msgstr "Uso indirizzo email"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:62
-#: mail/mail-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Quando è possibile"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: 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:5
+#: 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:133 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Aggiungi"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Display name:"
 msgstr "Mostra il nome:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr "Limite scaricamento:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86 filter/filter.glade.h:16
-#: mail/mail-config.glade.h:148 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
@@ -1247,85 +1267,73 @@ msgstr "Limite scaricamento:"
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr "Metodo di identificazione:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Port number:"
 msgstr "_Porta numero:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Search base:"
 msgstr "_Base della ricerca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "Nome del _server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Timeout (minutes):"
 msgstr "_Timeout (minuti):"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "cards"
 msgstr "card"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "connecting-tab"
 msgstr "linguetta-connessione"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "general-tab"
 msgstr "linguetta-generale"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "searching-tab"
 msgstr "linguetta-ricerca"
 
 #: 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 "Interfaccia per la selezione dei nomi della rubrica di Evolution."
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Fabbrica per l'interfaccia di selezione dei nomi della Rubrica"
-
-#: 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 "Rimuovere tutti"
 
 #. 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 "Rimuovere"
 
-#: 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
 msgid "View Contact List"
 msgstr "Mostra lista contatti"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
 msgid "View Contact Info"
 msgstr "Mostra informazioni del contatto"
 
-#: 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 "Invio posta in HTML?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:370
-msgid "Unnamed Contact List"
-msgstr "Lista di contatti senza nome"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:387
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d non mostrati)"
-
-#: 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 "Contatto senza nome"
 
@@ -1334,11 +1342,11 @@ msgstr "Contatto senza nome"
 msgid "Source"
 msgstr "Sorgente"
 
-#: 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 "Seleziona contatti dalla rubrica"
 
-#: 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 "Trova contatto in"
 
@@ -1467,9 +1475,9 @@ msgstr "Vuole ricevere messaggi in _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:146 shell/glade/e-folder-list.glade.h:2
+#: 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
@@ -1506,8 +1514,8 @@ msgstr "Indirizzo pagina _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:183
 msgid "Editable"
@@ -2539,7 +2547,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"
@@ -2739,28 +2747,29 @@ msgstr "S_uffisso:"
 msgid "_Title:"
 msgstr "_Titolo:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "List _name:"
 msgstr "Nome della _lista:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "Members"
 msgstr "Membri"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: 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 "Inserire un indirizzo email o trascinare un contatto dalla lista sottostante:"
+msgstr ""
+"Inserire un indirizzo email o trascinare un contatto dalla lista sottostante:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Nascondi gli indirizzi quando si invia una email a questa lista"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: 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 "_Rimuovere"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "contact-list-editor"
 msgstr "Editor della lista dei contatti"
 
@@ -2848,7 +2857,7 @@ msgstr "%d card"
 #: 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 "Interrogazione"
@@ -2863,20 +2872,21 @@ msgstr "Modello"
 
 #: 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 "Errore nella modifica della card"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr "Completato"
 
 #: 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 "Errore sconosciuto"
 
@@ -2885,7 +2895,7 @@ msgid "Repository offline"
 msgstr "Deposito non in linea"
 
 #: 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 "Permesso negato"
 
@@ -2902,7 +2912,7 @@ msgid "Protocol not supported"
 msgstr "Protocollo non supportato"
 
 #: 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
@@ -3097,7 +3107,7 @@ msgid "Delete"
 msgstr "Elimina"
 
 #: 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 corrente"
 
@@ -3202,38 +3212,38 @@ msgstr "e un'altra card."
 msgid "Save in addressbook"
 msgstr "Salva nella rubrica"
 
-#: addressbook/gui/widgets/e-minicard-label.c:102
+#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:146
 msgid "Width"
 msgstr "Larghezza"
 
-#: addressbook/gui/widgets/e-minicard-label.c:109
+#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:153
 msgid "Height"
 msgstr "Altezza"
 
-#: 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 "Ha il focus"
 
-#: 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 "Nome del campo"
 
-#: addressbook/gui/widgets/e-minicard-label.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Modello del testo"
 
-#: addressbook/gui/widgets/e-minicard-label.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Lunghezza massima del nome del campo"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:125
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
 msgstr "Larghezza colonna"
 
@@ -3383,7 +3393,7 @@ msgstr "Margini"
 msgid "Number of columns:"
 msgstr "Numero di colonne:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr "Opzioni"
 
@@ -3599,7 +3609,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"
@@ -3618,73 +3628,75 @@ msgstr "Bassa"
 msgid "Undefined"
 msgstr "Non definita"
 
-#: calendar/conduits/calendar/calendar-conduit.c:208
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr "Dividi eventi-multigiorno:"
 
-#: 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 "Errore durante la comunicazione con il server del calendario"
 
-#: 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 "Impossibile leggere il blocco di applicazione del calendario"
 
-#: calendar/conduits/todo/todo-conduit.c:208
+#: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
 msgstr "Priorità predefinita:"
 
-#: 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 "Impossibile leggere il blocco delle applicazioni da fare del Pilot "
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "Un controllo Bonobo che visualizza una lista di task."
+msgid "Calendar and Tasks"
+msgstr "Calendario e attività"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Un semplice controllo di Bonobo che visualizza un calendario."
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configura quì il tuo fuso orario, il calendario e l'elenco attività"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
 msgstr "Calendario e attività"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Configurazione per il calendario di Evolution."
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Componente di Evolution per visualizzare le cartelle di posta."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configura quì il tuo fuso orario, il calendario e l'elenco attività"
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Fabbrica per il controllo di configurazione del Sommario di Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
 msgstr "Visore iTip/iMip del calendario di Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Componente di Evolution per gestire il calendario."
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Visore iTip/iMip del calendario di Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Factory for the Evolution Calendar objects"
-msgstr "Fabbrica per gli oggetti del calendario di Evolution."
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Visore iTip/iMip del calendario di Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr ""
-"Fabbrica per centralizzare il componente dell'editor dei dialoghi del "
-"calendario"
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Allarme di Evolution"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Alarm notification service"
-msgstr "Servizio di notifica dell'avviso sonoro"
-
-#: 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 "Fabbrica per il servizio di notifica dell'avviso sonoro"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
@@ -3774,7 +3786,8 @@ msgstr "Impossibile inizializzare gnome-vfs"
 
 #: calendar/gui/alarm-notify/notify-main.c:180
 msgid "Could not create the alarm notify service factory"
-msgstr "Impossibile creare la fabbrica per il servizio di notifica dell'avviso sonoro"
+msgstr ""
+"Impossibile creare la fabbrica per il servizio di notifica dell'avviso sonoro"
 
 #: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
@@ -3799,7 +3812,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"
 
@@ -3817,12 +3830,13 @@ 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"
 
 #: calendar/gui/calendar-commands.c:799
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Impossibile creare la vista del calendario.  Controllare le impostazioni di "
 "ORBit e di OAF"
@@ -3915,12 +3929,12 @@ msgstr "Appuntamento giornaliero"
 msgid "Create a new all-day appointment"
 msgstr "Crea un nuovo appuntamento giornaliero"
 
-#: 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 "Privato"
 
-#: 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 "Confidenziale"
@@ -3945,37 +3959,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 "Libero"
 
 #: 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 "Occupato"
 
-#: 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 "Da cominciare"
 
-#: 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 corso"
 
-#: 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 "Completato"
 
-#: calendar/gui/calendar-model.c:1028
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3986,32 +4000,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: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:76
+#: 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 "Nessuno"
 
-#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Ricorrente"
 
-#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Assegnato"
 
-#: 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"
@@ -4057,23 +4071,23 @@ msgstr "La URI che il calendario visualizzerà"
 msgid "The type of view to show"
 msgstr "Il tipo di vista da mostrare"
 
-#: calendar/gui/dialogs/alarm-options.c:486
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Opzioni avviso sonoro"
 
-#: calendar/gui/dialogs/alarm-options.c:495
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Opzioni messaggi di avviso"
 
-#: calendar/gui/dialogs/alarm-options.c:504
+#: calendar/gui/dialogs/alarm-options.c:438
 msgid "Email Alarm Options"
 msgstr "Opzioni avviso di posta"
 
-#: calendar/gui/dialogs/alarm-options.c:513
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Opzioni programma di avviso"
 
-#: calendar/gui/dialogs/alarm-options.c:522
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Opzioni di avviso sconosciute"
 
@@ -4114,14 +4128,19 @@ msgid "days"
 msgstr "giorni"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:11
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
+msgstr "dialogo1"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:12
 msgid "extra times every"
 msgstr "tempo in più ogni"
 
-#: 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 "ore"
 
-#: 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 "minuti"
 
@@ -4186,7 +4205,7 @@ msgstr "termine dell'appuntamento"
 msgid "hour(s)"
 msgstr "ora(e)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:178
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
 msgid "minute(s)"
 msgstr "minuto(i)"
 
@@ -4214,7 +4233,7 @@ msgstr "30 minuti"
 msgid "60 minutes"
 msgstr "60 minuti"
 
-#: 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 "Allarmi"
 
@@ -4366,7 +4385,7 @@ msgid "_Fri"
 msgstr "_Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "_Generale"
 
@@ -4388,7 +4407,8 @@ msgstr "_Sab"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Show appointment end times in week and month views"
-msgstr "Mostra la scadenza degli appuntamenti nelle viste mensili e settimanali"
+msgstr ""
+"Mostra la scadenza degli appuntamenti nelle viste mensili e settimanali"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Time divisions:"
@@ -4422,7 +4442,8 @@ msgstr "Sicuro di voler annullare e cancellare questa riunione?"
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
-msgstr "L'evento cancellato è assegnato, vuoi spedire una nota di cancellazione?"
+msgstr ""
+"L'evento cancellato è assegnato, vuoi spedire una nota di cancellazione?"
 
 #: calendar/gui/dialogs/cancel-comp.c:70
 msgid "Are you sure you want to cancel and delete this task?"
@@ -4554,7 +4575,7 @@ msgstr "Nessuna descrizione"
 
 #: 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 "Salva come..."
 
@@ -4563,8 +4584,8 @@ msgstr "Salva come..."
 #: calendar/gui/dialogs/comp-editor.c:1379
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
-"I cambiamenti fatti a questo elemento possono essere annullati "
-"se arriva un aggiornamento"
+"I cambiamenti fatti a questo elemento possono essere annullati se arriva un "
+"aggiornamento"
 
 #: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
@@ -4648,19 +4669,19 @@ msgstr "Pianificazione"
 msgid "Meeting"
 msgstr "Riunione"
 
-#: 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 data iniziale è errata"
 
-#: calendar/gui/dialogs/event-page.c:664
+#: calendar/gui/dialogs/event-page.c:610
 msgid "End date is wrong"
 msgstr "La data finale è errata"
 
-#: calendar/gui/dialogs/event-page.c:687
+#: calendar/gui/dialogs/event-page.c:633
 msgid "Start time is wrong"
 msgstr "L'ora iniziale è errata"
 
-#: calendar/gui/dialogs/event-page.c:694
+#: calendar/gui/dialogs/event-page.c:640
 msgid "End time is wrong"
 msgstr "L'ora finale è errata"
 
@@ -4717,15 +4738,10 @@ msgid "Su_mmary:"
 msgstr "_Indice:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Contatti..."
-
-#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_End time:"
 msgstr "Ora di _fine:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "_Ora di inizio:"
 
@@ -4807,7 +4823,7 @@ msgid "_Change Organizer"
 msgstr "_Cambia organizzatore"
 
 #: 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 "_Invita altri..."
 
@@ -4820,8 +4836,10 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Stai modificando un'azione ricorrente, cosa vuoi modificare?"
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
-msgstr "Stai modificando una voce giornaliera ricorrente, cosa vuoi modificare?"
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+"Stai modificando una voce giornaliera ricorrente, cosa vuoi modificare?"
 
 #: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
@@ -4837,7 +4855,8 @@ msgstr "Tutte le istanze"
 
 #: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Questo appuntamento contiene ricorrenze che Evolution non può modificare."
+msgstr ""
+"Questo appuntamento contiene ricorrenze che Evolution non può modificare."
 
 #: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
@@ -5010,7 +5029,7 @@ msgstr "La data dovuta è errata"
 
 #: 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 "Descrizione:"
 
@@ -5018,6 +5037,10 @@ msgstr "Descrizione:"
 msgid "Sta_rt Date:"
 msgstr "Data di _inizio:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Contatti..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "Sca_denza:"
@@ -5171,12 +5194,12 @@ 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 "Rimozione degli elementi selezionati in corso"
 
 #: 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 "_Apri"
@@ -5186,7 +5209,7 @@ msgid "_Save as..."
 msgstr "_Salva come..."
 
 #: 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
@@ -5194,21 +5217,21 @@ msgid "_Print..."
 msgstr "S_tampa..."
 
 #: 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 "_Taglia"
 
 #: 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 "_Copia"
 
 #: 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"
@@ -5235,7 +5258,7 @@ msgid "_Delete Selected Tasks"
 msgstr "_Elimina le attività selezionate"
 
 #: 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 "Aggiornamento elementi in corso"
 
@@ -5278,7 +5301,7 @@ msgid "Start Date"
 msgstr "Inizio"
 
 #: 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 "Sommario"
@@ -5318,14 +5341,14 @@ msgstr "%02i divisioni per 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 %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"
 
@@ -5345,15 +5368,15 @@ msgstr "pm"
 msgid "New _Appointment"
 msgstr "Nuovo _appuntamento"
 
-#: 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 "Nuovo _evento del giorno"
 
-#: 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 "Nuova riunione"
 
-#: 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 "Nuova attività"
 
@@ -5361,47 +5384,47 @@ msgstr "Nuova attività"
 msgid "Print..."
 msgstr "Stampa..."
 
-#: 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 "Vai a _oggi"
 
-#: 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 "_Vai alla data..."
 
-#: 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 "_Rende note le Informazioni sulla disponibilità"
 
-#: 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 "Impostazioni..."
 
-#: 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 "_Salva con nome..."
 
-#: 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 "Pianifica una riunione..."
 
-#: 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 "Inoltra come iCalendar..."
 
-#: 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 "_Rendi rimandabile questa ricorrenza"
 
-#: 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 "_Elimina questa ricorrenza"
 
-#: 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 "Elimina _tutte le ricorrenze"
 
@@ -5512,7 +5535,8 @@ msgstr "Partecipante sconosciuto"
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
-msgstr "<br> Controllate queste informazioni, e poi selezionate un'azione dal menu."
+msgstr ""
+"<br> Controllate queste informazioni, e poi selezionate un'azione dal menu."
 
 #: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
@@ -5567,7 +5591,7 @@ msgstr "Aggiornare"
 #: 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"
 
@@ -5596,7 +5620,7 @@ msgid "Send Latest Information"
 msgstr "Invia Informazioni Correnti"
 
 #: 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 "Annulla"
 
@@ -5807,7 +5831,8 @@ msgstr "Impossibile aggiornare il file di calendario!\n"
 
 #: 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 "Impossibile aggiornare lo stato del partecipante; l'elemento non esiste più"
+msgstr ""
+"Impossibile aggiornare lo stato del partecipante; l'elemento non esiste più"
 
 #: calendar/gui/e-itip-control.c:1972
 msgid "This response is not from a current attendee.  Add as an attendee?"
@@ -5817,7 +5842,8 @@ msgstr ""
 
 #: calendar/gui/e-itip-control.c:1984
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "Impossibile aggiornare lo stato del partecipante; lo stato non è valido!\n"
+msgstr ""
+"Impossibile aggiornare lo stato del partecipante; lo stato non è valido!\n"
 
 #: calendar/gui/e-itip-control.c:2008
 msgid "You don't have the right permissions to update the calendar\n"
@@ -5950,7 +5976,7 @@ msgid "Needs Action"
 msgstr "Richiede azione"
 
 #: 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 "Tentativo"
 
@@ -5966,14 +5992,14 @@ msgstr "In Corso"
 #. 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 %m/%d/%Y"
@@ -5985,63 +6011,63 @@ msgstr "%a %m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%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 "Assente"
 
-#: calendar/gui/e-meeting-time-sel.c:410
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Nessuna informazione"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Opzioni"
 
-#: calendar/gui/e-meeting-time-sel.c:468
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Mostra s_olo le ore lavorative"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Vista _allargata"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "A_ggiorna Disponibilità"
 
-#: 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 "_Autopick"
 
-#: 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 "_Tutto il Personale e le Risorse"
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Tutto il _Personale e una Risorsa"
 
-#: calendar/gui/e-meeting-time-sel.c:594
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "Personale _Richiesto"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Personale Richiesto e _una risorsa"
 
-#: calendar/gui/e-meeting-time-sel.c:630
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "_Inizio appuntamento ore:"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "T_ermine dell' appuntamento ore:"
 
@@ -6087,7 +6113,7 @@ msgstr "Rimozione degli oggetti selezionati..."
 msgid "Expunging"
 msgstr "Eliminazione"
 
-#: calendar/gui/e-week-view.c:3525
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Nuovo _Appuntamento..."
 
@@ -6244,7 +6270,7 @@ msgstr "Informazioni sulla disponibilità (da %s a %s)"
 msgid "iCalendar information"
 msgstr "Informazioni iCalendar"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Devi essere un partecipante all'evento."
 
@@ -6344,7 +6370,7 @@ msgstr "Contatti: "
 
 #: 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 "Anteprima di Stampa"
 
@@ -6386,16 +6412,28 @@ msgid "SMTWTFS"
 msgstr "DLMMGVS"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "Fabbrica per importare i file iCalendar in Evolution."
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Visore iTip/iMip del calendario di Evolution"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "Importa i file iCalendar in Evolution."
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Visore iTip/iMip del calendario di Evolution"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "Importa i file VCalendar in Evolution."
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Visore iTip/iMip del calendario di Evolution"
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Messaggio del Calendario"
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
+msgstr ""
 
 #: calendar/importers/icalendar-importer.c:404
 msgid "Reminder!!"
@@ -8562,7 +8600,8 @@ msgstr "Server challenge non valido\n"
 
 #: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "Il server challenge conteneva un token \"Quality of Protection\" non valido\n"
+msgstr ""
+"Il server challenge conteneva un token \"Quality of Protection\" non valido\n"
 
 #: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
@@ -8570,7 +8609,8 @@ msgstr "La risposta del server non contiene dati per l'autenticazione\n"
 
 #: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
-msgstr "La risposta del server non contiene dati completi per l'autenticazione\n"
+msgstr ""
+"La risposta del server non contiene dati completi per l'autenticazione\n"
 
 #: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
@@ -8582,7 +8622,8 @@ msgstr "GSSAPI"
 
 #: camel/camel-sasl-gssapi.c:50
 msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr "Con questa ci si connette al server usando Kerberos 5 per l'autenticazione."
+msgstr ""
+"Con questa ci si connette al server usando Kerberos 5 per l'autenticazione."
 
 #: camel/camel-sasl-gssapi.c:148
 msgid ""
@@ -8617,16 +8658,16 @@ msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr ""
-"L'input_token contiene una firma non valida o una firma che non può "
-"essere verificata."
+"L'input_token contiene una firma non valida o una firma che non può essere "
+"verificata."
 
 #: 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 ""
-"Le credenziali fornite non erano valide per l'inizializzazione del contenuto o "
-"l'handle delle credenziali non si riferisce a nessuna credenziale."
+"Le credenziali fornite non erano valide per l'inizializzazione del contenuto "
+"o l'handle delle credenziali non si riferisce a nessuna credenziale."
 
 #: camel/camel-sasl-gssapi.c:174
 msgid "The supplied context handle did not refer to a valid context."
@@ -8666,7 +8707,8 @@ msgstr "Kerberos 4"
 
 #: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "Con questa ci si connette al server usando Kerberos 4 per l'autenticazione."
+msgstr ""
+"Con questa ci si connette al server usando Kerberos 4 per l'autenticazione."
 
 #: camel/camel-sasl-kerberos4.c:162
 #, c-format
@@ -8683,7 +8725,8 @@ msgstr "Login"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
-msgstr "Con questa opzione ci si connette al server usando una semplice password."
+msgstr ""
+"Con questa opzione ci si connette al server usando una semplice password."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
@@ -8711,7 +8754,8 @@ msgstr "POP prima di SMTP"
 
 #: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "Con questa opzione si autorizza una connessione POP prima di tentare SMTP"
+msgstr ""
+"Con questa opzione si autorizza una connessione POP prima di tentare SMTP"
 
 #: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Source URI"
@@ -8838,11 +8882,13 @@ msgstr "Verifica certificati non riuscita."
 
 #: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Impossibile ottenere la cartella: Operazione non supportata in questo store"
+msgstr ""
+"Impossibile ottenere la cartella: Operazione non supportata in questo store"
 
 #: camel/camel-store.c:268
 msgid "Cannot create folder: Invalid operation on this store"
-msgstr "Impossibile creare una cartella: Operazione non supportata in questo store"
+msgstr ""
+"Impossibile creare una cartella: Operazione non supportata in questo store"
 
 #: camel/camel-tcp-stream-openssl.c:571
 msgid "Unable to get issuer's certificate"
@@ -8858,7 +8904,8 @@ msgstr "Impossibile decrittografare la firma del certificato"
 
 #: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "Impossibile decrttigrafare la firma dell'elenco revoche dei certificati"
+msgstr ""
+"Impossibile decrttigrafare la firma dell'elenco revoche dei certificati"
 
 #: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
@@ -9254,7 +9301,7 @@ msgstr "Per leggere e memorizzare la posta su server 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:84
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr "Password"
 
@@ -9343,7 +9390,8 @@ msgstr "Non è presente la cartella %s"
 
 #: camel/providers/imap/camel-imap-store.c:1839
 #, c-format
-msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 "Il nome della cartella \"%s\" non è valido perché contiene il carattere \"%c"
 "\""
@@ -9485,7 +9533,8 @@ msgstr "Impossibile aggiornare il sommario: %s: %s"
 
 #: camel/providers/local/camel-local-summary.c:457
 msgid "Unable to add message to summary: unknown reason"
-msgstr "Impossibile trovare messaggi da aggiungere al sommario: motivo sconosciuto"
+msgstr ""
+"Impossibile trovare messaggi da aggiungere al sommario: motivo sconosciuto"
 
 #: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
@@ -9705,7 +9754,8 @@ msgstr "Impossibile rinominare la cartella: %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 "Sommario e cartella non corrispondono, nemmeno dopo una sincronizzazione"
+msgstr ""
+"Sommario e cartella non corrispondono, nemmeno dopo una sincronizzazione"
 
 #: camel/providers/local/camel-mbox-summary.c:777
 #: camel/providers/local/camel-spool-summary.c:334
@@ -9936,7 +9986,7 @@ msgstr "Lasciare i messaggi sul server"
 msgid "Delete after %s day(s)"
 msgstr "Elimina dopo %s giorno(i)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr "POP"
 
@@ -10019,13 +10069,13 @@ msgstr ""
 "Impossibile connettersi al server POP.%s.\n"
 "Errore nell'invio della password: %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 "Cartella `%s' non presente."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10044,7 +10094,8 @@ msgstr "Impossibile smostare la lista dei destinatari"
 #: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Impossibile creare una ridirezione verso sendmail: %s: posta non inviata"
+msgstr ""
+"Impossibile creare una ridirezione verso sendmail: %s: posta non inviata"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
@@ -10079,13 +10130,14 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Posta consegnata attraverso il programma sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr "Per consegnare la posta connettendosi a un mail hub remoto usando SMTP.\n"
+msgstr ""
+"Per consegnare la posta connettendosi a un mail hub remoto usando SMTP.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
@@ -10133,7 +10185,8 @@ msgstr "Utente non locale; inoltrare a <percorso-a-cui-inoltrare> "
 
 #: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "L'azione di posta richiesta non è stata effettuata: casella non disponibile"
+msgstr ""
+"L'azione di posta richiesta non è stata effettuata: casella non disponibile"
 
 #: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
@@ -10153,7 +10206,8 @@ msgstr "Azione richiesta non effettuata: spazio non disponibile"
 
 #: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "L'operazione richiesta sulla posta è stata interrotta: spazio non disponibile"
+msgstr ""
+"L'operazione richiesta sulla posta è stata interrotta: spazio non disponibile"
 
 #: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested action not taken: mailbox name not allowed"
@@ -10177,7 +10231,8 @@ msgstr "Il meccanismo di autenticazione é troppo debole"
 
 #: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
-msgstr "È richiesta la crittografia per il meccanismo di autenticazione richiesto"
+msgstr ""
+"È richiesta la crittografia per il meccanismo di autenticazione richiesto"
 
 #: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
@@ -10243,7 +10298,8 @@ msgstr "Posta SMTP consegnata attraverso il programma %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "Cannot send message: sender address not valid."
-msgstr "Impossibile inviare il messaggio: l'indirizzo del mittente non è valido."
+msgstr ""
+"Impossibile inviare il messaggio: l'indirizzo del mittente non è valido."
 
 #: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
 msgid "Sending message"
@@ -10460,7 +10516,8 @@ msgstr "Cc:"
 
 #: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Inserire gli indirizzi che riceveranno una copia conforme del messaggio"
+msgstr ""
+"Inserire gli indirizzi che riceveranno una copia conforme del messaggio"
 
 #: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
@@ -10490,11 +10547,11 @@ msgstr "Destinatario"
 msgid "Attach file(s)"
 msgstr "File allegati"
 
-#: composer/e-msg-composer.c:530
+#: composer/e-msg-composer.c:533
 msgid "Could not create a PGP signature context"
 msgstr "Impossibile creare un contesto firma PGP"
 
-#: composer/e-msg-composer.c:809
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10503,30 +10560,30 @@ msgstr ""
 "Errore di lettura del file: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Il file esiste, sovrascriverlo?"
 
-#: composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Errore nel salvare il file: %s"
 
-#: composer/e-msg-composer.c:1213
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errore nel caricare il file: %s"
 
-#: composer/e-msg-composer.c:1251
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Errore di accesso al file: %s"
 
-#: composer/e-msg-composer.c:1259
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Impossibile scaricare messaggi dall'editor"
 
-#: composer/e-msg-composer.c:1266
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10535,7 +10592,7 @@ msgstr ""
 "Impossibile cercare il file: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1273
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10544,7 +10601,7 @@ msgstr ""
 "Impossibile troncare il file: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1282
+#: composer/e-msg-composer.c:1285
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10553,7 +10610,7 @@ msgstr ""
 "Impossibile copiare il descrittore di file: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1291
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10562,7 +10619,7 @@ msgstr ""
 "Errore nel salvataggio automatico del messaggio: %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?"
@@ -10571,7 +10628,7 @@ msgstr ""
 "precedente.\n"
 "Si desidera tentare di recuperarli?"
 
-#: composer/e-msg-composer.c:1547
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10582,32 +10639,32 @@ msgstr ""
 "\n"
 "Vuoi salvare le modifiche?"
 
-#: composer/e-msg-composer.c:1552
+#: composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "Annulla i cambiamenti"
 
-#: composer/e-msg-composer.c:1556
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Attenzione: Messaggio Modificato"
 
-#: composer/e-msg-composer.c:1588
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Apri file"
 
-#: composer/e-msg-composer.c:2012
+#: composer/e-msg-composer.c:2015
 msgid "Signature:"
 msgstr "Firma:"
 
-#: 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 "Autogenerata"
 
-#: 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 "Componi un nuovo messaggio"
 
-#: 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."
@@ -10615,7 +10672,7 @@ msgstr ""
 "Impossibile creare una finestra di composizione:\n"
 "impossibile attivare il controllo del selettore di indirizzi."
 
-#: composer/e-msg-composer.c:2966
+#: composer/e-msg-composer.c:2931
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10627,7 +10684,7 @@ msgstr ""
 "Prego assicurarsi di aver installato la versione corretta\n"
 "di gtkhtml e libgtkhtml.\n"
 
-#: 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."
@@ -10635,7 +10692,7 @@ msgstr ""
 "Impossibile creare la finestra di composizione:\n"
 "Il componente HTML non è disponibile."
 
-#: 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>"
@@ -10692,8 +10749,9 @@ msgid "Subject does not contain"
 msgstr "L'oggetto non contiene"
 
 #: designs/OOA/ooa.glade.h:1
+#, fuzzy
 msgid ""
-"&lt;b&gt;Currently, your status is \"Out of the Office\". &lt;/b&gt;\n"
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
 "\n"
 "Would you like to change your status to \"In the Office\"? "
 msgstr ""
@@ -10702,21 +10760,24 @@ msgstr ""
 "Vuoi cambiare il tuo stato in \"In ufficio\"?"
 
 #: designs/OOA/ooa.glade.h:4
-msgid "&lt;b&gt;Out of Office Message:&lt;/b&gt;"
+#, fuzzy
+msgid "<b>Out of Office Message:</b>"
 msgstr "&lt;b&gt;Messaggio fuori ufficio:&lt;/b&gt;"
 
 #: designs/OOA/ooa.glade.h:5
-msgid "&lt;b&gt;Status:&lt;/b&gt;"
-msgstr "&lt;b&gt;Stato:&lt;/b&gt;"
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Comincia:</b>"
 
 #: designs/OOA/ooa.glade.h:6
+#, fuzzy
 msgid ""
-"&lt;small&gt;The message specified below will be automatically sent to each "
-"person who sends\n"
-"mail to you while you are out of the office.&lt;/small&gt;"
+"<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 ""
-"&lt;small&gt;Il messaggio specificato sotto sarà automaticamente spedito a ogni "
-"persona che ti spedirà\n"
+"&lt;small&gt;Il messaggio specificato sotto sarà automaticamente spedito a "
+"ogni persona che ti spedirà\n"
 "posta mentre sei fuori dall'ufficio.&lt;/small&gt;"
 
 #: designs/OOA/ooa.glade.h:8
@@ -10744,22 +10805,26 @@ msgid "      "
 msgstr "      "
 
 #: designs/read_receipts/read.glade.h:2
-msgid "&lt;b&gt;Receiving Email&lt;/b&gt;"
-msgstr "&lt;b&gt;Ricezione postal&lt;/b&gt;"
+#, fuzzy
+msgid "<b>Receiving Email</b>"
+msgstr "Ricezione Email"
 
 #: designs/read_receipts/read.glade.h:3
-msgid "&lt;b&gt;Sending Email:&lt;/b&gt;"
-msgstr "&lt;b&gt;Spedizione posta:&lt;/b&gt;"
+#, fuzzy
+msgid "<b>Sending Email:</b>"
+msgstr "Invio Email"
 
 #: designs/read_receipts/read.glade.h:4
+#, fuzzy
 msgid ""
-"&lt;small&gt;This page allows you to choose if you want to be notified via a "
-"read receipt when a message you\n"
+"<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.&lt;/small&gt;"
+"a receipt from you.</small>"
 msgstr ""
-"&lt;small&gt;Questa pagina Vi permette di scegliere se si vuole essere notificati "
-"attraverso una ricevuta di lettura quando un messaggio che avete spedito\n"
+"&lt;small&gt;Questa pagina Vi permette di scegliere se si vuole essere "
+"notificati attraverso una ricevuta di lettura quando un messaggio che avete "
+"spedito\n"
 "viene letto e per specificare cosa Evolution dovrà fare quando qualcuno Vi "
 "richiede una ricevuta.&lt;/small&gt;"
 
@@ -10781,21 +10846,28 @@ msgstr "Ricevute di lettura"
 
 #: designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
-msgstr "Richiedere una ricevuta di lettura per tutti i messaggi che si spediscono"
+msgstr ""
+"Richiedere una ricevuta di lettura per tutti i messaggi che si spediscono"
 
 #: designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr "A meno che il messaggio non sia spedito ad una mailing list e non a me personalmente"
+msgstr ""
+"A meno che il messaggio non sia spedito ad una mailing list e non a me "
+"personalmente"
 
 #: designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
-msgstr "Quando ricevi una email con una ricevuta di lettura, cosa dovrebbe fare Evolution?"
+msgstr ""
+"Quando ricevi una email con una ricevuta di lettura, cosa dovrebbe fare "
+"Evolution?"
 
 #: e-util/e-component-listener.c:128
-msgid "ping_timeout_callback: could not determine if the CORBA object is nil or not"
-msgstr "ping_timeout_callback: non riesco a determinare se l'oggetto CORBA è nil o no"
+msgid ""
+"ping_timeout_callback: could not determine if the CORBA object is nil or not"
+msgstr ""
+"ping_timeout_callback: non riesco a determinare se l'oggetto CORBA è nil o no"
 
 #: e-util/e-dialog-utils.c:247
 msgid ""
@@ -10809,11 +10881,11 @@ msgstr ""
 msgid "Overwrite file?"
 msgstr "Sovrascrivere il file?"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Ricorda questa password"
 
-#: e-util/e-passwords.c:361
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Ricorda questa password per il resto della sessione"
 
@@ -11036,30 +11108,30 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:68
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1279
+#: 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:131 shell/e-config-upgrade.c:1280
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1280
 msgid "Work"
 msgstr "Lavoro"
 
 #. orange
-#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:85
+#: 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 "Personale"
 
 #. forest green
 #: filter/filter-label.c:124 mail/mail-config.c:71
-#: mail/mail-config.glade.h:122 shell/e-config-upgrade.c:1282
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1282
 msgid "To Do"
 msgstr "Da fare"
 
 #. blue
-#: filter/filter-label.c:125 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 "Più tardi"
@@ -11164,7 +11236,7 @@ msgstr "fa"
 msgid "months"
 msgstr "mesi"
 
-#: filter/filter.glade.h:24 mail/mail-config.glade.h:179
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
 msgid "seconds"
 msgstr " secondi"
 
@@ -11505,7 +11577,7 @@ msgid "Scanning %s"
 msgstr "Scansione di \"%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"
@@ -11648,60 +11720,70 @@ msgid "Composer Preferences"
 msgstr "Preferenze di composizione"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Controlli di configurazione per i font di visualizzazione di Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Controlli di configurazione per gli account della posta di Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Controlli di configurazione per il gestore della posta di Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Controlli di configurazione per il compositore di messaggi di Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 "Configura qui le tue preferenze della posta, incluse sicurezza e aspetto "
 "visualizzazione"
 
-#: 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 ""
 "Configura qui il controllo ortografico, le firme e il compositore dei "
 "messaggi"
 
-#: 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 "Configura qui i font utilizzati da Evolution"
 
-#: 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 "Configura qui i tuoi account di posta elettronica"
 
+#: 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 "Fabbrica per il controllo di configurazione del Sommario di Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Compositore della posta di Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Compositore della posta di Evolution."
+
 #: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Componente di Evolution per gestire la posta."
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Fabbrica per il controllo di configurazione del Sommario di Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution mail composer."
-msgstr "Compositore della posta di Evolution."
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Interfaccia di configurazione della posta"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Componente dell'indice esecutivo della posta di Evolution."
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Componente di Evolution per visualizzare le cartelle di posta."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Componente di Evolution per visualizzare le cartelle di posta."
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Fabbrica per il controllo di configurazione del Sommario di Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "Factory for the controls exported by the Evolution Mailer"
-msgstr "Fabbrica per i controlli esportati dal gestore della posta di Evolution."
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Componente dell'indice esecutivo della posta di Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:15
 msgid "Font Preferences"
@@ -11711,47 +11793,43 @@ msgstr "Preferenze caratteri"
 msgid "Mail Accounts"
 msgstr "Account di posta"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:17 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 "Preferenze di posta"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:18
-msgid "Mail configuration interface"
-msgstr "Interfaccia di configurazione della posta"
-
-#: mail/component-factory.c:114
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Cartella contente la posta"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "Posta Pubblica"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "Cartella pubblica contente la posta"
 
-#: mail/component-factory.c:116
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Cestino Virtuale"
 
-#: mail/component-factory.c:116
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Cartella Cestino Virtuale"
 
-#: mail/component-factory.c:144
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Questa cartella non può contenere messaggi."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Proprietà..."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Modifica le proprietà dei questa cartella"
 
-#: 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."
@@ -11759,7 +11837,7 @@ msgstr ""
 "Alcune delle impostazioni della posta sembrano essere state corrotte, "
 "controllare che tutto sia a posto."
 
-#: mail/component-factory.c:996
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "Non è stato impostato un sistema di trasporto per la posta"
 
@@ -11980,7 +12058,7 @@ msgstr "Filtro sulla mailng list (%s)"
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Cartella virtuale sulla mailng list (%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 "Predefinito"
 
@@ -11988,21 +12066,37 @@ msgstr "Predefinito"
 msgid "Getting Folder Information"
 msgstr "Ricerca Informazioni Cartella"
 
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Compositore della posta di Evolution."
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "Fabbrica per importare mbox in Evolution"
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Compositore della posta di Evolution."
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Importa i file mbox 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 "Compositore della posta di Evolution."
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Fabbrica per importare le email di Outlook Express 4 in 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 i file Outlook Express 4 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 "Compositore della posta di Evolution."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -12047,15 +12141,15 @@ msgstr "Non sono state fornite tutte le informazioni richieste."
 msgid "Evolution Account Editor"
 msgstr "Editor degli Account di Evolution"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:155
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:125
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Nome utente:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:162
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "_Percorso:"
 
@@ -12072,12 +12166,12 @@ msgid "Don't delete"
 msgstr "Non cancellare"
 
 #: 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 "Disabilita"
 
 #: 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 "Abilita"
 
@@ -12087,7 +12181,7 @@ msgid "[Default]"
 msgstr "[Predefinito]"
 
 #: 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 "Abilitato"
 
@@ -12314,8 +12408,9 @@ msgid ""
 "\n"
 "Really erase these messages?"
 msgstr ""
-"Questa operazione cancella definitivamente tutti i messaggi marcati come\n "
-"cancellati. Se si continua, non sarà più possibile ripristinare questi messaggi.\n"
+"Questa operazione cancella definitivamente tutti i messaggi marcati come\n"
+" cancellati. Se si continua, non sarà più possibile ripristinare questi "
+"messaggi.\n"
 "\n"
 "Cancellare comunque questi messaggi?"
 
@@ -12345,37 +12440,37 @@ msgstr "Stampa messaggio"
 msgid "Printing of message failed"
 msgstr "Stampa messaggio non riuscita"
 
-#: 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 "Sicuro di voler aprire tutti i %d messaggi in finestre separate?"
 
-#: 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 "Senza nome"
 
-#: mail/mail-composer-prefs.c:313
+#: mail/mail-composer-prefs.c:335
 msgid "You must specify a valid script name."
 msgstr "Specificare un nome script valido."
 
-#: 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 "[script]"
 
-#: mail/mail-composer-prefs.c:840
+#: mail/mail-composer-prefs.c:864
 msgid "Language(s)"
 msgstr "Lingue"
 
-#: mail/mail-composer-prefs.c:882
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr "Aggiungi firma script"
 
-#: mail/mail-composer-prefs.c:902
+#: mail/mail-composer-prefs.c:926
 msgid "Signature(s)"
 msgstr "Firme"
 
-#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identità"
 
@@ -12419,7 +12514,7 @@ msgstr ""
 "non si è sicuri, chiedere all'amministratore di sistema o al Vostro "
 "ProviderInternet."
 
-#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:8
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr "Gestione degli account"
 
@@ -12437,119 +12532,119 @@ msgstr ""
 "un nome per questo account nello spazio sottostante. Questo nome è usato "
 "solo a scopo identificativo."
 
-#: mail/mail-config.c:924
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Verifica servizi"
 
-#: 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 "Connessione al server..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr "_Controlla tipi supportati"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL non è supportato in questa compilazione di 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 non è supportato in questa compilazione di Evolution)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Cifra _sempre con la mia chiave quando invio posta cifrata"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
 msgid "Account Editor"
 msgstr "Editor account"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Informazioni sull'account"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "Add Sc_ript"
 msgstr "Aggiungi script"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "Add new signature..."
 msgstr "Aggiungi nuova firma..."
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Cifra sempre con la mia chiave durante l'invio di posta crittografata"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Firmare sempre i messaggi in uscita quando si usa questo account"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Sempre copia carbone _nascosta (Bcc) a:"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Sempre _copia carbone (Cc) a:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Sempre chiavi di fiducia nel mio mazzo di chiavi quando crittografo"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Allega messaggio originale"
 
-#: 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 "Allegato"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "Automatically _detect links"
 msgstr "Rileva collegamenti automaticamente"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltico (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltico (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "C_haracter set:"
 msgstr "Set di caratteri:"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "C_olors"
 msgstr "C_olori"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Controlla l'ortografia durante la digitazione"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Controllo nuova posta"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Colore per errori di ortografia:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Composizione messaggio"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12565,277 +12660,278 @@ msgstr ""
 "\n"
 "Cliccare su \"Fine\" per salvare le impostazioni."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Pr_edefinito"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Comportamento predefinito"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Codice dei caratteri predefinito:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Cancellazione posta"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digital IDs..."
 msgstr "ID digitali..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Non citare il messaggio originale"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Non firmare le richieste di riunione (per compatibilità con Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Completato"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "Cartella delle bozze:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Abilita"
 
-#: 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 "Cartelle Email"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "Indirizzo email:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Svuota cestino all'uscita"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Guida agli account di Evolution"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Esegui comando..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Larghezza fissa:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Font Properties"
 msgstr "Proprietà caratteri"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Format messages in _HTML"
 msgstr "Formato Messaggi in _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr "Prendi ID digitale..."
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Evidenzia citazioni con"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "In linea"
 
-#: 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
 msgid "Labels and Colors"
 msgstr "Etichette e colori"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Caricamento immagini"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Configurazione della Posta"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Collocazione della Mailbox"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Compositore messaggio"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Visualizzazione messaggio"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Il messaggio contiene"
+
+#: mail/mail-config.glade.h:76
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Notifica Nuova Posta"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Nota: non verrà richiesta una password fino alla prima connessione"
 
-#: mail/mail-config.glade.h:78
-msgid "On Screen fonts"
-msgstr "Caratteri sullo schermo"
-
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Informazioni Opzionali"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Or_ganization:"
 msgstr "Or_ganizzazione:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr "ID della _chiave PGP/GPG:"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Scegliere un colore"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Segnala l'invio di messaggi con solo destinatari _Bcc"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Printed Fonts"
 msgstr "Caratteri di stampa"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Quote original message"
 msgstr "Cita messaggio originale"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr "Citato"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr "Ri_corda questa password"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:96
 msgid "Re_ply-To:"
 msgstr "Rispondi-a:"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr "Ricezione Email"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:98
 msgid "Receiving _Options"
 msgstr "_Opzioni di Ricezione"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:99
 msgid "Remember this _password"
 msgstr "Ricorda questa _password"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "Informazioni richieste"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:101
 msgid "Restore Defaults"
 msgstr "Ripristina predefiniti"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:103
 msgid "S_ecurity"
 msgstr "Sicur_ezza"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME sicuro (S/MIME)"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr "Seleziona font a larghezza fissa HTML"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr "Seleziona carattere HTML a larghezza fissa per la stampa"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr "Seleziona carattere HTML a larghezza variabile"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr "Seleziona carattere HTML a larghezza variabile per la stampa"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
 msgstr "Invio Email"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "Cartella _messaggi inviati:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "Messaggi Inviati e Bozze"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr "Il ser_ver richiede autenticazione"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Configurazione del Server"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "_Tipo di Server:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:116
 msgid "Shortcuts _type:"
 msgstr "_Tipo scorciatoie:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 msgid "Specify _filename:"
 msgstr "Specifica nome del _file:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr "Controllo ortografico"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Mbox standard per Unix"
 
-#: mail/mail-config.glade.h:118
+#: 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"
@@ -12845,7 +12941,7 @@ msgstr ""
 "firma. Il nome che specificherete avrà solo scopo\n"
 "visivo."
 
-#: mail/mail-config.glade.h:121
+#: 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 "
@@ -12855,7 +12951,7 @@ msgstr ""
 "ortografico e la lingua. L'elenco delle lingue riflette solamente le lingue "
 "di cui si ha il dizionario installato."
 
-#: mail/mail-config.glade.h:123
+#: 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\""
@@ -12863,11 +12959,11 @@ msgstr ""
 "Battere il nome con il quale ci si vuole riferire a questo account.\n"
 "Per esempio: \"Lavoro\" o \"Personale\""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "Larghezza variabile:"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12877,165 +12973,171 @@ msgstr ""
 "\n"
 "Cliccare \"avanti\" per cominciare."
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Aggiungi firma"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Caricare sempre le immagini dalla rete"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Firma _sempre i messaggi in uscita quando viene usato questo account"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Tipo di _Autenticazione: "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "Tipo di _Autenticazione: "
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "Controlla la posta _automaticamente"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "Inserisci _automaticamente immagini delle faccine"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "Emetti un suono quando arriva nuova posta"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "ID del _Certificato:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr "_Chiedi conferma prima di eliminare definitivamente i messaggi"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:146
 msgid "_Default signature:"
 msgstr "Firma pre_definita:"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:147
 msgid "_Defaults"
 msgstr "Pre_definiti"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr "Non notificare l'arrivo _di nuova posta"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:151
 msgid "_Enable"
 msgstr "Abilita"
 
-#: mail/mail-config.glade.h:150
-msgid "_Fixed-width:"
-msgstr "Larghezza _fissa:"
-
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:152
 msgid "_Forward style:"
 msgstr "Stile Inoltra:"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "_Nome e cognome:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr "Posta _HTML"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr "_Identità"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "_Carica le immagini se il mittente è nella rubrica"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "Imposta come _mio account predefinito"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "Segna i _messaggi come letti dopo"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "_Non caricare mai le immagini dalla rete"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr "Suona un file sonoro quando arriva nuova posta"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Chiedere conferma _prima di inviare messaggi HTML a contatti che non li "
 "desiderano"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Segnala l'invio di messaggi senza oggetto"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr "_Ricezione Posta"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "Stile _risposta:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr "_Ripristina predefiniti"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "_Spedizione Posta"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Mostra immagini animate"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "Firme"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "Sand Point"
+
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "Contatto originale:"
+
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "_Usa connessione sicura (SSL):"
 
-#: mail/mail-config.glade.h:174
-msgid "_Variable-width:"
-msgstr "Larghezza _Variabile:"
+#: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:178
 msgid "_every"
 msgstr "_ogni"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr "colore"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "descrizione"
 
@@ -13148,7 +13250,8 @@ msgstr "%s allegato"
 #: 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 "Impossibile interpretare il messaggio MIME.  Viene visualizzato il sorgente."
+msgstr ""
+"Impossibile interpretare il messaggio MIME.  Viene visualizzato il sorgente."
 
 #: mail/mail-format.c:759 mail/message-list.etspec.h:2
 msgid "Date"
@@ -13180,7 +13283,8 @@ msgid "Bcc"
 msgstr "Bcc"
 
 #: mail/mail-format.c:1451
-msgid "This message is digitally signed. Click the lock icon for more information."
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Questo messaggio ha una firma digitale.  Fare click sull'icona per avere "
 "ulteriori informazioni."
@@ -13672,31 +13776,31 @@ msgstr "Più alto"
 msgid "Highest"
 msgstr "Il più alto"
 
-#: 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 "Oggi %I:%M %p"
 
-#: mail/message-list.c:1092
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %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 "%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 "Generazione lista messaggi"
 
@@ -13792,44 +13896,44 @@ msgstr "Scadenza il:"
 msgid "_Flag:"
 msgstr "Segnalazione:"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Scansione delle cartelle sotto %s in \"%s\""
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Scansione delle cartelle al livello della radice in \"%s\""
 
-#: mail/subscribe-dialog.c:331
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Sottoscrivere cartella \"%s\" "
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Annullare sottoscrizione cartella \"%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 "Cartella"
 
-#: mail/subscribe-dialog.c:1356
+#: mail/subscribe-dialog.c:1389
 msgid "Scanning folders..."
 msgstr "Scansione cartelle..."
 
-#: mail/subscribe-dialog.c:1470
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Nessun server è stato selezionato"
 
-#: mail/subscribe-dialog.c:1545
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Prego selezionare un server."
 
-#: mail/subscribe-dialog.glade.h:1 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
@@ -13838,39 +13942,46 @@ msgstr "Prego selezionare un server."
 msgid "Close"
 msgstr "Chiudi"
 
-#: mail/subscribe-dialog.glade.h:2
+#: mail/subscribe-dialog.glade.h:4
 msgid "Manage Subscriptions"
 msgstr "Gestione Iscrizioni"
 
-#: mail/subscribe-dialog.glade.h:3 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Aggiorna Lista"
 
-#: mail/subscribe-dialog.glade.h:4
+#: mail/subscribe-dialog.glade.h:6
 msgid "S_elect server: "
 msgstr "S_eleziona server:"
 
-#: mail/subscribe-dialog.glade.h:5
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "_Iscrizione"
 
-#: mail/subscribe-dialog.glade.h:6
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "_Annulla iscrizione"
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
-msgid "Configuration control for the Evolution Summary."
-msgstr "Controllo configurazione sommario di Evolution."
-
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Configura qui l'aspetto del Sommario di Evolution"
 
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Summary"
+msgstr "Componente del Sommario di Evolution."
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
-msgid "Evolution Summary component."
+#, fuzzy
+msgid "Evolution Summary component"
 msgstr "Componente del Sommario di Evolution."
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Fabbrica per il controllo di configurazione del Sommario di Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 msgid "Summary Preferences"
 msgstr "Preferenze Sommario"
 
@@ -23760,15 +23871,15 @@ msgstr "LIRU:LIML"
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:524
+#: my-evolution/e-summary.c:523
 msgid "Please wait..."
 msgstr "Attendere prego..."
 
-#: 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 "Stampa Sommario"
 
-#: my-evolution/e-summary.c:624
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Stampa Sommario non riuscita"
 
@@ -24960,7 +25071,8 @@ msgstr "Cancella notiziario"
 
 #: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
-msgstr "Quanti giorni contemporaneamente devono essere visualizzati dal calendario?"
+msgstr ""
+"Quanti giorni contemporaneamente devono essere visualizzati dal calendario?"
 
 #: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
@@ -25039,20 +25151,22 @@ msgid "_Weather"
 msgstr "_Meteo"
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configuration control for Evolution folder settings."
-msgstr "Controllo configurazione per le impostazioni cartelle di Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Configure special folders and offline folder behavior here"
 msgstr "Configura qui il comportamento delle cartelle speciali e non in linea"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "La shell di Evolution."
+
 #: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Folder Settings"
-msgstr "Impostazioni Cartella"
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Fabbrica per il controllo di configurazione del Sommario di Evolution."
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "The Evolution shell."
-msgstr "La shell di Evolution."
+msgid "Folder Settings"
+msgstr "Impostazioni Cartella"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25121,40 +25235,7 @@ msgstr ""
 "Si è verificato un errore durante la copia del file in\n"
 "`%s'"
 
-#: shell/e-setup.c:243
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Impossibile creare la directory\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 ""
-"La directory %s\n"
-"non ha i permessi necessari.  Cambiare i permessi in modo\n"
-"che sia leggibile ed eseguibile e riavviare 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 ""
-"È necessario rimuovere il file %s\n"
-"perché Evolution possa funzionare correttamente.\n"
-"Rimuovere questo file e riavviare Evolution."
-
-#: shell/e-setup.c:290
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -25165,7 +25246,7 @@ msgstr ""
 "Spostarla per permettere l'installazione\n"
 "dei file utente di Evolution."
 
-#: shell/e-setup.c:299
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25309,7 +25390,7 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "Crea nuova cartella"
 
-#: 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 "(Senza nome)"
 
@@ -25537,7 +25618,8 @@ msgstr "I nomi di cartelle '.' e '..' sono riservati."
 
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "I tool di GNOME Pilot non sembrano essere installati in questo sistema."
+msgstr ""
+"I tool di GNOME Pilot non sembrano essere installati in questo sistema."
 
 #: shell/e-shell-view-menu.c:97
 #, c-format
@@ -25598,7 +25680,8 @@ msgid "(None)"
 msgstr "(Nessuno)"
 
 #: shell/e-shell-view.c:2091
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution è al momento connesso.  Cliccare questo bottone per "
 "disconnettersi."
@@ -25608,7 +25691,8 @@ msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution si sta disconnettendo."
 
 #: shell/e-shell-view.c:2104
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution è al momento disconnesso.  Cliccare questo bottone per "
 "connettersi."
@@ -25624,12 +25708,12 @@ msgstr ""
 "L'errore del sistema di attivazione è:\n"
 "%s"
 
-#: shell/e-shell.c:738
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Impossibile impostare il local storage --%s"
 
-#: shell/e-shell.c:1799
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25640,19 +25724,19 @@ msgstr ""
 "è inaspettatamente terminato. Sarà necessario uscire e riavviare\n"
 "Evolution prima di poter accedere nuovamente a questi dati."
 
-#: shell/e-shell.c:2064
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Argomenti non validi"
 
-#: shell/e-shell.c:2066
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "Impossibile registrare OAF"
 
-#: shell/e-shell.c:2068
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "Database di Configurazione non trovato"
 
-#: shell/e-shell.c:2070 shell/e-storage.c:572
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Errore generico"
 
@@ -25667,7 +25751,9 @@ msgstr "Nome del Gruppo:"
 #: shell/e-shortcuts-view.c:179
 #, c-format
 msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "Si desidera veramente rimuovere il gruppo \"%s\" dalla barra delle scorciatoie?"
+msgstr ""
+"Si desidera veramente rimuovere il gruppo \"%s\" dalla barra delle "
+"scorciatoie?"
 
 #: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
@@ -25751,7 +25837,8 @@ msgstr "Aprire in una Nuova _Finestra"
 
 #: shell/e-shortcuts-view.c:417
 msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Aprire la cartella relativa a questo collegamento in una nuova finestra"
+msgstr ""
+"Aprire la cartella relativa a questo collegamento in una nuova finestra"
 
 #: shell/e-shortcuts-view.c:420
 msgid "_Rename"
@@ -25888,63 +25975,63 @@ msgstr ""
 "L'errore del sistema di attivazione è:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "Errore CORBA"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Interrotto"
 
-#: shell/evolution-shell-component.c:1171
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Argomento non valido"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "Ha già una shell"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Nessun proprietario"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Non trovato"
 
-#: shell/evolution-shell-component.c:1179
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Tipo non supportato"
 
-#: shell/evolution-shell-component.c:1181
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Schema non supportato"
 
-#: shell/evolution-shell-component.c:1183
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Opreazione non supportata"
 
-#: shell/evolution-shell-component.c:1185
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Errore interno"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Esiste"
 
-#: shell/evolution-shell-component.c:1191
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "URI non valida"
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Ha delle sottocartelle"
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Spazio sul dispositivo esaurito"
 
-#: shell/evolution-shell-component.c:1199
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "La shell precedente è scomparsa"
 
@@ -25964,10 +26051,6 @@ msgstr "Fare click su OK per chiudere queste connessioni e disconnettersi"
 msgid "The following connections are currently active:"
 msgstr "Le seguenti connessioni sono al momento attive;"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "dialog1"
-msgstr "dialogo1"
-
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
 msgstr "C_alendario:"
@@ -26056,7 +26139,8 @@ msgstr ""
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Cliccare \"Importa\" per iniziare l'importazione del file in Evolution. "
+msgstr ""
+"Cliccare \"Importa\" per iniziare l'importazione del file in Evolution. "
 
 #: shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -26104,16 +26188,16 @@ msgstr "Non chiedere di nuovo"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution può importare dati dai seguenti file:"
 
-#: 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 sta ora 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"
@@ -26138,7 +26222,8 @@ msgstr ""
 "Questa versione di Ximian Evolution non è ancora completa. Ci siamo quasi\n"
 "ma alcune caratteristiche sono incomplete o non funzionano correttamente.\n"
 "\n"
-"Se si desidera una versione stabile di Evolution, si raccomanda di disinstallare\n"
+"Se si desidera una versione stabile di Evolution, si raccomanda di "
+"disinstallare\n"
 "questa versione e installare invece la versione %s.\n"
 "\n"
 "Se trovate dei difetti, si prega di segnalarceli su bugzilla.ximian.com.\n"
@@ -26148,7 +26233,7 @@ msgstr ""
 "Speriamo che vi godiate il risultato dei nostri sforzi e attendiamo con\n"
 "ansia i Vostri contributi!\n"
 
-#: shell/main.c:288
+#: shell/main.c:290
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -26156,40 +26241,44 @@ msgstr ""
 "Grazie\n"
 "Il Gruppo Evolution di Ximian\n"
 
-#: shell/main.c:296
+#: shell/main.c:298
 msgid "Don't tell me again"
 msgstr "Non chiedere nuovamente"
 
-#: shell/main.c:385
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Impossibile inizializzare la shell di  Ximian Evolution."
 
-#: shell/main.c:394
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Impossibile inizializzare la shell di  Ximian Evolution: %s"
 
-#: shell/main.c:526
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Disabilita la schermata di avvio"
 
-#: shell/main.c:528
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "Inizia in modalità fuori linea"
 
-#: shell/main.c:530
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "Inizia in modalità in linea"
 
-#: 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 "Inviare l'output del debugging di tutte i componenti ad un file"
 
-#: shell/main.c:535
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr "Forza l'aggiornamento dei file di configurazione da Evolution 1.0.x"
 
-#: shell/main.c:560
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26199,7 +26288,6 @@ msgstr ""
 "  Usa %s --help per ulteriori informazioni.\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 "Impossibile caricare l'indirizzario di default."
@@ -26209,10 +26297,6 @@ msgstr "Impossibile caricare l'indirizzario di default."
 msgid "Input File"
 msgstr "File sorgente"
 
-#: tools/evolution-addressbook-export.c:51
-msgid "Output File"
-msgstr "File di destinazione"
-
 #: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "È necessario fornire un nome di file."
@@ -26241,6 +26325,19 @@ msgstr "Segna allegato come da mostrare in linea per impostazione predefinita."
 msgid "Default subject for the message."
 msgstr "Oggetto predefinito del messaggio."
 
+#. 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 "Impossibile rinominare la cartella '%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 contatto(i) su un'altra cartella..."
@@ -26585,7 +26682,8 @@ msgstr "Dimentica _Password"
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "Dimentica le password archiviate in modo che vengano di nuovo richieste"
+msgstr ""
+"Dimentica le password archiviate in modo che vengano di nuovo richieste"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
@@ -26656,7 +26754,8 @@ msgid "Hide _Read Messages"
 msgstr "Nascondi Messaggi _Letti"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Nascondi i messaggi cancellati piuttosto che visualizzarli attraversati da "
 "una linea"
@@ -26957,7 +27056,8 @@ msgstr "Apre il messaggio selezionato in una nuova finestra"
 
 #: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
-msgstr "Apre il messaggio selezionato in una finestra di composizione per riinviarlo"
+msgstr ""
+"Apre il messaggio selezionato in una finestra di composizione per riinviarlo"
 
 #: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
@@ -27173,7 +27273,8 @@ msgstr "Cifra Messaggio con PGP"
 
 #: ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
-msgstr "Cifra questo messaggio con il proprio Certificato di Crittazione S/MIME"
+msgstr ""
+"Cifra questo messaggio con il proprio Certificato di Crittazione S/MIME"
 
 #: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
@@ -27888,40 +27989,214 @@ msgstr "Trova Ora"
 msgid "_Clear"
 msgstr "Annulla"
 
-#: widgets/misc/e-search-bar.c:839
+#: widgets/misc/e-search-bar.c:833
 msgid "Item ID"
 msgstr "Voce ID"
 
-#: widgets/misc/e-search-bar.c:846
+#: widgets/misc/e-search-bar.c:840
 msgid "Subitem ID"
 msgstr "Sottovoce ID"
 
-#: widgets/misc/e-search-bar.c:853
+#: widgets/misc/e-search-bar.c:847
 msgid "Text"
 msgstr "Testo"
 
-#: widgets/misc/e-search-bar.c:931
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "Annulla"
 
-#: widgets/misc/e-search-bar.c:933
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Trova Ora"
 
 #: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Server Personale della Rubrica"
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Visore di minicard per la rubrica di 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 "Server personale del Calendario; fabbrica del calendario"
+#, fuzzy
+msgid "Evolution Calendar local file backend"
+msgstr "Visore iTip/iMip del calendario di Evolution"
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Visore di minicard per la rubrica di Evolution"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Fabbrica per importare i file LDIF in Evolution."
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Importa file LDIF in Evolution."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Fabbrica per importare i file VCard in Evolution."
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Importa i file VCard in Evolution."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "Un controllo di Bonobo per il popup di un indirizzo."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Un controllo di Bonobo per visualizzare un indirizzo."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Un semplice controllo di Bonobo che visualizza una rubrica."
+
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr ""
+#~ "Controllo configurazione per gli storages della rubrica di Evolution."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Controllo che visualizza una minicard per la rubrica di Evolution."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Componente di Evolution per gestire i contatti."
+
+#~ msgid "Factory for the controls exported by the Evolution Addressbook"
+#~ msgstr "Fabbrica per i controlli esportati dalla rubrica di Evolution."
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr "Fabbrica per l'interfaccia di selezione dei nomi della Rubrica"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Lista di contatti senza nome"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d non mostrati)"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Un controllo Bonobo che visualizza una lista di task."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Un semplice controllo di Bonobo che visualizza un calendario."
+
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Configurazione per il calendario di Evolution."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Componente di Evolution per gestire il calendario."
+
+#~ msgid "Factory for the Evolution Calendar objects"
+#~ msgstr "Fabbrica per gli oggetti del calendario di Evolution."
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr ""
+#~ "Fabbrica per centralizzare il componente dell'editor dei dialoghi del "
+#~ "calendario"
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Servizio di notifica dell'avviso sonoro"
+
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Fabbrica per importare i file iCalendar in Evolution."
+
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Importa i file iCalendar in Evolution."
 
-#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:3
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:3
-msgid "Wombat InterfaceCheck interface"
-msgstr "Interfaccia Wombat InterfaceCheck"
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Importa i file VCalendar in Evolution."
+
+#~ msgid "&lt;b&gt;Status:&lt;/b&gt;"
+#~ msgstr "&lt;b&gt;Stato:&lt;/b&gt;"
+
+#~ msgid "&lt;b&gt;Receiving Email&lt;/b&gt;"
+#~ msgstr "&lt;b&gt;Ricezione postal&lt;/b&gt;"
+
+#~ msgid "&lt;b&gt;Sending Email:&lt;/b&gt;"
+#~ msgstr "&lt;b&gt;Spedizione posta:&lt;/b&gt;"
+
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr ""
+#~ "Controlli di configurazione per i font di visualizzazione di Evolution."
+
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr ""
+#~ "Controlli di configurazione per gli account della posta di Evolution."
+
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr ""
+#~ "Controlli di configurazione per il gestore della posta di Evolution."
+
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr ""
+#~ "Controlli di configurazione per il compositore di messaggi di Evolution."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Componente di Evolution per gestire la posta."
+
+#~ msgid "Factory for the controls exported by the Evolution Mailer"
+#~ msgstr ""
+#~ "Fabbrica per i controlli esportati dal gestore della posta di Evolution."
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Fabbrica per importare mbox in Evolution"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importa i file mbox in Evolution"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "Fabbrica per importare le email di Outlook Express 4 in Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importa i file Outlook Express 4 in Evolution"
+
+#~ msgid "On Screen fonts"
+#~ msgstr "Caratteri sullo schermo"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "Larghezza _fissa:"
+
+#~ msgid "_Variable-width:"
+#~ msgstr "Larghezza _Variabile:"
+
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Controllo configurazione sommario di Evolution."
+
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Controllo configurazione per le impostazioni cartelle di Evolution."
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossibile creare la directory\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 ""
+#~ "La directory %s\n"
+#~ "non ha i permessi necessari.  Cambiare i permessi in modo\n"
+#~ "che sia leggibile ed eseguibile e riavviare Evolution."
+
+#~ msgid ""
+#~ "File %s\n"
+#~ "should be removed to allow Evolution to work correctly.\n"
+#~ "Please remove this file and restart Evolution."
+#~ msgstr ""
+#~ "È necessario rimuovere il file %s\n"
+#~ "perché Evolution possa funzionare correttamente.\n"
+#~ "Rimuovere questo file e riavviare Evolution."
+
+#~ msgid "Output File"
+#~ msgstr "File di destinazione"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Server Personale della Rubrica"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "Server personale del Calendario; fabbrica del calendario"
+
+#~ msgid "Wombat InterfaceCheck interface"
+#~ msgstr "Interfaccia Wombat InterfaceCheck"
 
 #~ msgid "Factory for the Addressbook Minicard control"
 #~ msgstr "Fabbrica per il controllo delle minicard per la rubrica"
@@ -27929,9 +28204,6 @@ msgstr "Interfaccia Wombat InterfaceCheck"
 #~ msgid "Factory for the Addressbook's address displayer"
 #~ msgstr "Fabbrica per il visualizzatore di indirizzi della rubrica"
 
-#~ msgid "Factory for the Addressbook's address popup"
-#~ msgstr "Fabbrica per il popup di indirizzi della rubrica"
-
 #~ msgid "Factory for the sample Addressbook control"
 #~ msgstr "Fabbrica per il controllo degli esempi della rubrica"
 
@@ -28306,10 +28578,6 @@ msgstr "Interfaccia Wombat InterfaceCheck"
 #~ msgid "Salve file"
 #~ msgstr "Salva file"
 
-#~ msgid "Factory for Evolution Summary's configuration control."
-#~ msgstr ""
-#~ "Fabbrica per il controllo di configurazione del Sommario di Evolution."
-
 #~ msgid "Marquette"
 #~ msgstr "Marquette"
 
@@ -28388,4 +28656,3 @@ msgstr "Interfaccia Wombat InterfaceCheck"
 
 #~ msgid "init_bonobo(): could not initialize Bonobo"
 #~ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
-
diff --git a/po/ja.po b/po/ja.po
index 604cf0de81..bf9ba6bd8b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS-20010612\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-12-26 15:42+0900\n"
 "Last-Translator: Takuo KITAME <kitame@debian.org>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -15,40 +15,52 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\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 "Evolution �� 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 "Evolution �� 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 "Evolution �� 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 "Evolution �� 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 "�᡼��"
 
 #: 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 "�Ż��� FAX"
@@ -130,13 +144,13 @@ msgid "Bus Fax"
 msgstr "�Ż��� 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 "�Ȥ� FAX"
 
 #: 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 "����¾�� 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 "�ݥ��٥�"
 
 #: 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,294 +317,388 @@ 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: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
 msgid "Unnamed List"
 msgstr "̾���Τʤ��ꥹ��"
 
-#: addressbook/backend/ebook/e-card.c:2683
-msgid "Multiple VCards"
-msgstr "ʣ���� 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 "�ե�͡���"
 
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
-msgstr "%s �� VCard"
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "����(_A):"
+
+#: addressbook/backend/ebook/e-card.c:1328
+#, fuzzy
+msgid "Address Label"
+msgstr "���ɥ쥹������(_A)"
 
-#: 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: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(_R):"
+
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "������"
+
+#: 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 "I"
+
+#: 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 "�ꥹ��̾(_N):"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "�����͹��ʪ�ν���Ǥ�"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 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
 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 "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
-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 ���ɥ쥹Ģ�ߥ˥����ɤ�ɽ�����륳��ȥ�����"
-
-#: 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/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 "Evolution �Υ��ɥ쥹Ģ��̾�����򥤥󥿡��ե�����"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
-msgstr "���ɥ쥹Ģ�ߥ˥����ɥ���ȥ�����Τ���Υե����ȥ�"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+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 "Evolution ���ɥ쥹Ģ�ߥ˥����ɥӥ塼��"
 
-#: 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 "Evolution ���ɥ쥹Ģ�ߥ˥����ɥӥ塼��"
 
-#: 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/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 "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 "Ϣ����"
 
-#: 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
 msgid "Public Contacts"
 msgstr "����Ϣ����"
 
-#: 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 "Ϣ����(_C)"
 
-#: 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 "Ϣ����ꥹ��(_L)"
 
-#: 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 "LDAP �����Ф���³����ޤ���"
 
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 msgid "Failed to authenticate with LDAP server"
 msgstr "LDAP �����Фˤ�����ǧ�ڽ���ޤ���"
 
-#: 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 "(���� Evolution �� SSL �򥵥ݡ��Ȥ��Ƥ��ޤ���)"
-
-#: 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 "(���� Evolution �� SSL �򥵥ݡ��Ȥ��Ƥ��ޤ���)"
 
-#: 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."
@@ -591,7 +706,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"
@@ -602,7 +717,7 @@ msgstr ""
 "�����Ϥ�����, ���뤤�� 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"
@@ -614,7 +729,7 @@ msgstr ""
 "���� OpenLDAP ����������� CVS ����������ץ�������\n"
 "����ѥ��뤷�ʤ���Фʤ�ޤ���\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"
@@ -625,12 +740,15 @@ msgstr ""
 "�����Ϥ�����, ���뤤�� 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 ""
@@ -638,38 +756,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 (user %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"
@@ -677,7 +795,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"
@@ -685,25 +803,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 "�ե�����֥饦����ɽ������ URI"
 
@@ -712,137 +830,124 @@ msgstr "�ե�����֥饦����ɽ������ 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 "(�ʤ�)"
 
-#: 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 "���ѤǤ��륿���פ�����å�(_C)"
 
-#: 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 "��� (_R)"
+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
 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"
@@ -851,75 +956,58 @@ msgid ""
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Connecting"
 msgstr "%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 "����ʤ�"
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "���(_L)"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "�ꥹ��̾(_N):"
 
-#: 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
 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 "����(_I)"
 
-#: 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 "LDAP���ȥ�ӥ塼��"
-
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "LDAP Configuration Assistant"
 msgstr "LDAP ���ꥢ���������"
 
-#: 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"
@@ -929,73 +1017,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 "���֥���ȥ�"
 
-#: 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 "�����ϰ�(_C): "
 
 #. 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 "������..."
 
-#: 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"
@@ -1006,7 +1057,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"
@@ -1015,53 +1066,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 "����������"
 
-#: 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 "����"
 
-#: 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"
@@ -1069,7 +1113,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"
@@ -1078,7 +1122,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"
@@ -1086,17 +1130,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"
@@ -1106,27 +1150,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 "
@@ -1134,7 +1178,7 @@ msgid ""
 "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"
@@ -1142,82 +1186,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
 #, 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 "�ɲ�(_A)"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-msgid "_Add ->"
-msgstr "�ɲ�(_A)->"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-msgid "_Add Mapping"
-msgstr "�ޥåԥ󥰤��ɲ�(_A)"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-msgid "_Add to DN"
-msgstr "DN���ɲ�(_A)"
-
-#: addressbook/gui/component/ldap-config.glade.h:112
-msgid "_Always"
-msgstr "���(_A)"
-
-#: addressbook/gui/component/ldap-config.glade.h:113
-msgid "_Delete Mapping"
-msgstr "�ޥåԥ󥰤���(_D)"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Display name:"
 msgstr "ɽ��̾(_D):"
 
-#: 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 "SSL/TLS ����Ѥ��ʤ�(_D)"
-
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr "���������������(_D):"
 
-#: 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,199 +1234,146 @@ msgstr "���������������(_D):"
 msgid "_Edit"
 msgstr "�Խ�(_E)"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-msgid "_Edit Mapping"
-msgstr "�ޥåԥ󥰤��Խ�(_E)"
-
-#: addressbook/gui/component/ldap-config.glade.h:120
-msgid "_Evolution attribute:"
-msgstr "Evolution ���ȥ�ӥ塼��(_E):"
-
-#: 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 "��������᥽�å�(_L):"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
-msgid "_More Options >>"
-msgstr "�ɲå��ץ����(_M) >>"
-
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Port number:"
 msgstr "�ݡ����ֹ�(_P):"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
-msgid "_Restore Defaults"
-msgstr "���������᤹(_R)"
-
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Search base:"
 msgstr "�����١���(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "������̾(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Timeout (minutes):"
 msgstr "�����ॢ����(ʬ)(_T):"
 
-#: 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
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
 msgstr "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
+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:202
+#: 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: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 "���ƥ���(_C):"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr "�ե����(_F)"
 
-#: 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 "����������Ȥ�̾��(_A):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 #, fuzzy
 msgid "Add_ress..."
 msgstr "����(_A)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr "��ǰ��(_V):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 #, fuzzy
 msgid "Birthda_y:"
 msgstr "������(_B):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#, fuzzy
-msgid "C_ontacts..."
-msgstr "Ϣ����(_C)..."
-
 #: 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)..."
@@ -1430,7 +1384,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 "Ϣ���襨�ǥ���"
 
@@ -1439,7 +1393,7 @@ msgid "D_epartment:"
 msgstr "����(_E):"
 
 #: 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 "�ܺ�"
 
@@ -1482,1147 +1436,1196 @@ msgstr "���(_Z):"
 msgid "P_rofession:"
 msgstr "���翦(_P):"
 
-#: 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
 #, fuzzy
 msgid "S_pouse:"
 msgstr "�۶���(_S):"
 
-#: 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 "�����͹��ʪ�ν���Ǥ�"
 
-#: 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 �᡼����������(_H)"
 
-#: 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 "���(_D)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "����(_J):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr "�ޥ͡������̾��(_M):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "�˥å��͡���(_N):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "��̳��(_O):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Public Calendar URL:"
 msgstr "���������� URI:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Web page address:"
 msgstr "�����֥ڡ�����URL(_W):"
 
-#: 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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:170
+#, fuzzy
+msgid "Is New Card"
+msgstr "�˥塼��"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:826
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
+#, fuzzy
+msgid "Writable Fields"
+msgstr "���пͥե������(_F)"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#, fuzzy
+msgid "Changed"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 #, fuzzy
 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 "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 "�᡼��"
 
+#: 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 ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:183
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 #, fuzzy
 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"
@@ -2631,151 +2634,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(_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 "��(_Y):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "����(_A):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr "��(_C):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "���Ȣ(_P):"
 
-#: 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 "͹���ֹ�(_Z):"
 
-#: 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 "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 "̾(_F):"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "��(_L):"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "�ߥɥ�͡���(_M):"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "�ɾ�(��Ĥ�)(_S):"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "�ɾ�(���Ĥ�)(_T):"
 
-#: 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 "�ꥹ��̾(_N):"
 
-#: 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 "���(_R)"
 
-#: 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
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "VCard ����¸"
@@ -2830,264 +2830,285 @@ 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
 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: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 "ʣ���� VCard"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "%s �� 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 "����"
+
+#: 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
 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 "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
 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 "���ߤΥӥ塼"
 
@@ -3095,7 +3116,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,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"
 
@@ -3103,11 +3124,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"
@@ -3175,20 +3196,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 ""
 
-#: 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 "���пͥե������(_F)"
+
+#: 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"
@@ -3203,7 +3265,7 @@ msgstr ""
 "\n"
 "���֥륯��å��򤷤ƿ���Ϣ�����������Ʋ�����"
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 #, fuzzy
 msgid ""
 "\n"
@@ -3216,21 +3278,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 "�����ɤΰ���"
 
@@ -3303,7 +3385,6 @@ msgid "Include:"
 msgstr "�ޤ�:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "��Ĺ"
 
@@ -3323,17 +3404,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 "�ڡ���"
 
@@ -3349,9 +3429,7 @@ msgstr "�ѻ�"
 msgid "Paper source:"
 msgstr "�楽����:"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "��Ĺ"
 
@@ -3411,43 +3489,167 @@ msgstr "�ե����(_F)..."
 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 ""
 "�ѥ����åȤΥ��������ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
@@ -3456,88 +3658,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 ""
 "�ѥ����åȤ� ToDo ���ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-#, fuzzy
-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
 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
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 #, fuzzy
-msgid "Factory for the Evolution Tasks control"
+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 "������ iTip �ӥ塼����ȥ�����Τ���Υե����ȥ�"
-
-#: 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:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message 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:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution ������ iTip/iMip �ӥ塼��"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
-msgid "Factory to create a component editor factory"
-msgstr "Evolution ����ݡ��ͥ�ȥ��ǥ�����������뤿��Υե����ȥ�"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "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 "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
+#, fuzzy
+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
 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 �˥��顼��"
@@ -3559,11 +3750,17 @@ msgstr "���顼����߻��� (ʬ)"
 msgid "_Edit appointment"
 msgstr "���ݥ���Ȥ��Խ�(_E)"
 
-#: 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"
@@ -3575,13 +3772,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
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3598,16 +3789,16 @@ msgstr ""
 "\n"
 "�����ˤ��Υץ�������ư���Ƥ褤�Ǥ���?"
 
-#: 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 "���顼�����Υ����ӥ��ե����ȥ���������ޤ���Ǥ���"
 
@@ -3623,36 +3814,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 "%Yǯ%m��%d�� %A"
 
 #. 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 "%m/%d (%a)"
 
-#: 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 "%Y/%m/%d (%a)"
 
-#: 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ǯ%m��%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 "%m��%d��"
 
@@ -3662,67 +3853,158 @@ msgid ""
 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
+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 "�ե������ ToDo ���ܤ�ޤ�"
+
+#: calendar/gui/calendar-component.c:85
+msgid "Public Tasks"
+msgstr "����������"
+
+#: calendar/gui/calendar-component.c:86
+msgid "Public folder containing to-do items"
+msgstr "�����ե������ ToDo ���ܤ�ޤ�Ǥ��ޤ�"
+
+#: calendar/gui/calendar-component.c:730
+msgid "New appointment"
+msgstr "�������ݥ����"
+
+#: calendar/gui/calendar-component.c:730
+msgid "_Appointment"
+msgstr "���ݥ����(_A)"
+
+#: 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 "�ߡ��ƥ���(_M)"
+
+#: 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 "������(_T)"
+
+#: 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 "�������ݥ����(_A)"
+
+#: 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"
@@ -3733,335 +4015,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
-msgid "Public Calendar"
-msgstr "����������"
-
-#: calendar/gui/component-factory.c:77
-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 "�ե������ ToDo ���ܤ�ޤ�"
-
-#: calendar/gui/component-factory.c:86
-msgid "Public Tasks"
-msgstr "����������"
-
-#: calendar/gui/component-factory.c:87
-msgid "Public folder containing to-do items"
-msgstr "�����ե������ ToDo ���ܤ�ޤ�Ǥ��ޤ�"
-
-#: calendar/gui/component-factory.c:750
-msgid "New appointment"
-msgstr "�������ݥ����"
-
-#: calendar/gui/component-factory.c:750
-msgid "_Appointment"
-msgstr "���ݥ����(_A)"
-
-#: calendar/gui/component-factory.c:751
-msgid "Create a new appointment"
-msgstr "�������ݥ���Ȥ�������ޤ�"
-
-#: calendar/gui/component-factory.c:755
-msgid "New meeting"
-msgstr "�����ߡ��ƥ���"
-
-#: calendar/gui/component-factory.c:755
-msgid "_Meeting"
-msgstr "�ߡ��ƥ���(_M)"
-
-#: calendar/gui/component-factory.c:756
-msgid "Create a new meeting request"
-msgstr "�����ߡ��ƥ����׵����"
-
-#: calendar/gui/component-factory.c:760
-msgid "New task"
-msgstr "����������"
-
-#: calendar/gui/component-factory.c:760
-msgid "_Task"
-msgstr "������(_T)"
-
-#: calendar/gui/component-factory.c:761
-msgid "Create a new task"
-msgstr "������������������ޤ�"
-
-#: calendar/gui/component-factory.c:765
+#: calendar/gui/comp-editor-factory.c:456
 #, 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 "�������ݥ����(_A)"
+#: 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
-#, fuzzy
-msgid ""
-"Evolution does not yet support email notification for reminders.  You will "
-"not be able to edit the options for this reminder."
-msgstr ""
-"����� e�᡼�� ��ޥ�����Ǥ�����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: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 "���λ��˥᡼�����������:"
-
-#: 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"
@@ -4072,46 +4174,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 "���λ��˥᡼�����������:"
+
+#: 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 "���ץ����(_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: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 "���ݥ���Ȥγ���"
 
@@ -4135,7 +4254,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 "�ٹ�"
 
@@ -4160,7 +4279,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 "������"
 
@@ -4173,7 +4293,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 "������"
 
@@ -4182,7 +4303,8 @@ msgid "S_un"
 msgstr "��(_U)"
 
 #: 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 "������"
 
@@ -4195,7 +4317,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "���եʥӥ������ǽ��ֹ��ɽ��(_N)"
 
 #: 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 "������"
 
@@ -4212,7 +4335,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 "������"
 
@@ -4229,7 +4353,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 "������"
 
@@ -4238,7 +4363,8 @@ msgid "W_eek starts:"
 msgstr "���������(_E):"
 
 #: 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 "������"
 
@@ -4280,7 +4406,7 @@ msgid "_Fri"
 msgstr "��(_F)"
 
 #: 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)"
 
@@ -4320,153 +4446,157 @@ msgstr "��(_W)"
 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 ""
 
-#: 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 "̤�ΤΥ��顼: %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
 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
 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 ""
 
@@ -4524,87 +4654,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 "���ϻ���(_S):"
+
+#: 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 "�����Υ��٥��(_L)"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "�ӥ���(_U)"
 
-#: 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 "��̩(_F)"
 
-#: 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 "�ե꡼(_R)"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr "���(_O):"
 
-#: 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 "��Ū(_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 "��Ū(_B)"
 
-#: 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 "���ޥ�(_M):"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "Ϣ����(_C)..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "�����(_E):"
@@ -4613,19 +4756,23 @@ msgstr "�����(_E):"
 msgid "_Start time:"
 msgstr "���ϻ���(_S):"
 
-#: 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 "��Ǥ��(_D)..."
 
@@ -4665,16 +4812,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
@@ -4682,13 +4824,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:"
@@ -4699,106 +4834,86 @@ msgid "_Change Organizer"
 msgstr "��żԤ��ѹ�(_C)"
 
 #: 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 "¾�ξ���(_I)..."
 
-#: 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
-msgid "th"
-msgstr " "
+#: calendar/gui/dialogs/recur-comp.c:72
+msgid "This Instance Only"
+msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:629
+#: 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 "���٤Ƥξ��(_L)"
+
+#: 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 "����¾�� FAX"
 
-#: 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 "�����"
 
@@ -4862,23 +4977,28 @@ 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
 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
@@ -4889,42 +5009,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 "ͥ����(_P):"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "���ơ�����(_S):"
 
-#: 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 "����:"
 
@@ -4932,140 +5050,237 @@ msgstr "����:"
 msgid "Sta_rt Date:"
 msgstr "������(_R):"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "Ϣ����(_C)..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "����(_D):"
 
-#: 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 "���λ��˥᡼�����������:"
+
+#: 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
 #, 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
 #, fuzzy
 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 "����(_O)"
 
-#: 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 "����(_P)..."
 
-#: 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 "�ڼ��(_U)"
 
-#: 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)"
 
-#: 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 "Ž���դ�(_P)"
 
-#: 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 "iCalender�Ȥ���ž��(_C)"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "��λ�Ȥ��ƥޡ���(_M)"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:965
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "��������λ�Ȥ��ƥޡ���(_M)"
 
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "���򤷤�����������(_D)"
 
-#: 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 "���������ɲä���ˤϤ����򥯥�å�"
@@ -5074,8 +5289,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 "��λ���ޤ���"
 
@@ -5104,8 +5319,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 "���ޥ�"
 
@@ -5113,19 +5328,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 "%Y/%m/%d (%a) %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 "%Y/%m/%d (%a) %p %I:%M:%S"
 
@@ -5140,483 +5351,562 @@ 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 "%B %d %A"
 
 #. 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 "����"
 
 #. 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 "�������ݥ����(_A)"
 
-#: 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 "�����ذ�ư(_T)"
 
-#: 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 "�������ذ�ư(_G)..."
 
-#: 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 "����/¿˻ ����θ���(_P)"
 
-#: 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 "����(_S)..."
 
-#: 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)..."
 
-#: 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 "�ߡ��ƥ��󥰤Υ������塼��(_S)..."
 
-#: 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 "iCalender�Ȥ���ž��(_F)..."
 
-#: 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)"
 
-#: 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 "����������(_O)"
 
-#: 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 "���٤Ƥν��������(_A)"
 
-#: calendar/gui/e-itip-control.c:615
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Yes. (Complex Recurrence)"
+msgstr "ñ��ʷ����֤�(_S)"
+
+#: 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 "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 "���(_H)"
+
+#: 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
 msgid "<b>Ends:</b> "
 msgstr "<b>��λ:</b>"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:851
 msgid "<b>Completed:</b> "
 msgstr "<b>���:</b>"
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr "<b>����:</b>"
 
-#: 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 ����:"
 
 #. Title
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr "iCalendar ���顼"
 
-#: 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 "<i>�ʤ�</i>"
 
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "���:"
 
-#: 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
 #, 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
 #, fuzzy
 msgid "Choose an action:"
 msgstr "��������������"
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:1146
 #, fuzzy
 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
 #, fuzzy
 msgid "Accept"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:1175
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "����"
 
-#: calendar/gui/e-itip-control.c:957
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Decline"
 msgstr "���ष��"
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:1200
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy, 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
 #, fuzzy, 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
 #, fuzzy, 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
 #, fuzzy, 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
 #, fuzzy, 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
 #, fuzzy, 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
 #, fuzzy, 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
 #, fuzzy, 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 "<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
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "�ե�����Dz�����ǽ�ʥ��顼��ȯ�������褦�Ǥ�"
 
-#: 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
 #, fuzzy
 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 "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 "`%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
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "���������ե�����Ϲ����Ǥ��ޤ���Ǥ���!\n"
 
-#: 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 ""
 
-#: 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 "�ե����������"
@@ -5658,223 +5948,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 "%Yǯ %m�� %d�� %A"
 
 #. 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 "%Y/%m/%d (%a)"
 
 #. 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 "���ե����γ�"
 
-#: 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 "���ץ����(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "�Ż���λ��֤���ɽ��(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "�̾�����ɽ��(_Z)"
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "�ե꡼/�ӥ��� �ι���(_U)"
 
-#: 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 "��ư�ԥå����å�(_A)"
 
-#: 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 "���٤Ƥο͡��ȥ꥽����(_A)"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "���٤Ƥο͡��ȤҤȤĤΥ꥽����(_P)"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "�͡���ɬ��(_R)"
 
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "�͡��ȤҤȤĤΥ꥽������ɬ��(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:654
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "��ij��ϻ���(_S):"
 
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "��Ľ�λ����(_E):"
 
-#: 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 �򥪡��ץ���"
 
-#: 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 "�������ݥ����(_A)..."
 
-#: 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 "���顼��"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5882,7 +6176,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"
@@ -5890,7 +6184,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 "�ե���� %s �򥪡��ץ���"
@@ -5956,328 +6250,185 @@ msgstr "10 ��"
 msgid "September"
 msgstr "9 ��"
 
-#: 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 "����������"
 
-#: 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 "����������"
 
-#: 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 "���ץ����"
 
-#: 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 "����/¿˻ ����"
 
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:394
 #, fuzzy
 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
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "����/¿˻ ����"
 
-#: calendar/gui/itip-utils.c:598
+#: calendar/gui/itip-utils.c:525
 #, fuzzy
 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 "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 "���򤷤����� [%Y/%m/%d (%a)]"
 
-#: 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 "%m/%d (%a)"
 
-#: calendar/gui/print.c:1889
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr "%Y/%d (%a)"
 
-#: 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 "%Y/%b/%d (%a)"
 
-#: 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 "���򤷤��� (%Y/%b)"
 
 #. 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
 #, fuzzy
 msgid "Task"
 msgstr "������(_T)"
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2326
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "���ơ�����(_S):"
 
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "ͥ����(_P):"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2358
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "���:"
 
-#: 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"
 "��̳ʬ��: "
 
-#: calendar/gui/print.c:2375
+#: calendar/gui/print.c:2395
 #, fuzzy
 msgid "Contacts: "
 msgstr "Ϣ����(_N):"
 
-#: 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
-#, fuzzy
-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 "
@@ -6290,96 +6441,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 ""
-"`%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: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 "Evolution �� 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 "Evolution �� 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 "Evolution �� 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"
@@ -6388,11 +6497,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 ""
@@ -8112,30 +8225,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 "����å���ǥ��쥯�ȥ�򳫤����Ȥ�����ޤ���Ǥ���: %s"
@@ -8169,87 +8292,94 @@ msgstr "�ե���� '%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 "��å������Υ���å���˼��Ԥ��ޤ��� %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 "���ס���ե�����򳫤����Ȥ�����ޤ���"
 
-#: 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 "������ %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"
@@ -8258,7 +8388,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"
@@ -8267,11 +8397,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 "̤�ΤΥإå��ǥ������¹Ԥ��Ƥ��ޤ�: %s"
@@ -8300,7 +8430,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"
@@ -8308,72 +8438,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"
@@ -8398,24 +8529,23 @@ 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 "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 "flock(2)��Ȥä����å��˼��Ԥ��ޤ���: %s"
@@ -8425,51 +8555,51 @@ msgstr "flock(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 "Movemail �ץ������ϼ��Ԥ��ޤ���: %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"
@@ -8486,28 +8616,28 @@ 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 ������ɽ���ޤ���Ǥ���: �⥸�塼��Υ����ɤ����������Ƥ��ޤ���"
@@ -8563,11 +8693,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."
@@ -8575,39 +8705,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 "Ĺ�����ޤ� (2048�Х��Ȱʾ�Ǥ�)\n"
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr "̵���Ǥ�\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 "�����С���Ԥ�̵���� \"�ݸ��ʼ�\" �ȡ������ޤ�Ǥ��ޤ�\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 "���ݡ��Ȥ��줿���̤�����å�(_C)"
+
+#: 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"
@@ -8616,11 +8822,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"
@@ -8669,7 +8870,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 "����ɽ�����Խ��˼���: %s: %s"
@@ -8689,37 +8890,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: ̤�Τ���ͳ�Ǥ�"
@@ -8732,12 +8933,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"
@@ -8746,179 +8947,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"
@@ -8927,15 +9128,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"
@@ -8953,7 +9154,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"
@@ -8968,35 +9169,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' ����Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
@@ -9011,40 +9212,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"
@@ -9067,52 +9268,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 "IMAP �����Ф���ͽ�����ʤ� OK ����������ޤ���: %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"
@@ -9121,24 +9322,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 �����˥�å��������Τ��դ��뤳�Ȥ�����ޤ���Ǥ���"
 
@@ -9168,7 +9369,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 "�ե����"
 
@@ -9198,7 +9399,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 "�ѥ����"
 
@@ -9217,62 +9418,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 %s@%s �� IMAP �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: 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"
@@ -9283,24 +9483,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
 #, 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 "̤�ΤΥ��顼: %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 ""
 
@@ -9378,8 +9578,8 @@ msgid ""
 msgstr "ɸ�� mbox �ե�����ˤ˥�������᡼�����¸���ɤ߽Ф�"
 
 #: 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 �����Хѥ��ǤϤ���ޤ���"
@@ -9391,36 +9591,36 @@ msgstr "��¸���줿�롼�� %s ���̾�Υǥ��쥯�ȥ�ǤϤ���ޤ���"
 
 #: 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 "��������᡼��ե����� %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 ""
@@ -9431,7 +9631,7 @@ msgstr ""
 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 "���ޥ�إ�å��������ɲä��뤳�Ȥ�����ޤ���: ̤�Τ���ͳ�Ǥ�"
 
@@ -9445,14 +9645,14 @@ msgstr "��å����� %d �Ǽ��Ԥ��ޤ���"
 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"
@@ -9464,14 +9664,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"
@@ -9486,71 +9686,71 @@ 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' ����������ޤ���Ǥ���: %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 "maildir �ǥ��쥯�ȥ�ѥ��򳫤����Ȥ�����ޤ���: %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
 #, fuzzy
 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"
@@ -9559,11 +9759,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 "�ե�����Dz�����ǽ�ʥ��顼��ȯ�������褦�Ǥ�"
 
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "��å������β��˼��Ԥ��ޤ���: �ְ�ä��᡼��ܥå����Ǥ���?"
 
@@ -9606,75 +9806,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"
@@ -9694,67 +9894,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 "���ס���ե�����ϥ�͡���Ǥ��ޤ���"
 
-#: 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 ���̾�Υǥ��쥯�ȥ�ǤϤ���ޤ���"
 
-#: 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 "���ס���᡼��ե����� %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 "���ס���ե�����ϥ�͡���Ǥ��ޤ���"
 
-#: 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 "�ƥ�ݥ��ե������Ʊ������ޤ���Ǥ��� %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 "���ס���ե������Ʊ������ޤ���Ǥ��� %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 ""
@@ -9833,45 +10033,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 "�����ʹ߿�"
@@ -9889,7 +10089,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"
 
@@ -9915,27 +10115,27 @@ 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 "%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 "%s �� POP �����Ф���³����ޤ���Ǥ���"
 
-#: 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 "
@@ -9944,28 +10144,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 %s@%s �� POP3 �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: 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"
@@ -9974,13 +10174,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"
 
@@ -9991,51 +10191,51 @@ msgid ""
 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 "sendmail �� fork ����ޤ���Ǥ���: %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"
 
@@ -10043,140 +10243,140 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "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 "�׵ᤵ�줿�᡼���ư���OK, ��λ���ޤ���"
 
-#: 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 "�׵ᤵ�줿�᡼���ư��ϴ�λ���ޤ���: �᡼��ܥå��������ѤǤ��ޤ���"
 
-#: 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 "�桼���ϥ�������ǤϤ���ޤ���; <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 "�׵ᤵ�줿ư��ϴ�λ���ޤ���: �᡼��ܥå���̾��ǧ����ޤ���"
 
-#: 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
 #, 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 %s@%s �� SMTP �ѥ���ɤ����Ϥ��Ƥ�������"
@@ -10206,11 +10406,11 @@ msgstr "%s ��ͳ�� SMTP �᡼����ۿ����ޤ�"
 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 "��å���������������ޤ���: �����Ԥ��������Ƥ��ޤ���"
 
@@ -10219,63 +10419,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 ""
 
-#: 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 �׵�Υ����ॢ����: %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 "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 ""
 
-#: 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: �᡼����������ޤ���Ǥ���"
@@ -10283,82 +10483,82 @@ 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
 #, 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 ""
 "DATA �����Υ����ॢ����: ��å������ν�λ: %s: �᡼����������ޤ���Ǥ���"
 
-#: 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 "RSET �׵�Υ����ॢ����: %s"
 
-#: 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 ��ź�դǤ��ޤ���: �̾�Υե�����ǤϤ���ޤ���"
@@ -10376,11 +10576,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 "���ɥ쥹Ģ�Τ���ˤ����ǥ���å�"
 
@@ -10391,45 +10595,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."
@@ -10440,27 +10644,28 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:447
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "�ݡ����ֹ�(_P):"
 
-#: 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"
@@ -10469,34 +10674,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"
@@ -10505,7 +10706,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"
@@ -10514,7 +10715,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"
@@ -10523,7 +10733,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?"
@@ -10531,7 +10741,7 @@ msgstr ""
 "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"
@@ -10542,34 +10752,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
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10580,7 +10795,7 @@ msgstr ""
 "�᡼�륳��ݡ��ͥ�Ȥˤޤ���������Ƥ��ʤ�����\n"
 "��å���������������ɥ���������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: composer/e-msg-composer.c:2879
+#: composer/e-msg-composer.c:2991
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10589,25 +10804,12 @@ msgstr ""
 "�᡼�륳��ݡ��ͥ�Ȥˤޤ���������Ƥ��ʤ�����\n"
 "��å���������������ɥ���������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: 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 ""
-"�᡼�륳��ݡ��ͥ�Ȥˤޤ���������Ƥ��ʤ�����\n"
-"��å���������������ɥ���������뤳�Ȥ�����ޤ���Ǥ���"
-
-#: 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 "Evolution ���롼�ץ�������������"
@@ -10656,8 +10858,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 "<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"
+msgstr ""
+
+#: e-util/e-dialog-utils.c:247
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10665,214 +10970,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 "%Y/%m/%d (%a) %p %I:%M"
 
 #. 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 "%Y/%m/%d (%a) %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 "%Y/%m/%d (%a) %p %I"
 
 #. 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 "%Y/%m/%d (%a) %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 %p %I:%M:%S"
 
 #. 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 %p %I:%M"
 
 #. 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 %p %I"
 
 #. 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 "%p %I:%M:%S"
 
 #. 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 "%p %I:%M"
 
 #. 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 "%p %I"
 
-#: 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:75
-msgid "month"
-msgstr "��"
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d ����"
 
-#: filter/filter-datespec.c:75 filter/filter.glade.h:23
-msgid "months"
+#: 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: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:76
-msgid "year"
-msgstr "ǯ"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr " ��"
 
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
-msgid "years"
-msgstr "ǯ"
+#: filter/filter-datespec.c:71
+msgid "1 year ago"
+msgstr ""
 
-#: filter/filter-datespec.c:174
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr " ��"
+
+#: 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 "%Y/%m/%d (%a)"
 
-#. 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 "���ס���`%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"
@@ -10881,75 +11212,73 @@ 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
 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 "To Do"
 
 #. 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
 #, 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 "����"
 
@@ -11001,7 +11330,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 "���ۥե����"
 
@@ -11013,6 +11342,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 "����ե��������"
@@ -11030,6 +11367,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 "���٤Ƥ�ͭ���ʥ�⡼�ȥե����"
@@ -11042,6 +11383,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
 #, fuzzy
@@ -11173,7 +11518,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 ""
 
@@ -11201,7 +11546,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 "�����Ѥ�"
 
@@ -11232,12 +11577,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 "������"
 
@@ -11273,8 +11618,9 @@ msgstr "�����Τ�Τdz��Ϥ���"
 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 "��̾"
 
@@ -11282,68 +11628,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 "���β��ۥե������̾�������ꤷ�Ƥ�������"
 
-#: 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 "���ۥե�����Υ�����"
+
+#: 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?"
@@ -11351,7 +11713,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 ""
 
@@ -11363,12 +11725,12 @@ msgstr ""
 "Evolution �� GnomeCard �ե������ȯ�����ޤ���\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"
@@ -11383,7 +11745,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"
@@ -11391,7 +11753,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"
@@ -11400,37 +11762,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 ""
 
 #. 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
 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?"
@@ -11438,11 +11802,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 ""
 
-#: 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?"
@@ -11450,402 +11814,394 @@ 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 "Evolution �᡼��¹ԥ��ޥꥳ��ݡ��ͥ��"
+#: 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 "Evolutgion �᡼��ե�����ե����ȥꥳ��ݡ��ͥ��"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "�᡼������Υ��󥿡��ե�����"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
+#: 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.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
-msgstr "�᡼�륵�ޥꥳ��ݡ��ͥ�ȤΤ���Υե����ȥ�"
+#: 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
 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 "��å�������᡼��(_M)"
 
-#: 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 "�ݥ��ȥ�å�����(_P)"
 
-#: 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 "Evolution �᡼�륳��ݡ��ͥ�Ȥν����������ޤ���"
-
-#: mail/component-factory.c:1087
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Evolution �᡼�����ꥳ��ݡ��ͥ�Ȥν����������ޤ���"
-
-#: mail/component-factory.c:1093
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Evolution �ե�������󥳥�ݡ��ͥ�Ȥν����������ޤ���"
-
-#: 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 "\"%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 ""
 
-#: 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
 msgid "Create _Virtual Folder From Search..."
 msgstr "�������鲾�ۥե���������(_V)..."
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "��̾�β��ۥե����(_S)"
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "�����Ԥβ��ۥե����(_N)"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "�����Ԥβ��ۥե����(_R)"
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����(_L)"
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "��̾�Υե��륿(_J)"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "�����ԤΥե��륿(_D)"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "�����ԤΥե��륿(_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)"
 
-#: 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 "����(_P)"
 
-#: 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 "�����Ԥ��ֿ�(_R)"
 
-#: 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 "�ꥹ�Ȥ��ֿ�(_L)"
 
-#: 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 "�������ֿ�(_A)"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "ž��(_F)"
 
-#: 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 "�����ѤߤȤ��ƥޡ���(_K)"
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1777
 msgid "Mark as _Unread"
 msgstr "̤�ɤȤ��ƥޡ���(_U)"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "���פȤ��ƥޡ���(_I)"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1779
 msgid "_Mark as Unimportant"
 msgstr "����פȤ��ƥޡ���(_M)"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1784
 msgid "U_ndelete"
 msgstr "������(_N)"
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1788
 msgid "Mo_ve to Folder..."
 msgstr "�ե�����ذ�ư(_V)..."
 
-#: 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)..."
 
-#: 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 "��å���������롼������(_L)"
 
-#: 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 "Evolution �� mbox �򥤥�ݡ��Ȥ���ե����ȥ�"
+#: 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 "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_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Evolution �� mbox �ե�����򥤥�ݡ���"
+#: 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 "Evolution �� Outlook Express 4 �᡼��򥤥�ݡ��Ȥ���ե����ȥ�"
+#: 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 "Evolution �� Outlook Express 4 �ե�����򥤥�ݡ���"
+#: 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:"
@@ -11882,98 +12238,98 @@ 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 "�ۥ���(_H):"
 
-#: 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 "�桼��̾(_N):"
 
-#: 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 "�ѥ�(_P):"
 
-#: mail/mail-account-gui.c:1847
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr "Ʊ��̾���Υ�������Ȥ�2�ĺ����Ǥ��ޤ���"
 
-#: 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 "���������̾(_A):"
 
-#: 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 "%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 "%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"
@@ -11981,7 +12337,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"
@@ -11993,7 +12354,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."
@@ -12001,7 +12371,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."
@@ -12010,17 +12380,17 @@ 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?"
@@ -12028,28 +12398,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?"
@@ -12057,28 +12427,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 "%Yǯ%m��%d��(%a)��%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."
@@ -12086,7 +12456,7 @@ msgstr ""
 "�ɥ�եȥե���������¸���줿\n"
 "��å������������Խ����뤳�Ȥ�����ޤ�"
 
-#: mail/mail-callbacks.c:2445
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12094,42 +12464,46 @@ msgstr ""
 "�����ե�����Υ�å���������\n"
 "���������뤳�Ȥ�����ޤ�"
 
-#: 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:2584
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"%s�Ϥ��Ǥ�¸�ߤ��ޤ�\n"
+"�����˾�񤭤��ޤ���?"
+
+#: 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 ""
@@ -12138,7 +12512,7 @@ msgstr ""
 "\n"
 "�����ˤ����Υ�å�������õ�ޤ���?"
 
-#: mail/mail-callbacks.c:3018
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12147,64 +12521,64 @@ 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 ""
-
-#: 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 ��å��������̥�����ɥ��dz����Ƥ��������Ǥ���?"
 
-#: 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 "��̾(_S)"
 
-#: 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
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -12215,7 +12589,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 "�᡼�����(_R)"
+
+#: mail/mail-config-druid.c:390
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -12224,11 +12603,16 @@ 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 "�᡼������(_S)"
+
+#: mail/mail-config-druid.c:402
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -12238,7 +12622,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, "
@@ -12252,148 +12640,131 @@ msgstr ""
 "�ʲ��ˤ��Υ�������Ȥ�̾�������Ϥ��Ƥ�������������̾����ɽ����Ū������\n"
 "���Ѥ���ޤ���"
 
-#. set window title
-#: mail/mail-config-druid.c:637
-msgid "Evolution Account Assistant"
-msgstr "Evolution��������ȥ����������"
-
-#: mail/mail-config.c:622
-#, fuzzy, 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 "���ѤǤ��륿���פ�����å�(_C)"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(���� Evolution �� SSL �򥵥ݡ��Ȥ��Ƥ��ޤ���)"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(���� Evolution �� SSL �򥵥ݡ��Ȥ��Ƥ��ޤ���)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�(_L)"
 
-#: 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
 #, 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
 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)�����(_B):"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "��˥����ܥ󥳥ԡ�(Cc)�����(_C):"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "�Ź沽����Ȥ���ʬ�Υ�����󥰤θ��Ͼ�˿��Ѥ���(_T)"
 
-#: 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 "��ưŪ�˥�󥯤򸡽Ф���(_D)"
 
-#: 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 "ʸ�����å�(_H): %s"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "C_olors"
 msgstr "��(_O)"
 
-#: 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 "���������¤ο�"
 
-#: 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"
@@ -12402,272 +12773,269 @@ msgstr ""
 "\n"
 "\"��λ\" �򥯥�å������������¸���Ƥ�������"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "�ǥե����(_F)"
 
-#: 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 "�ǥե���ȤΥ���饯�����󥳡��ǥ���(_E):"
 
-#: 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 "�ǥ����� ID..."
 
-#: 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 "��ƥե����(_F):"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "ͭ��(_N)"
 
-#: 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 "�Żҥ᡼�륢�������"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "�Żҥ᡼�륢�ɥ쥹(_A):"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "��λ���˥���Ȣ����ˤ���(_T)"
 
-#: mail/mail-config.glade.h:54
+#: 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:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "������(_X):"
 
-#: 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 "HTML�ǥ�å�����������(_H)"
 
-#: 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
 msgid "Highlight _quotations with"
 msgstr "���ο��ǰ��Ѥ�Ĵ����(_q)"
 
-#: 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
 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
+#: 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 "���(_G):"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG���� ID(_K):"
 
-#: 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 "�������� Bcc �������ꤵ��Ƥ��ʤ������Τ餻��(_O)"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "�ץ�ƥ����åɥץ饤�Х���(PGP/GPG)"
 
-#: 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 "Qmail maildir "
 
-#: 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 "���Υѥ���ɤ򵭲�(_M)"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "Re_ply-To:"
 msgstr "�ֿ���(_P):"
 
-#: 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 "�������ץ����(_O)"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "Remember this _password"
 msgstr "���Υѥ���ɤ򵭲�(_P)"
 
-#: 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 "�������ƥ�(_E)"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "�����奢 MIME (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 "�᡼���������"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "�����ѥ�å������ե����(_M):"
 
-#: 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 "�����Ф�ǧ�ڤ�ɬ��(_V)"
 
-#: 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 "�������(_T):"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "Shortcuts _type:"
 msgstr "���硼�ȥ��åȥ�����(_T):"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "Specify _filename:"
 msgstr "�ե�����̾�����(_F):"
 
-#: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
-msgstr "���ڥ�����å�����"
-
 #: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr "���ڥ�����å�(_C)"
@@ -12704,10 +13072,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 �᡼�����ꥢ��������Ȥؤ褦����\n"
 "\n"
@@ -12774,102 +13143,109 @@ msgid "_Enable"
 msgstr "ͭ��(_E)"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr "������(_F):"
-
-#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "ž����������(_F):"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "�ե�͡���(_F):"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr "HTML �᡼��(_H)"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr "�桼������(_I)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "�����Ԥ����ɥ쥹Ģ�ˤ�����������ɤ߹���(_L)"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "���Υ�������Ȥ��������ꤹ��(_M)"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "���λ��ַв᤹��ȥ�å����������Ѥߤˤ���(_M):"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "̾��(_N):"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "������ͥåȤ����ɤ߹��ޤʤ�(_N)"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr "����᡼�������Dz����Ĥ餹(_P)"
 
-#: 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 "HTML �᡼���˾��Ǥ��ʤ������ HTML �᡼���������������Τ餻��(_P)"
+msgstr ""
+"HTML �᡼���˾��Ǥ��ʤ������ HTML �᡼���������������Τ餻��(_P)"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "�������˷�̾�����ξ����Τ餻��(_P)"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr "�᡼�����(_R)"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "�ֿ���������(_R):"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr "���������᤹(_R)"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "������ץ�(_S):"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "�᡼������(_S)"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "���˥᡼����������ɽ��(_S)"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "��̾(_S)"
 
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "ɸ��Ū�� UNIX �� mbox �ե�����"
+
 #: mail/mail-config.glade.h:175
-msgid "_Use secure connection (SSL):"
-msgstr "�������ƥ����ݸ�줿��³(SSL)�����(_U):"
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "����Ϣ����:"
 
 #: mail/mail-config.glade.h:176
-msgid "_Variable-width:"
-msgstr "������:"
+msgid "_Use secure connection (SSL):"
+msgstr "�������ƥ����ݸ�줿��³(SSL)�����(_U):"
 
 #: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
 msgid "_every"
 msgstr "�ֳ�(_E)"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "����"
 
@@ -12893,184 +13269,186 @@ msgstr "S/MIME ����٥����ץ���ƥ����Ȥ��������ޤ���Ǥ���"
 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
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "��ȥե����������Ǥ��ޤ���Ǥ��� '%s': %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 "%s �˳���..."
 
-#: mail/mail-display.c:494
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "����饤��ɽ�� (%s��ͳ)"
 
-#: 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
 #, fuzzy
 msgid "Overdue:"
 msgstr "���¤�᤮�������ƥ�(_O)"
 
-#: mail/mail-display.c:1787
+#: mail/mail-display.c:1883
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%m�� %d�� %p %l:%M"
 
-#: 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 "%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
 #, fuzzy
 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
 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 "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 ""
 
-#: 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\" ������) ��ؤ��Ƥ��ޤ�"
 
-#: 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"
@@ -13079,12 +13457,12 @@ msgstr ""
 "�ե�����Υ᥿�������¸����ޤ���; ��Ϥ䤳�Υե�����򳫤�\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 ����¸�Ǥ��ޤ���: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "�ե�����Υ᥿�ǡ��� %s �������뤳�Ȥ�����ޤ���: %s"
@@ -13094,7 +13472,7 @@ msgstr "�ե�����Υ᥿�ǡ��� %s �������뤳�Ȥ�����ޤ���: %s"
 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."
@@ -13102,12 +13480,12 @@ msgstr ""
 "�⤷���Υ᡼��ܥå����򳫤����ȤϤʤ��ʤ�\n"
 "��ư�Dz���������ɬ�פ����뤫�⤷��ޤ���"
 
-#: 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 "��������ե�����ʳ��η������ѹ��Ǥ��ޤ���"
 
@@ -13129,108 +13507,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"
@@ -13239,7 +13617,7 @@ msgstr ""
 "���ϥե�������������ޤ���: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13248,11 +13626,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"
@@ -13261,54 +13639,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 "����(_S)"
-
-#: 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 "����:"
 
@@ -13316,68 +13694,64 @@ 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 ""
 
-#: 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 "���Υѥ���ɤ򵭲�(_R)"
-
-#: 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 "%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 "���Υѥ���ɤ򵭲�(_R)"
+
+#: mail/mail-session.c:281
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-signature-editor.c:80
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "��̾�ե��������¸����ޤ���Ǥ���: %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"
@@ -13387,42 +13761,50 @@ 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
 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 "��å�������ž�����ޤ��� - %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 "���ۥե�����������: %s"
 
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "URI �β��ۥե�����򹹿���: %s"
 
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13431,98 +13813,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 "�ե����"
 
-#: 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 "%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 "������ %p %l:%M"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "������ %p %l:%M"
 
-#: mail/message-list.c:1094
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "%p %l:%M (%a)"
 
-#: mail/message-list.c:1102
+#: mail/message-list.c:1116
 msgid "%b %d %l:%M %p"
 msgstr "%m�� %d�� %p %l:%M"
 
-#: mail/message-list.c:1104
+#: mail/message-list.c:1118
 msgid "%b %d %Y"
 msgstr "%Yǯ %m�� %d��"
 
-#: mail/message-list.c:2568
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "��å������ꥹ�Ȥ������"
 
@@ -13555,43 +13937,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 ""
 
@@ -13621,53 +14003,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 "4 ��"
-
 #: 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
@@ -13678,66 +14051,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 "����(_S)"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "���ɲ��(_U)"
 
-#: 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 "�᡼�륵�ޥꥳ��ݡ��ͥ�ȤΤ���Υե����ȥ�"
+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
 msgid "Summary Preferences"
 msgstr "���ޥ�����"
 
@@ -17499,7 +17853,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 "�����"
 
@@ -19334,6478 +19688,6469 @@ 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
 #, fuzzy
 msgid "Marshall"
 msgstr "3 ��"
 
-#: 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 "����"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "̤�ɤȤ��ƥޡ���(_N)"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Martinsburg"
 msgstr "�ޡ�����"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsville"
 msgstr "�ޡ�����"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Massena"
 msgstr "�ޥ��ɥ˥�"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 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 "�ޥ͡�����"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mayaguez"
 msgstr "�ޥ͡�����"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayport"
 msgstr "����ݡ���"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mazatlan"
 msgstr "�����ե�����"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 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
 #, fuzzy
 msgid "McCall"
 msgstr "�ޥ�"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCarthy"
 msgstr "3 ��"
 
-#: 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 "���"
 
-#: 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 "�ޥ���"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Merced"
 msgstr "�᡼�ȥ�ˡ(_E)"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 #, fuzzy
 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
 #, fuzzy
 msgid "Merril Field"
 msgstr "���пͥե������(_F)"
 
-#: 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 "�ᥭ����"
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 #, fuzzy
 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
 #, fuzzy
 msgid "Middle East"
 msgstr "�ߥɥ�͡���(_M):"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 #, fuzzy
 msgid "Middleton Island"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 #, fuzzy
 msgid "Middletown"
 msgstr "�ߥɥ�͡���(_M):"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 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
 #, fuzzy
 msgid "Miles City"
 msgstr "�ե��������:"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 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 "%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 ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, 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 "����:"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 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 "��"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 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
 #, fuzzy
 msgid "Mobridge"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 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 "��ư"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Molde"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Monclova"
 msgstr "��ʥ�"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Moncton"
 msgstr "��ʥ�"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 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
 #, fuzzy
 msgid "Monroe"
 msgstr "��ʥ�"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Montague"
 msgstr "�ޥ͡�����"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 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
 #, fuzzy
 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 "��"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 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 "��"
 
-#: 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 "��ʥ�"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Morelia"
 msgstr "��󥴥�"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morgantown"
 msgstr "���"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Mount Shasta"
 msgstr "����"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Muncie"
 msgstr "6 ��"
 
-#: 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 "�������ȥꥢ"
 
-#: 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 "�Ż�"
 
-#: 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
 #, 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 "�С��졼��"
 
-#: 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 "̾��"
 
-#: 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 "�ٹ�"
 
-#: 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 "����"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Naples"
 msgstr "̾��"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Napoli"
 msgstr "�ޥ�"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 #, fuzzy
 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
 #, fuzzy
 msgid "Natal"
 msgstr "�����ꥢ"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 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 "����������"
 
-#: 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 "����ʥ�"
 
-#: 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 "����ʥ�"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 #, fuzzy
 msgid "Newark"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "New Bedford"
 msgstr "�˥塼���ե�����"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 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
 #, fuzzy
 msgid "Newcastle"
 msgstr "�˥塼��"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "�˥塼��������"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 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
 #, fuzzy
 msgid "New Haven"
 msgstr "�˥塼����ɥ˥�"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Iberia"
 msgstr "�˥塼����ɥ˥�"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Jersey"
 msgstr "����"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Mexico"
 msgstr "�ᥭ����"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Newton"
 msgstr "�˥塼��"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 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
 #, fuzzy
 msgid "Nimes-Garons"
 msgstr "��ˡ:"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nipawin"
 msgstr "���ڥ���"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 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 "����"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nome"
 msgstr "̾��"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 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
 #, fuzzy
 msgid "Norrkoping"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "North Adams"
 msgstr "����"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 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
 #, fuzzy
 msgid "North Conway"
 msgstr "�Υ륦����"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 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
 #, fuzzy
 msgid "North Platte"
 msgstr "����"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "Northway"
 msgstr "�Υ륦����"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "����"
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 #, fuzzy
 msgid "Norwich"
 msgstr "��"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwood"
 msgstr "�Υ륦����"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Oelwen"
 msgstr "����"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Okushiri Island"
 msgstr "�ѥС�������"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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 "���ޡ���"
 
-#: 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 "OK"
 
-#: 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 "����"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Oostende"
 msgstr "���ʼ�"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 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 "���"
 
-#: 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 "���"
 
-#: 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 "���꡼�����"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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 "��"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 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 "�ڡ���"
 
-#: 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 "�ݥ��٥�"
 
-#: 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 "�ݥ��٥�"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 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
 #, fuzzy
 msgid "Pamplona"
 msgstr "���⥢����"
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 #, fuzzy
 msgid "Panama City"
 msgstr "�ѥʥ�"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Pantelleria"
 msgstr "����󥻥뤷�ޤ���"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Papa"
 msgstr "����"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Paphos"
 msgstr "�饪��"
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Paysandu"
 msgstr "������"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Payson"
 msgstr "���ڤ����:"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Pellston"
 msgstr "����"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pelotas"
 msgstr "���ɹ���"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Perth"
 msgstr "�ڥ롼"
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Point Hope"
 msgstr "ɽ������"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Lay"
 msgstr "���ޥ�����"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Ponca City"
 msgstr "���åꥹ��"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Poprad"
 msgstr "�ݡ�����"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Porterville"
 msgstr "�ץ�ӥ塼"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Port Hardy"
 msgstr "�����ɤΰ���"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 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
 #, fuzzy
 msgid "Portland"
 msgstr "�ݡ�����"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Porto"
 msgstr "�ݡ����ֹ�(_P):"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 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 "��Ĺ"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Poznan"
 msgstr "�ݡ�����"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Praha"
 msgstr "����Ȣ"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 #, fuzzy
 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 "�����ץ�ӥ塼"
 
-#: 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 "��Ĺ"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 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 "����"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Providence"
 msgstr "�ץ�ӥ塼�ڥ���(_P)"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Provincetown"
 msgstr "�ץ�ӥ塼"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 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
 #, fuzzy
 msgid "Puebla"
 msgstr "����"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 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 "����"
 
-#: 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 "���ޥ�����"
 
-#: 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 "�ݡ�����"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Quantico"
 msgstr "����"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 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
 #, fuzzy
 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 "��"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Redding"
 msgstr "����"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redig"
 msgstr "�����Ѥ�"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Rennes"
 msgstr "��¥��"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Reno"
 msgstr "���"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 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
 #, fuzzy
 msgid "Reus"
 msgstr "�롼��"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 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
 #, fuzzy
 msgid "Reynosa"
 msgstr "���ɹ���"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Rhinelander"
 msgstr "�ե������"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhode Island"
 msgstr "�¤κ�"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 #, fuzzy
 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 "�˥å��͡���"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rieti"
 msgstr "�ϥ���"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rifle"
 msgstr "���"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rijeka"
 msgstr "�����Ѥ�"
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1880
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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 "��٥ꥢ"
 
-#: 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 "�����Ѥ�"
 
-#: 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 "�롼�ޥ˥�"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1898
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Rodos"
 msgstr "����"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rogers"
 msgstr "�ե����"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1907
 #, fuzzy
 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 "���������"
 
-#: 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 "�饸��"
 
-#: 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 "���"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1920
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Russia"
 msgstr "�������ȥꥢ"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1929
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Saiq"
 msgstr "���ڥ���"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1947
 #, fuzzy
 msgid "Salalah"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1948
 #, fuzzy
 msgid "Salem"
 msgstr "��¸"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1949
 #, fuzzy
 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
 #, fuzzy
 msgid "Salina"
 msgstr "���ޥꥢ"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1952
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Salto"
 msgstr "��(_S)"
 
-#: 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 "���⥢����"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samos"
 msgstr "���⥢����"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samsun"
 msgstr "��(_N)"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1966
 #, fuzzy
 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 "��¸�����Ĥ���"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "Sandane"
 msgstr "��"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandberg"
 msgstr "������"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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 "��¸�����Ĥ���"
 
-#: 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 "��������"
 
-#: 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 "���ޥꥢ"
 
-#: 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 "������"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
 #, fuzzy
 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
 #, fuzzy
 msgid "Santorini"
 msgstr "����"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2019
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Sayun"
 msgstr "��(_N)"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2038
 #, fuzzy
 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 "���"
 
-#: 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 "����"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Sedalia"
 msgstr "���ޥꥢ"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2048
 #, fuzzy
 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
 #, fuzzy
 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 "����"
 
-#: 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 "�������ǥ���"
 
-#: 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 "����"
 
-#: 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 "������"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Shawbury"
 msgstr "������"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2065
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Shoreham"
 msgstr "��Ͽ"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2079
 #, fuzzy
 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
 #, 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 "�������ƥ�"
 
-#: 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 "������"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skopje"
 msgstr "���"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skwentna"
 msgstr "������"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Slana"
 msgstr "����Х˥�"
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2102
 #, fuzzy
 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
 #, fuzzy
 msgid "Snowshoe Lake"
 msgstr "�ˤ狼��"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2105
 #, fuzzy
 msgid "Sochi"
 msgstr "��"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Socorro"
 msgstr "��Ͽ"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Socotra"
 msgstr "��Ͽ"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2108
 #, fuzzy
 msgid "Soda Springs"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2109
 #, fuzzy
 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 "�ˤ狼��"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
 #, fuzzy
 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 "����"
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "South Bend"
 msgstr "��"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Carolina"
 msgstr "��եꥫ"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
 #, fuzzy
 msgid "South Dakota"
 msgstr "����"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2121
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Split"
 msgstr "̸"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2129
 #, fuzzy
 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 "����"
 
-#: 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 "���:"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2135
 #, fuzzy
 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
 #, fuzzy
 msgid "Staverton"
 msgstr "����"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2139
 #, fuzzy
 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
 #, fuzzy
 msgid "Stephenville"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2143
 #, fuzzy
 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
 #, fuzzy
 msgid "St Joseph"
 msgstr "���"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2148
 #, fuzzy
 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
 #, fuzzy
 msgid "Storm Lake"
 msgstr "������"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Stornoway"
 msgstr "�Υ륦����"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2157
 #, fuzzy
 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
 #, fuzzy
 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 "������"
 
-#: 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 "��Ͽ"
 
-#: 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 "���ޥ�"
 
-#: 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 "��(_N)"
 
-#: 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 "����"
 
-#: 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 "������(_T)"
 
-#: 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 "�ޥ���"
 
-#: 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 "����"
 
-#: 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 " ����"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Tainan"
 msgstr " ����"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2203
 #, fuzzy
 msgid "Taiyuan"
 msgstr " ����"
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiz"
 msgstr " ����"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2205
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Taos"
 msgstr "�饪��"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2220
 #, fuzzy
 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
 #, fuzzy
 msgid "Taranto"
 msgstr " ����"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Tarbes"
 msgstr "������(_T)"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2224
 #, fuzzy
 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 "����"
 
-#: 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 "�ƥ�å���"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2234
 #, fuzzy
 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
 #, fuzzy
 msgid "Texas"
 msgstr "������(_T)"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2243
 #, fuzzy
 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 "�ɾ�(���Ĥ�)"
 
-#: 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 "������"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Tianjin"
 msgstr " ����"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2251
 #, fuzzy
 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
 #, fuzzy
 msgid "Tirana"
 msgstr " ����"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2255
 #, fuzzy
 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
 #, fuzzy
 msgid "Titusville"
 msgstr "�ɾ�(���Ĥ�)"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2259
 #, fuzzy
 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
 #, fuzzy
 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 "���ؤ�"
 
-#: 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 "�ȥ�"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2273
 #, fuzzy
 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
 #, fuzzy
 msgid "Torp"
 msgstr "��:"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torrance"
 msgstr "�ե��"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torreon"
 msgstr "�ڹ��"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "����ݡ��ȳ���"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2282
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Trelew"
 msgstr "�ƥ�å���"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trenton"
 msgstr "����"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Tulcea"
 msgstr "������"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulsa"
 msgstr "������"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tupelo"
 msgstr "��(_U)"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Turaif"
 msgstr "�ȥ륳��"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turin"
 msgstr "�ȥ륳��"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2319
 #, fuzzy
 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
 #, fuzzy
 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 "����"
 
-#: 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 "��(_U)"
 
-#: 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 "����ꥫ�罰��"
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2341
 #, fuzzy
 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
 #, fuzzy
 msgid "Uruapan"
 msgstr "����"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2344
 #, fuzzy
 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
 #, 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 "�饸��"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2353
 #, fuzzy
 msgid "Vaerlose"
 msgstr "�ѿ�"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2354
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Valencia"
 msgstr "������"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2359
 #, fuzzy
 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 "�ޥ͡�����"
 
-#: 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 "����󥻥�"
 
-#: 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 "�Х�Хɥ�"
 
-#: 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 "�ѿ�"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2374
 #, fuzzy
 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
 #, fuzzy
 msgid "Venezia"
 msgstr "�٥ͥ�����"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2378
 #, fuzzy
 msgid "Venice"
 msgstr "Unicode"
 
-#: 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 "��"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2382
 #, fuzzy
 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
 #, fuzzy
 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 "�ե�����̾:"
 
-#: 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 "�������ȥ�ꥢ"
 
-#: 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 "�ե������"
 
-#: 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 "���"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volk Field"
 msgstr "���пͥե������(_F)"
 
-#: 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 "��ʥ�"
 
-#: 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 "���������"
 
-#: 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 "�ٹ�"
 
-#: 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 "��ŷ��"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterloo"
 msgstr "��ŷ��"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Watertown"
 msgstr "��ŷ��"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2431
 #, fuzzy
 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 "�����֥�����"
 
-#: 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 "��ŷ��"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2440
 #, fuzzy
 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
 #, fuzzy
 msgid "West Burke"
 msgstr "����"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "Westerland"
 msgstr "������"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
 #, fuzzy
 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
 #, fuzzy
 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 "�˥å��͡���"
 
-#: 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 "̸"
 
-#: 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
 #, fuzzy
 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 "��"
 
-#: 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 "�ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: 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 "�ߥ����ͥ���"
 
-#: 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 "���"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Wooster"
 msgstr "�եå�:"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Worcester"
 msgstr "�ʱ�"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worland"
 msgstr "�ݡ�����"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2490
 #, fuzzy
 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
 #, fuzzy
 msgid "Wyoming"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2495
 #, fuzzy
 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
 #, fuzzy
 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 "�������"
 
-#: 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 "������"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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 "%B%d��%l��%Mʬ"
 
-#: my-evolution/e-summary-calendar.c:438
+#: my-evolution/e-summary-calendar.c:425
 #, fuzzy
 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 "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 "�ɲ�(_D)"
 
-#: 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
 #, fuzzy
 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 "%Yǯ%B%e�� %A"
 
-#: my-evolution/e-summary.c:504
+#: my-evolution/e-summary.c:523
 #, fuzzy
 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 "������������ݡ��ͥ�Ȥ� Bonobo �������Ǥ��ޤ���Ǥ���\n"
-
-#: 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 "�ݻ�"
 
-#: 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 "�ޥ���"
 
-#: 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 "���٤DZ�"
 
-#: 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 "���٤DZ�̸"
 
-#: 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 "���٤DZ�"
 
-#: 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
 #, fuzzy
 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 "���٤Dzл���"
 
-#: 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
 #, fuzzy
 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 "�ˤ狼�˲л���"
 
-#: 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
 #, fuzzy
 msgid "Spray"
 msgstr "���"
 
-#: my-evolution/metar.c:353
+#: my-evolution/metar.c:354
 #, fuzzy
 msgid "Spray in the vicinity"
 msgstr "���٤ǿ��"
 
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
 #, fuzzy
 msgid "Light spray"
 msgstr "�夤���"
 
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
 #, fuzzy
 msgid "Moderate spray"
 msgstr "�¤ο��"
 
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
 #, fuzzy
 msgid "Heavy spray"
 msgstr "�������"
 
-#: my-evolution/metar.c:357
+#: my-evolution/metar.c:358
 #, fuzzy
 msgid "Shallow spray"
 msgstr "�������"
 
-#: my-evolution/metar.c:358
+#: my-evolution/metar.c:359
 #, fuzzy
 msgid "Patches of spray"
 msgstr "�꡹���"
 
-#: my-evolution/metar.c:359
+#: my-evolution/metar.c:360
 #, fuzzy
 msgid "Partial spray"
 msgstr "�������"
 
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
 #, fuzzy
 msgid "Blowing spray"
 msgstr "�᤭�Ĥ�����"
 
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
 #, fuzzy
 msgid "Drifting spray"
 msgstr "�᤭�󤻤���"
 
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
 #, fuzzy
 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 ""
 
@@ -25904,32 +26249,33 @@ msgstr "�������塼��(_S)"
 msgid "_Weather"
 msgstr "��ŷ��(_W)"
 
-#: 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 "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
 msgid "Folder Settings"
 msgstr "�ե��������"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "The Evolution shell."
-msgstr "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"
@@ -25938,56 +26284,40 @@ 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
 #, fuzzy
 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 "����"
 
-#: 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 ""
-"���� Evolution �ο������С������Ϥ��ʤ��Υѡ����ʥ� Evolution\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"
@@ -25998,7 +26328,7 @@ msgstr ""
 "\n"
 "���顼: %s"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -26007,33 +26337,7 @@ msgstr ""
 "�ե������ `%s' �إ��ԡ����\n"
 "���顼��ȯ�����ޤ���"
 
-#: shell/e-setup.c:282
-#, fuzzy, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"�ǥ��쥯�ȥ� %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"
@@ -26044,21 +26348,7 @@ msgstr ""
 "Evolution �桼���ե�����Υ��󥹥ȡ����\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 ""
-"Evolution �ϸŤ� Evolution-Summary\n"
-"�ǥ��쥯�ȥ�򸡽Ф��ޤ���\n"
-"����� Evolution ��ư�������\n"
-"�������ɬ�פ�����ޤ�\n"
-"���Υǥ��쥯�ȥ�������ޤ���?"
-
-#: shell/e-setup.c:368
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -26073,23 +26363,23 @@ 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
 msgid "Offline Folders"
 msgstr "���ե饤��ե����"
 
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 msgid "Autocompletion Folders"
 msgstr "��ư�䴰�ե����"
 
@@ -26098,42 +26388,42 @@ msgstr "��ư�䴰�ե����"
 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: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"
@@ -26142,17 +26432,17 @@ 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 "�ե�����������ޤ� '%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"
@@ -26161,26 +26451,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"
@@ -26189,7 +26479,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"
@@ -26198,24 +26488,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 "�����ե���������(_N)..."
 
-#: 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"
@@ -26229,11 +26515,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"
@@ -26242,23 +26528,23 @@ 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
 #, 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"
@@ -26267,11 +26553,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"
@@ -26280,17 +26566,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"
@@ -26299,221 +26585,223 @@ 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"
 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 "�ե����������"
 
-#: 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 "�ե������Ʊ����"
 
-#: 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
 #, fuzzy, 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 "����������"
+
+#: 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
-#, fuzzy, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr "Evolution �᡼�륦�������ɥ��󥿡��ե������ν����������ޤ���"
-
-#: shell/e-shell-startup-wizard.c:169
-#, fuzzy
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "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 "����"
 
-#: 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
+#: shell/e-shell-utils.c:129
+#, fuzzy
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "���Υե�����ˤϥ�å������Ϥ���ޤ���"
+
+#: shell/e-shell-utils.c:135
 #, fuzzy
-msgid "Folder name cannot contain slashes."
+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 "%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
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Ximian 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
 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 "����饤����(_W)"
 
-#: 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 "���ե饤����(_W)"
 
-#: 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 "(�ʤ�)"
 
-#: 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 �ϸ��ߥ���饤��Ǥ������ե饤��ˤ���ˤϤ��Υܥ���򥯥��"
 "�����Ƥ�������"
 
-#: 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 �ϥ��ե饤�������Ǥ�"
 
-#: 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 ""
@@ -26528,12 +26816,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: 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"
@@ -26541,150 +26829,144 @@ 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 "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 "��������������(_S)"
 
-#: 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 "�礭����������(_L)"
 
-#: 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 "�������롼��(_N)..."
 
-#: 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 "���Υ��롼�פ���(_R)..."
 
-#: 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 "���Υ��롼�פ��͡���(_N)..."
 
-#: 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 "���硼�ȥ��åȥС��򱣤�(_H)"
 
-#: 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 "����������ɥ��dz���(_W)"
 
-#: 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 "���Υ��硼�ȥ��åȤ˥�󥯤��줿�ե�����򿷤���������ɥ��dz���"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr "��͡���(_R)"
 
-#: 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 "���(_M)"
 
-#: 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 "���硼�ȥ��å�"
 
@@ -26692,74 +26974,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 "I/O ���顼"
 
-#: 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 "%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 "%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 "<�ե���������򤹤뤿��ˤ����򥯥�å����Ƥ�������>"
 
@@ -26789,95 +27071,92 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1145
+#: shell/evolution-shell-component.c:1182
 #, fuzzy
 msgid "CORBA error"
 msgstr "I/O ���顼"
 
-#: 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 "�����ʰ����Ǥ�"
 
-#: 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 "����"
 
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1192
 #, fuzzy
 msgid "Not found"
 msgstr "�����ɤ����Ĥ���ޤ���"
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1194
 #, fuzzy
 msgid "Unsupported type"
 msgstr "���ݡ��Ȥ��줿���̤�����å�(_C)"
 
-#: 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 "�桼���ˤ�ä����򥭥�󥻥뤵��ޤ���"
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1200
 #, fuzzy
 msgid "Internal error"
 msgstr "����¾�Υ��顼"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1204
 #, fuzzy
 msgid "Exists"
 msgstr "��¸�ߤ���"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1206
 #, fuzzy
 msgid "Invalid URI"
 msgstr "����"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1210
 #, fuzzy
 msgid "Has subfolders"
 msgstr "���Τ褦�ʥե���� %s �Ϥ���ޤ���"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1212
 #, fuzzy
 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 ""
 
-#: 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 ""
 
@@ -26897,15 +27176,15 @@ msgstr "�᡼��(_M):"
 msgid "_Tasks:"
 msgstr "������(_T)"
 
-#: 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 "�ե������������������ꤷ�Ƥ�������:"
 
@@ -26925,37 +27204,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 "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
 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
@@ -26994,41 +27273,42 @@ msgstr ""
 "���Υ���������ȤǤ� Evolution ����˳����ե�����򥤥�ݡ���\n"
 "����������̤��ư��⤷�ޤ�"
 
-#: 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
 #, 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"
@@ -27049,76 +27329,111 @@ msgstr ""
 "�桹�Ϥ��ʤ����桹�����̤�ڤ��ळ�Ȥ�˾��Ǥ��ޤ��������Ʋ桹��\n"
 "Ǯ���ˤ��ʤ��ι׸����Ԥ������Ƥ��ޤ�!\n"
 
-#: shell/main.c:250
+#: shell/main.c:290
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian 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
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution ������˥��������Ǥ��ޤ���"
 
-#: shell/main.c:403
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution ������ν�������Ǥ��ޤ���: %s"
 
-#: 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 "���ե饤��⡼�ɤdz���"
 
-#: shell/main.c:489
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "����饤��⡼�ɤdz���"
 
-#: 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
 #, fuzzy
 msgid "Error loading default addressbook."
 msgstr "�ե�����Υ�������˥��顼: %s"
 
-#: 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
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "�̤Υե������Ϣ����򥳥ԡ�..."
@@ -27208,7 +27523,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)"
 
@@ -27326,7 +27641,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 "��¸"
 
@@ -27353,7 +27668,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)"
 
@@ -27606,7 +27921,7 @@ msgstr "��å������ꥹ�Ȥ򥹥�åɲ����ޤ�"
 msgid "_Expunge"
 msgstr "�������(_E)"
 
-#: 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)"
 
@@ -27870,7 +28185,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
@@ -28027,7 +28342,7 @@ msgstr "����(_Q)"
 msgid "_Resend..."
 msgstr "������(_R)"
 
-#: 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)"
 
@@ -28042,12 +28357,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)"
 
@@ -28055,6 +28370,10 @@ msgstr "ɽ��(_V)"
 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 "���ߤΥե�������Ĥ��ޤ�"
@@ -28226,7 +28545,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)"
 
@@ -28413,127 +28732,117 @@ msgstr "Pilot ������(_M)..."
 
 #: ui/evolution.xml.h:27
 #, fuzzy
-msgid "Pilot Con_duit Settings..."
-msgstr "Pilot ������(_M)..."
-
-#: ui/evolution.xml.h:28
-#, fuzzy
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "�����ե���������(_N)..."
 
-#: 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 "�᡼�������"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "�᡼�������"
 
-#: 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 "�Զ���������(_B)"
 
-#: 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 "Ximian Evolution FAQ(_F)"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 msgid "_About Ximian Evolution..."
 msgstr "Ximian Evolution �ˤĤ���(_A)..."
 
-#: 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 "�ե�����С�(_F)"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 #, fuzzy
 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 "����ݡ���..."
 
-#: 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 "¾�Υ桼�����Υե��������(_R)"
 
-#: 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 "���硼�ȥ��åȥС�(_S)"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 msgid "_Shortcut..."
 msgstr "���硼�ȥ��å�(_S)..."
 
@@ -28609,9 +28918,8 @@ msgstr "���ƥ����(_C)"
 msgid "_Tasks"
 msgstr "������(_T)"
 
-#. 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"
 
@@ -28637,21 +28945,21 @@ msgstr ""
 "����\n"
 "�ޥ����α��ܥ���ǽ̾����ޤ���"
 
-#: widgets/menus/gal-view-menus.c:295
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr "���ߤ�ɽ��(_C)"
 
 #. 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 "���ߤ�ɽ��(_C)"
 
-#: 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 "ɽ�������"
 
@@ -28662,19 +28970,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 "%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 "��"
 
-#: 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"
@@ -28683,81 +28991,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 "���3��"
 
-#: 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 "Unicode"
 
-#: 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 "���󥳡��ǥ���"
 
@@ -28765,11 +29073,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 "��������¸"
 
@@ -28788,66 +29097,562 @@ 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 "����(_S)"
 
-#: 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 "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 "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 "Evolution �� LDIF �ե�����򥤥�ݡ��Ȥ���ե����ȥ�"
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Evolution �� LDIF �ե�����򥤥�ݡ���"
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Evolution �� VCard �ե�����򥤥�ݡ��Ȥ���ե����ȥ�"
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Evolution �� VCard �ե�����򥤥�ݡ���"
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "���ɥ쥹��ݥåץ��åפ��뤿��� Bonobo ����ȥ�����"
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "���ɥ쥹��ɽ�����뤿��� Bonobo ����ȥ�����"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "�ѡ����ʥ륫����������; �������ե����ȥ�"
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "���ɥ쥹Ģ��ɽ������ Bonobo ����ȥ�����Υ���ץ�Ǥ�"
 
-#: wombat/wombat.c:199
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): GNOME-VFS���������뤳�Ȥ�����ޤ���Ǥ���"
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Evolution ���ɥ쥹Ģ�ߥ˥����ɤ�ɽ�����륳��ȥ�����"
 
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): GNOME ���������뤳�Ȥ�����ޤ���Ǥ���"
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Ϣ����򰷤������ Evolution ����ݡ��ͥ��"
 
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
+#~ msgid "Factory for the Addressbook Minicard control"
+#~ msgstr "���ɥ쥹Ģ�ߥ˥����ɥ���ȥ�����Τ���Υե����ȥ�"
+
+#~ msgid "Factory for the Addressbook's address displayer"
+#~ msgstr "���ɥ쥹Ģ�Υ��ɥ쥹ɽ���Τ���Υե����ȥ�"
+
+#~ msgid "Factory for the sample Addressbook control"
+#~ msgstr "����ץ륢�ɥ쥹Ģ����ȥ�����Τ���Υե����ȥ�"
+
+#, fuzzy
+#~ msgid "380"
+#~ msgstr "389"
+
+#, fuzzy
+#~ msgid "<- _Remove"
+#~ msgstr "��� (_R)"
+
+#, fuzzy
+#~ msgid "<< Fewer Options"
+#~ msgstr "���ץ����"
+
+#, fuzzy
+#~ msgid "DN Customization"
+#~ msgstr "����ʤ�"
+
+#, fuzzy
+#~ msgid "Evolution Attribute"
+#~ msgstr "Evolution"
+
+#~ msgid "LDAP Attribute"
+#~ msgstr "LDAP���ȥ�ӥ塼��"
+
+#~ msgid "Mappings"
+#~ msgstr "�ޥåԥ�"
+
+#, fuzzy
+#~ msgid "Select"
+#~ msgstr "���٤�����"
+
+#~ msgid "_Add ->"
+#~ msgstr "�ɲ�(_A)->"
+
+#~ msgid "_Add Mapping"
+#~ msgstr "�ޥåԥ󥰤��ɲ�(_A)"
+
+#~ msgid "_Add to DN"
+#~ msgstr "DN���ɲ�(_A)"
+
+#~ msgid "_Always"
+#~ msgstr "���(_A)"
+
+#~ msgid "_Delete Mapping"
+#~ msgstr "�ޥåԥ󥰤���(_D)"
+
+#~ msgid "_Don't use SSL/TLS"
+#~ msgstr "SSL/TLS ����Ѥ��ʤ�(_D)"
+
+#~ msgid "_Edit Mapping"
+#~ msgstr "�ޥåԥ󥰤��Խ�(_E)"
+
+#~ msgid "_Evolution attribute:"
+#~ msgstr "Evolution ���ȥ�ӥ塼��(_E):"
+
+#~ msgid "_More Options >>"
+#~ msgstr "�ɲå��ץ����(_M) >>"
+
+#~ msgid "_Restore Defaults"
+#~ msgstr "���������᤹(_R)"
+
+#~ msgid "account-druid"
+#~ msgstr "��������ȥɥ륤��"
+
+#~ 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 ����ɽ��)"
+
+#, fuzzy
+#~ msgid "C_ontacts..."
+#~ msgstr "Ϣ����(_C)..."
+
+#~ msgid "Phone Types"
+#~ msgstr "���ü���"
+
+#~ msgid "Delete Contact?"
+#~ msgstr "Ϣ����������ޤ���?"
+
+#, fuzzy
+#~ msgid "Display Cards?"
+#~ msgstr "ɽ��"
+
+#, fuzzy
+#~ msgid "Display Cards"
+#~ msgstr "ɽ��"
+
+#, fuzzy
+#~ 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 ����ݡ��ͥ��"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Tasks control"
+#~ msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
+
+#~ msgid "Factory for the calendar iTip view control"
+#~ msgstr "������ iTip �ӥ塼����ȥ�����Τ���Υե����ȥ�"
+
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr "����ץ륫��������ȥ�����Υե����ȥ�"
+
+#~ msgid "Factory to create a component editor factory"
+#~ msgstr "Evolution ����ݡ��ͥ�ȥ��ǥ�����������뤿��Υե����ȥ�"
+
+#~ msgid "Alarm notification service"
+#~ msgstr "���顼�����Υ����ӥ�"
+
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "GNOME �ν����������ޤ���Ǥ���"
+
+#, fuzzy
+#~ msgid ""
+#~ "Evolution does not yet support email notification for reminders.  You "
+#~ "will not be able to edit the options for this reminder."
+#~ msgstr ""
+#~ "����� e�᡼�� ��ޥ�����Ǥ�����Evolution �Ϥޤ����μ�����󶡤��Ƥ��ޤ�"
+#~ "�󡣤��Υ�ޥ�������Ф��ƤΥ��ץ������Խ����뤳�Ȥ��Ǥ��ޤ���"
+
+#, 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 "Bonobo �ν����������ޤ���Ǥ���"
+
+#~ msgid "Could not create the component editor factory"
+#~ msgstr "���ǥ����ե����ȥꥳ��ݡ��ͥ�Ȥ��������ޤ���Ǥ���"
+
+#~ msgid "Print Calendar"
+#~ msgstr "���������"
+
+#, fuzzy
+#~ 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 ""
+#~ "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' ���ɤ߹����׵��夲���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���; �������ե���"
+#~ "�����饿�����ե�����ذ�ư���륢���ƥब����ޤ���"
+
+#, fuzzy
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Evolution �� VCard �ե�����򥤥�ݡ��Ȥ���ե����ȥ�"
+
+#, fuzzy
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Evolution �� VCard �ե�����򥤥�ݡ���"
+
+#, fuzzy
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Evolution �� 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 "�ٹ�!"
+
+#~ msgid ""
+#~ "Could not create composer window, because you have not yet\n"
+#~ "configured any identities in the mail component."
+#~ msgstr ""
+#~ "�᡼�륳��ݡ��ͥ�Ȥˤޤ���������Ƥ��ʤ�����\n"
+#~ "��å���������������ɥ���������뤳�Ȥ�����ޤ���Ǥ���"
+
+#, 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 "Evolution mail folder factory component."
+#~ msgstr "Evolutgion �᡼��ե�����ե����ȥꥳ��ݡ��ͥ��"
+
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
+
+#~ msgid "Factory for the Mail Summary component."
+#~ msgstr "�᡼�륵�ޥꥳ��ݡ��ͥ�ȤΤ���Υե����ȥ�"
+
+#~ msgid "Warning: Unsent Messages"
+#~ msgstr "�ٹ�: ̤������å�����"
+
+#, fuzzy
+#~ 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 "Factory to import mbox into Evolution"
+#~ msgstr "Evolution �� mbox �򥤥�ݡ��Ȥ���ե����ȥ�"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Evolution �� mbox �ե�����򥤥�ݡ���"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "Evolution �� Outlook Express 4 �᡼��򥤥�ݡ��Ȥ���ե����ȥ�"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Evolution �� Outlook Express 4 �ե�����򥤥�ݡ���"
+
+#~ msgid "Really delete account?"
+#~ msgstr "�����˥�������Ȥ������ޤ���?"
+
+#, fuzzy
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "����̤�ɥ�å�������ɽ�����ޤ�"
+
+#, fuzzy
+#~ msgid "Add Signature"
+#~ msgstr "��̾����¸"
+
+#, fuzzy
+#~ msgid "Account %d"
+#~ msgstr "���������"
+
+#~ msgid "Spell Checking Language"
+#~ msgstr "���ڥ�����å�����"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "������(_F):"
+
+#~ msgid "_Variable-width:"
+#~ msgstr "������:"
+
+#~ msgid "All folders"
+#~ msgstr "���٤ƤΥե����"
+
+#, fuzzy
+#~ msgid "Apri file"
+#~ msgstr "4 ��"
+
+#, 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 "�᡼�륵�ޥꥳ��ݡ��ͥ�ȤΤ���Υե����ȥ�"
+
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "������������ݡ��ͥ�Ȥ� Bonobo �������Ǥ��ޤ���Ǥ���\n"
+
+#, 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 ""
+#~ "���� Evolution �ο������С������Ϥ��ʤ��Υѡ����ʥ� Evolution\n"
+#~ "�ǥ��쥯�ȥ������ղåե�����򥤥󥹥ȡ��뤹��ɬ�פ�����ޤ�"
+
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr "\"OK\" �ǥե�����򥤥󥹥ȡ���, �ޤ��� \"����󥻥�\" �ǽ�λ���ޤ�"
+
+#, fuzzy
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "�ǥ��쥯�ȥ� %s ���������ޤ���:\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 �ϸŤ� Evolution-Summary\n"
+#~ "�ǥ��쥯�ȥ�򸡽Ф��ޤ���\n"
+#~ "����� Evolution ��ư�������\n"
+#~ "�������ɬ�פ�����ޤ�\n"
+#~ "���Υǥ��쥯�ȥ�������ޤ���?"
+
+#~ msgid "New..."
+#~ msgstr "����..."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr "Evolution �᡼�륦�������ɥ��󥿡��ե������ν����������ޤ���"
+
+#, fuzzy
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr "Evolution �᡼�륦�������ɥ��󥿡��ե������ν����������ޤ���"
+
+#~ 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 ������(_M)..."
+
+#, fuzzy
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "�᡼�������"
+
+#~ 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..."
@@ -28883,9 +29688,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "Copy selected messages"
 #~ msgstr "���򤵤줿��å������򥳥ԡ�"
 
-#~ msgid "Cut selected messages"
-#~ msgstr "���򤵤줿��å��������ڤ���"
-
 #, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "��� (_R)"
@@ -28923,9 +29725,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ "����ݡ����ν���������Ƥ��ޤ���\n"
 #~ "5���Ԥäƺ��ٻ�Ƥ�������"
 
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Evolution ����ݡ��ȥ����������"
-
 #, fuzzy
 #~ msgid "_Preferences..."
 #~ msgstr "�����֤��ʤ�(_N)"
@@ -29067,9 +29866,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ "������������å����������դϤɤ�ʻ��֤�\n"
 #~ "�Ф��ƤǤ���Ӥ����Ǥ��礦"
 
-#~ msgid "Evolution News Editor"
-#~ msgstr "Evolution �˥塼�����ǥ���"
-
 #~ msgid "Are you sure you want to delete this news account?"
 #~ msgstr "������ news ��������Ȥ������Ƥ��������Ǥ���?"
 
@@ -29083,9 +29879,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "News Servers"
 #~ msgstr "�˥塼���ե�����(_N)"
 
-#~ msgid "Source"
-#~ msgstr "������"
-
 #~ msgid "Source Information"
 #~ msgstr "����������"
 
@@ -29140,9 +29933,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ "̵�����ԲIJ�ʥȥ졼������:\n"
 #~ "%s"
 
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr "Evolution �������¹ԥ��ޥꥳ��ݡ��ͥ��"
-
 #~ msgid "Factory for the Calendar Summary component."
 #~ msgstr "���������ޥ꡼����ݡ��ͥ�ȤΤ���Υե����ȥ�"
 
@@ -29244,10 +30034,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgstr "�Խ�(_E)"
 
 #, fuzzy
-#~ msgid " New "
-#~ msgstr "�˥塼��"
-
-#, fuzzy
 #~ msgid "Advanced Options"
 #~ msgstr "���򥭥�󥻥�"
 
@@ -29525,9 +30311,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "New Contact _List"
 #~ msgstr "����Ϣ����ꥹ��(_L)"
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "���ɥ쥹Ģ���Խ�"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "���ɥ쥹Ģ���ɲ�"
 
@@ -29766,9 +30549,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
 #~ msgstr "<dd><b>��ŷ�������С�����³�Ǥ��ޤ���Ǥ���</b></dd>"
 
-#~ msgid "Al_l stations:"
-#~ msgstr "���٤Ƥξ��(_L)"
-
 #~ msgid "All _folders:"
 #~ msgstr "���٤ƤΥե����(_F):"
 
@@ -29784,9 +30564,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "(No name)"
 #~ msgstr "(̾���ʤ�)"
 
-#~ msgid "New List"
-#~ msgstr "�����ꥹ��"
-
 #~ msgid "Configure the calendar's settings"
 #~ msgstr "��������������ѹ����ޤ�"
 
diff --git a/po/ko.po b/po/ko.po
index 72e52522de..1225637433 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: $PACKAGE $VERSION\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-09-24 07:36+0900\n"
 "Last-Translator: Young-Ho, Cha <ganadist@mizi.com>\n"
 "Language-Team: GTP Korean <gnome-kr-translation@gnome.or.kr>\n"
@@ -16,40 +16,52 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-KR\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
+#, 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������ Evolution���� �����ɴϴ�"
+#: 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 ""
+#: 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 ������ 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 ""
 
@@ -59,16 +71,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 "����"
 
@@ -78,12 +91,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 "ȸ��"
 
@@ -94,12 +107,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 "����"
@@ -110,18 +124,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 "���� �ѽ�"
@@ -131,13 +145,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"
 
@@ -146,43 +160,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 "�� 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 ""
@@ -193,15 +207,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 "�̸��� 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"
@@ -225,6 +239,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 "�繫��"
@@ -234,6 +249,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 "����"
@@ -248,6 +264,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 ""
@@ -261,6 +278,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 "����"
@@ -270,16 +288,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"
 
@@ -297,311 +318,402 @@ msgid "FBUrl"
 msgstr ""
 
 #: 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 ""
 
-#: 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"
+#: 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
+#, fuzzy
+msgid "Address"
+msgstr "�ּ�(_A):"
+
+#: addressbook/backend/ebook/e-card.c:1328
+#, fuzzy
+msgid "Address Label"
+msgstr "�ּ� ī��(_A)"
+
+#: 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 ""
 
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
+#: 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 "����"
+
+#: addressbook/backend/ebook/e-card.c:1445
+msgid "Free/Busy URL"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "�޷�"
+
+#: 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/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
+#, 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 "ISDN"
+
+#: 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 "��� �̸�(_n):"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "���ڿ��� �ּ�:"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 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 "���ڿ��� �ּ�(_E):"
 
-#: 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 "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 ""
-
-#: 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"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
 msgstr "Evolution �ּҷ� minicard ����"
 
-#: 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 "Evolution �ּҷ� �̸� ���� �������̽�"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution �ּҷ� minicard ����"
 
-#: 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 "Evolution �ּҷ� minicard ����"
 
-#: 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 "Evolution �ּҷ� minicard ����"
 
-#: 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 �ּҷ� minicard ����"
 
-#: 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 "Evolution �ּҷ� minicard ����"
 
-#: 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 "����ó(_C)"
 
-#: 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
 msgid "Contact _List"
 msgstr "����ó ���(_L)"
 
-#: 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 "LDAP ������ ���� ����"
 
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: 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
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr "����ó ������ ������ �ִ� ����"
 
-#: 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 "(�� evolution ����� SSL�� �������� �ʽ��ϴ�)"
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1637
 #, fuzzy
 msgid "Account Name"
 msgstr "���� �̸�"
 
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1639
 #, fuzzy
 msgid "Server Name"
 msgstr "���� �̸�(_S):"
 
-#: 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 "(�� evolution ����� SSL�� �������� �ʽ��ϴ�)"
 
-#: 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."
 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"
@@ -609,53 +721,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 "KPOP �������� �����Ҽ� ����: %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 "%s(����� %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
 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"
@@ -663,7 +778,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"
@@ -671,25 +786,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 "���� Ž���Ⱑ ������ URI"
 
@@ -698,134 +813,123 @@ msgstr "���� Ž���Ⱑ ������ 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 "(����)"
 
-#: 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 ""
 
-#: 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
-#, fuzzy
-msgid "  S_how Supported Bases "
-msgstr "�����ϴ� �������� Ȯ��(_C) "
-
-#: 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"
-msgstr ""
+#, fuzzy
+msgid "  S_how Supported Bases "
+msgstr "�����ϴ� �������� Ȯ��(_C) "
 
 #: 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"
-msgstr "<- �����(_R)"
-
-#: 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 ""
+msgid "Add LDAP Server"
+msgstr "LDAP ����"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:12
 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"
@@ -834,78 +938,61 @@ 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 "����(_L)"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "��� �̸�(_n):"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
-msgid "Email Address:"
-msgstr "���ڿ��� �ּ�(_E):"
+msgid "Edit LDAP Server"
+msgstr "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 "���ڿ��� �ּ�(_E):"
 
-#: 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�� �� ���� �ּҷ� ������ �����Ҷ� ����մϴ�"
 
-#: 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�� �� ���� �ּҷ� ������ ������ �� ����մϴ�"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Finished"
 msgstr "�(_i)"
 
-#: 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"
@@ -915,71 +1002,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 "� ����(_E): "
 
 #. 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"
@@ -990,7 +1040,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"
@@ -999,53 +1049,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 "�ʿ��� ����"
 
-#: 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 ""
 
-#: 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"
@@ -1053,7 +1096,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"
@@ -1062,7 +1105,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"
@@ -1070,17 +1113,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"
@@ -1090,27 +1133,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 "
@@ -1118,7 +1161,7 @@ msgid ""
 "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"
@@ -1126,85 +1169,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 "����(_A)"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-msgid "_Add ->"
-msgstr "���ϱ�(_A) ->"
-
-#: 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
-#, fuzzy
-msgid "_Always"
-msgstr "�˷���ī"
-
-#: addressbook/gui/component/ldap-config.glade.h:113
-#, fuzzy
-msgid "_Delete Mapping"
-msgstr "��� ����(_D)"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "_Display name:"
 msgstr "ǥ��(_D)"
 
-#: 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
@@ -1214,201 +1218,147 @@ msgstr ""
 msgid "_Edit"
 msgstr "��ġ��(_E)"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-#, fuzzy
-msgid "_Edit Mapping"
-msgstr "��� ����(_E)"
-
-#: 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 "����(_O)"
-
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:91
 #, fuzzy
 msgid "_Port number:"
 msgstr "��Ʈ(_P):"
 
-#: 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 "�˻� ����(_c):"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "���� �̸�(_S):"
 
-#: 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
 #, 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 "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
+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:202
+#: 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: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
+#, fuzzy
+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
 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
 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 "�з�(_C):"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr "����(_F):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "A_ssistant's name:"
 msgstr "���� �̸�(_S):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Add_ress..."
 msgstr "�ּ�(_R)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr "�����(_V):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Birthda_y:"
 msgstr "����(_Y):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
-msgstr "����ó(_O)..."
-
 #: 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)..."
@@ -1419,7 +1369,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 "����ó ������"
 
@@ -1428,7 +1378,7 @@ msgid "D_epartment:"
 msgstr "�μ�(_E):"
 
 #: 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 "�ڼ���"
 
@@ -1467,1292 +1417,1337 @@ msgstr "����(_Z):"
 msgid "P_rofession:"
 msgstr "����(_R):"
 
-#: 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 "�����(_P):"
 
-#: 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 "�̰��� ���ڿ��� �ּ��Դϴ�(_M)"
 
-#: 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���� ���� ���(_H)"
 
-#: 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 "����(_D)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "����(_J):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr "�Ŵ��� �̸�(_M):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "����(_N):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "�繫��(_O):"
 
-#: 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 "Ȩ������ �ּ�(_W):"
 
-#: 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 "�����Ͼ� And Herzegowina"
 
-#: 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 "ij����"
 
-#: 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
 #, fuzzy
 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 "�ij���"
 
-#: 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
 #, fuzzy
 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
 #, fuzzy
 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
+#, fuzzy
+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
+#, fuzzy
+msgid "Card"
+msgstr "�ڵ���"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
+msgid "Is New Card"
 msgstr ""
-"������ �� ������ ����⸦\n"
-"���Ͻʴϱ�?"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "����ó�� ������?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
+#, fuzzy
+msgid "Writable Fields"
+msgstr "�߽� �׸�(_F)"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#, fuzzy
+msgid "Changed"
+msgstr "�"
 
-#: 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
 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 ""
 
-#: 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"
-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 "�̸���"
 
+#: 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 ""
 
-#: 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
 #, 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 "����(_Y):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "�ּ�(_A):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr "��(_C):"
 
-#: 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 "��/��(_S):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "���� ��ȣ(_Z):"
 
-#: 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 "��(_F):"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "�̸�(_L):"
 
-#: 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 "����(_T):"
 
-#: 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 "��� �̸�(_N):"
 
-#: 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 "�� ������� ������ ���� �� �ּҸ� ����ϴ�(_H)"
 
-#: 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 "����(_R)"
 
-#: 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�� ��� ����"
 
@@ -2804,265 +2799,286 @@ 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
+#, 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
 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
 #, 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 ""
+
+#: 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 "VCard�� ����"
 
-#: 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 "���� ����"
 
@@ -3070,7 +3086,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,��,��,��,��,��,��,��,��,��,��,ī,��,��,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,"
@@ -3080,13 +3096,13 @@ 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 ""
 ",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"
@@ -3154,20 +3170,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 ""
 
-#: 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 "�߽� �׸�(_F)"
+
+#: 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 "���� ũ��(_Z)"
+
+#: 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
 msgid ""
 "\n"
 "\n"
@@ -3176,28 +3233,48 @@ 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 "�ȵ���"
+
+#: 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 "ī�� �μ��ϱ�"
 
@@ -3270,7 +3347,6 @@ msgid "Include:"
 msgstr "����:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "����"
 
@@ -3290,17 +3366,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 "��"
 
@@ -3316,9 +3391,7 @@ msgstr "����"
 msgid "Paper source:"
 msgstr "�������:"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "����"
 
@@ -3378,43 +3451,167 @@ msgstr "�۲�(_F)..."
 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 ""
 
@@ -3423,84 +3620,74 @@ msgstr ""
 msgid "Default Priority:"
 msgstr "�켱����(_P):"
 
-#: 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 "�޷°� �۾�"
 
-#: 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 "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 �ּҷ� minicard ����"
 
-#: 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 "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 "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
+#, fuzzy
+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
 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�� �˸�"
@@ -3522,11 +3709,17 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "��� ��ġ��(_E)"
 
-#: 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"
@@ -3534,13 +3727,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 "
@@ -3551,15 +3738,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 "�׳��� �ʱ�ȭ �� �� �����ϴ�"
+#: 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 "�˶� ��� ���� ���丮�� ���� ���� �����ϴ�"
 
@@ -3575,36 +3762,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 "%Y�� %B %d�� %A"
 
 #. 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 "%b %d %a"
 
-#: 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 "%Y�� %b %d�� %a"
 
-#: 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��"
 
@@ -3613,67 +3800,162 @@ 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 "�޷�"
+
+#: calendar/gui/calendar-component.c:71
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:75
+#, fuzzy
+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
+#, 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
+msgid "New appointment"
+msgstr "�� ���"
+
+#: calendar/gui/calendar-component.c:730
+msgid "_Appointment"
+msgstr "���(_A)"
+
+#: 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 "ȸ��(_M)"
+
+#: calendar/gui/calendar-component.c:736
+#, fuzzy
+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 "�۾�(_T)"
+
+#: 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 "�� ���(_A)"
+
+#: 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"
@@ -3681,336 +3963,157 @@ msgid ""
 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
+#: 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
+#: calendar/gui/comp-editor-factory.c:456
 #, fuzzy
-msgid "Public Calendar"
-msgstr "�޷�"
-
-#: calendar/gui/component-factory.c:77
-msgid "Public folder containing appointments and events"
+msgid "Error while opening the calendar"
 msgstr ""
+"�۾� ������ ������ �߻��߽��ϴ�:\n"
+"%s"
 
-#: 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
-msgid "New appointment"
-msgstr "�� ���"
-
-#: calendar/gui/component-factory.c:750
-msgid "_Appointment"
-msgstr "���(_A)"
-
-#: calendar/gui/component-factory.c:751
-msgid "Create a new appointment"
-msgstr "�� ����� ����ϴ�"
-
-#: calendar/gui/component-factory.c:755
-msgid "New meeting"
-msgstr "�� ȸ��"
-
-#: calendar/gui/component-factory.c:755
-msgid "_Meeting"
-msgstr "ȸ��(_M)"
-
-#: calendar/gui/component-factory.c:756
-#, fuzzy
-msgid "Create a new meeting request"
-msgstr "�� �۾��� ����ϴ�"
-
-#: calendar/gui/component-factory.c:760
-msgid "New task"
-msgstr "�� �۾�"
-
-#: calendar/gui/component-factory.c:760
-msgid "_Task"
-msgstr "�۾�(_T)"
-
-#: 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 "�� ���"
-
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "All _Day Appointment"
-msgstr "�� ���(_A)"
+#: 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 "�Ϸ羿"
-
-#: 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 "���־�"
-
-#: 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 "�ѽð���"
-
-#: 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 "�Ϻи���"
-
-#: 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 "�̸��� ������"
-
-#: 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 ""
-
-#: 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
 msgid "Basics"
@@ -4021,46 +4124,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 "�̸��� ������"
+
+#: 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 "�ɼ�(_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: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 "����� ����"
 
@@ -4084,7 +4204,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 "�˸�"
 
@@ -4109,7 +4229,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 "�ݿ���"
 
@@ -4122,7 +4243,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 "������"
 
@@ -4131,7 +4253,8 @@ msgid "S_un"
 msgstr "��(_U)"
 
 #: 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 "�����"
 
@@ -4144,7 +4267,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 "�Ͽ���"
 
@@ -4161,7 +4285,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 "�����"
 
@@ -4178,7 +4303,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 "ȭ����"
 
@@ -4187,7 +4313,8 @@ msgid "W_eek starts:"
 msgstr "���� ����(_E):"
 
 #: 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 "������"
 
@@ -4229,7 +4356,7 @@ msgid "_Fri"
 msgstr "��(_F)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "�Ϲ�"
 
@@ -4271,155 +4398,159 @@ msgstr "��(_W)"
 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
+#, 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 ""
 
@@ -4477,87 +4608,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
-msgid "A_ll day event"
+#: 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 "���� �ð�(_S):"
+
+#: 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 "���(_F)"
 
-#: 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 "�Ѱ��� ��(_R)"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr "��ġ(_O):"
 
-#: 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 "����(_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 "����(_B)"
 
-#: 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 "���(_U):"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "����ó(_C)..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "����ġ�� �ð�(_E):"
@@ -4566,19 +4710,23 @@ msgstr "����ġ�� �ð�(_E):"
 msgid "_Start time:"
 msgstr "���� �ð�(_S):"
 
-#: 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 ""
 
@@ -4618,16 +4766,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
@@ -4635,13 +4778,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:"
@@ -4652,105 +4788,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 "�ٸ� �̵��� �ʴ�(_I)..."
 
-#: 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/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:128
-#: calendar/gui/dialogs/recurrence-page.c:148
+#: 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 "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 ""
 
-#: 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 "��(_F):"
 
-#: 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
 #, 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 ""
 
@@ -4814,22 +4930,27 @@ 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
+#, 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
@@ -4840,42 +4961,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 "�켱����(_P):"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "����(_S):"
 
-#: 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 "����:"
 
@@ -4883,135 +5002,232 @@ msgstr "����:"
 msgid "Sta_rt Date:"
 msgstr "���� ��¥(_R):"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "����ó(_C)..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "���� ����(_D):"
 
-#: 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 "�Ϸ羿"
+
+#: 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 "���־�"
+
+#: 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 "�ѽð���"
+
+#: 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 "�Ϻи���"
+
+#: 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 "%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 ""
+
+#: 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
 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 "����(_O)"
 
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:951
 msgid "_Save as..."
 msgstr "�ٸ� �̸����� ����(_S)..."
 
-#: 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 "�μ�(_P)..."
 
-#: 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 "�ڸ���(_U)"
 
-#: 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)"
 
-#: 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 "���̱�(_P)"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:962
 msgid "_Assign Task"
 msgstr "�۾� �Ҵ�(_A)"
 
-#: calendar/gui/e-calendar-table.c:1000
+#: calendar/gui/e-calendar-table.c:963
 msgid "_Forward as iCalendar"
 msgstr "iCalendar�� ����(_F)"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "�۾� �Ϸ� ǥ��(_M)"
 
-#: 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 "������ �۾� ����(_D)"
 
-#: 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 "�۾��� ���Ϸ��� �����ʽÿ�"
@@ -5020,8 +5236,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 "�Ϸ�"
 
@@ -5050,8 +5266,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 "���"
 
@@ -5059,19 +5275,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 "%Y/%m/%d %a %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 "%Y/%m/%d %a %p %I:%M:%S"
 
@@ -5083,478 +5295,556 @@ 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 "%B %d�� %A"
 
 #. 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 "����"
 
 #. 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 "�� ���(_A)"
 
-#: 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 "���÷� �̵�(_T)"
 
-#: 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 "��¥�� �̵�(_G)..."
 
-#: 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 "����� ����"
 
-#: 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 "�ٸ��̸����� ����(_S)..."
 
-#: 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 "ȸ�� ����(_M)"
 
-#: 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�� �����մϴ�"
 
-#: 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 "������ �ݺ�(_S)"
+
+#: 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
+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 "�Ѵ޾�(_H)"
+
+#: 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
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: 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 "iCalendar ����"
 
 #. Title
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr "iCalendar ����"
 
-#: 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
 msgid "Location:"
 msgstr "��ġ:"
 
-#: 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
 #, 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 "Ȯ��"
 
-#: 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
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "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 "`%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 "`%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 "���� ����"
 
-#: calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:2213
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "���� ����"
@@ -5596,223 +5886,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 "%Y�� %B %d�� %A"
 
 #. 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 "%Y/%m/%D %a"
 
 #. 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 "�繫�� ����"
 
-#: 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 "����(_O)"
 
-#: 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 "ȸ�� ���� �ð�(_S):"
 
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "ȸ�� ���� �ð�(_E):"
 
-#: 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 "`%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 "�� ���(_A)..."
 
-#: 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 ""
 
-#. 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"
@@ -5820,7 +6114,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"
@@ -5828,7 +6122,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���� �޷� ����"
@@ -5894,316 +6188,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
 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
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "����� ����"
 
-#: calendar/gui/itip-utils.c:598
+#: calendar/gui/itip-utils.c:525
 #, fuzzy
 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 "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 "���õ� ��(%Y�� %b %d�� %a)"
 
-#: 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 "%b %d %a"
 
-#: calendar/gui/print.c:1889
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr "%Y %d %a"
 
-#: 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 "%Y�� %b %d�� %a"
 
-#: 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 "���õ� �� (%Y�� %b)"
 
 #. 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 ""
-
-#: 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
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6211,96 +6364,67 @@ 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 "ī�� �μ��ϱ�"
 
-#: 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 "Evolution���� ������ �������Ƿ��� \"��������\"�� ��������."
+msgid "Evolution Calendar intelligent importer"
+msgstr "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 "VCard ������ Evolution���� �����ɴϴ�"
+msgid "Evolution iCalendar importer"
+msgstr "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 "VCard ������ Evolution���� �����ɴϴ�"
+msgid "Evolution vCalendar importer"
+msgstr "Evolution ���� �ۼ���."
 
-#: 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 ""
-"�޼����� ������ ����: %2$s �������� %1$s\n"
-"  %3$s"
 
-#: calendar/importers/icalendar-importer.c:180
-#, fuzzy, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "KPOP �������� �����Ҽ� ����: %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
 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 "�޷�"
 
+#: 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 ""
@@ -7943,30 +8067,38 @@ 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
 #, 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 ""
@@ -8002,87 +8134,96 @@ msgstr "%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 "�޼����� ������ ÷���մϴ�"
+
+#: 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 "�޼����� ������ ÷���մϴ�"
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr ""
+"%s ���丮�� ������ ���� �����ϴ�:\n"
+"%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 "��Ǯ ������ �� �� �����ϴ�"
 
-#: 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 "�޼��� %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 "%2$d�� %1$d�޽��� ����������"
 
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%2$d�� %1$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 "�޼����� ������ ÷���մϴ�"
-
-#: camel/camel-filter-search.c:550
-#, fuzzy, 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 "���� � ������ ����: %s: %s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8091,7 +8232,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"
@@ -8100,11 +8241,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 ""
@@ -8133,7 +8274,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"
@@ -8141,71 +8282,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 "��ҵ�."
 
-#: 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 "IMAP server�κ��� ����ġ���� �亯: %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
 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 "�޼����� ������ ÷���մϴ�"
 
-#: 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 "�޼����� ������ ÷���մϴ�"
 
-#: 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"
@@ -8230,23 +8372,22 @@ 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 ""
 
-#: 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 ""
@@ -8256,51 +8397,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 "���������� �д��� ���� �߻�: %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"
@@ -8317,26 +8458,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 ""
 
-#: 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 ""
@@ -8384,60 +8525,130 @@ 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 "�޼����� ������ ÷���մϴ�"
+
+#: camel/camel-sasl-gssapi.c:299
+#, fuzzy
+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
 #, fuzzy
 msgid "Login"
@@ -8485,7 +8696,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 ""
@@ -8505,36 +8716,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 "%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 ""
 
@@ -8546,12 +8757,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"
@@ -8560,175 +8771,175 @@ 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
 #, fuzzy, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr "�� ������ ���������ʽ��ϴ�"
 
-#: 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 "�� ������ ���������ʽ��ϴ�"
 
-#: 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 "�޼����� ������ ÷���մϴ�"
 
-#: 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 "������ ������ �����ϴ�: %s: %s"
 
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "������ ������ �����ϴ�: %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
 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 "�ӽ� ������ ������ ����: %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
 #, 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
 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
 #, fuzzy
 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"
@@ -8737,15 +8948,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"
@@ -8758,7 +8969,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"
@@ -8768,35 +8979,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 "����Ÿ�� �� ���� �����ϴ�: %s"
@@ -8811,40 +9022,40 @@ msgstr "%s��(��) �д��� ���� �߻�"
 msgid "No such message %s in %s"
 msgstr "�׷� �޼��� ����: %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
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "������ ������ �����ϴ�: %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 "������ ������ �����ϴ�: %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 "������ ������ �����ϴ�: %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 "������ ������ �����ϴ�: %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
 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 ""
@@ -8867,53 +9078,53 @@ msgstr "IMAP server�κ��� ����ġ���� �亯: %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 "IMAP �����κ��� ����ġ���� OK�亯�� ��: %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 ""
 
-#: 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 "�޽������� ����"
 
-#: 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"
@@ -8922,24 +9133,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 ""
 
@@ -8971,7 +9182,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 "����"
 
@@ -9001,7 +9212,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 "�����"
 
@@ -9019,60 +9230,59 @@ msgstr "SMTP ���� %s"
 msgid "IMAP service for %s on %s"
 msgstr "SMTP ���� %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 "LDAP ������ ������ �� ����."
 
-#: 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 %s@%s�� ���� IMAP ������� �Է��Ͻʽÿ�"
 
-#: 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"
@@ -9080,24 +9290,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 "%s���� ������ ����"
 
-#: 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 "�� �� ���� ����: %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 ""
 
@@ -9173,8 +9383,8 @@ msgstr ""
 "���� Elm, Pine �Ǵ� Mutt����� ������ ���� ���� ���Դϴ�."
 
 #: 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 ""
@@ -9186,38 +9396,38 @@ 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 ""
 
-#: 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"
 
-#: 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 ""
 "���� ���� %s�� �� ���� �����ϴ�:\n"
 "%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 ""
@@ -9229,7 +9439,7 @@ msgstr ""
 "���� ���� %s�� �� ���� �����ϴ�:\n"
 "%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 ""
 
@@ -9242,14 +9452,14 @@ msgstr ""
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "���������� �޼����� ������ �� �����ϴ�: %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"
@@ -9261,14 +9471,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"
@@ -9283,72 +9493,72 @@ msgid "`%s' is not a maildir directory."
 msgstr "`%s'��(��) ���� ���丮�� �ƴմϴ�."
 
 #: 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 ""
 
 #: 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
 #, fuzzy, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "���������� �޼����� �����ϼ� �����ϴ�: %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
 #, fuzzy
 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
 #, fuzzy, 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 ""
 
-#: camel/providers/local/camel-mbox-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:278
 #, fuzzy
 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"
@@ -9357,11 +9567,11 @@ msgstr ""
 "�޼����� ���� �� ����: %2$s �������� %1$s\n"
 "  %3$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 ""
 
@@ -9398,79 +9608,79 @@ 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 ""
 "���� ���� %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 "������ ������ �����ϴ�: %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 ""
 "���� ���� %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 ""
 
-#: 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 "�ӽ� ������ ������ ����: %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 "�� �� ���� ����: %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 ""
 
-#: 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 ""
@@ -9490,69 +9700,69 @@ msgstr ""
 msgid "`%s' is not a directory."
 msgstr ""
 
-#: 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 ""
 "%s ���丮��\n"
 "������ ���� �����ϴٿ���: %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 ""
 
-#: 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
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "���� `%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
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "���� ���� ���� %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 "���� ���� ���� %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
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "�ӽ� ������ ������ ����: %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 "�ӽ� ������ ������ ����: %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 ""
@@ -9632,46 +9842,46 @@ 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
 #, fuzzy
 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 "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 "�� ������ ����"
@@ -9690,7 +9900,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 "POP"
 
@@ -9711,66 +9921,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 "KPOP �������� �����Ҽ� ����: %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 "KPOP �������� �����Ҽ� ����: %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 "KPOP �������� �����Ҽ� ����: %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 "IMAP ���� %s�� ��û�� �������� %s�� �������� �ʽ��ϴ�"
 
-#: 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 "KPOP �������� �����Ҽ� ����: %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 %s@%s�� ���� POP ������� �Է��Ͻʽÿ�"
 
-#: 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 "LDAP ������ ������ �� ����."
 
-#: 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 "�������"
 
@@ -9780,50 +9990,50 @@ msgid ""
 "system."
 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 "����Ÿ�� �� ���� �����ϴ�: %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 "�޼����� ���� �� ����: %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 ""
 
-#: 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 "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 ""
 
@@ -9831,135 +10041,135 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "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 ""
 
-#: 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
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "KPOP �������� �����Ҽ� ����: %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
 #, 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
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "%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 ""
@@ -9986,11 +10196,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 ""
 
@@ -9998,62 +10208,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
 msgid "HELO response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 #, fuzzy
 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 ""
@@ -10061,77 +10271,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 "������ ������ �����ϴ�: %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 "����� ���� ������ �ƴϳ׿�."
@@ -10149,11 +10359,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 "�ּҷ�"
 
@@ -10164,45 +10378,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."
@@ -10211,61 +10425,58 @@ msgstr "���� ��Ͽ��� ������ �޼����� �纻�� ���� ������� �ּҸ� �Է��ϼ���"
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:447
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "��Ʈ(_P):"
 
-#: 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 "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
 
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:812
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr "������ �д��� ���� �߻�: %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
 #, fuzzy, 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
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10274,7 +10485,7 @@ msgstr ""
 "��������� ������ ���� �����ϴ�: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1276
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10283,7 +10494,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
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10292,13 +10512,13 @@ 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?"
 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"
@@ -10309,33 +10529,38 @@ 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
 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
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10346,7 +10571,7 @@ msgstr ""
 "���� �Ż� ������ �Է��� �Ǿ����� �ʾұ⶧����\n"
 "�޽��� �ۼ�â�� ���� ���� �����ϴ�."
 
-#: composer/e-msg-composer.c:2879
+#: composer/e-msg-composer.c:2991
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10355,25 +10580,12 @@ msgstr ""
 "���� �Ż� ������ �Է��� �Ǿ����� �ʾұ⶧����\n"
 "�޽��� �ۼ�â�� ���� ���� �����ϴ�."
 
-#: 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 ""
-"���� �Ż� ������ �Է��� �Ǿ����� �ʾұ⶧����\n"
-"�޽��� �ۼ�â�� ���� ���� �����ϴ�."
-
-#: 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 "Evolution �׷���� ����"
@@ -10422,220 +10634,350 @@ 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 "������ ����"
+
+#: 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?"
 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 "�з�"
 
 #. 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 "%Y/%m/%d %a %p %I:%M"
 
 #. 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 "%Y/%m/%d %a %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 "%Y/%m/%d %a %p %I"
 
 #. 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 "%Y/%m/%d %a %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 %p %I:%M:%S"
 
 #. 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 %p %I:%M"
 
 #. 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 %p %I"
 
 #. 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 "%p %I:%M:%S"
 
 #. 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 "%p %I:%M"
 
 #. 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 "%p %I"
 
-#: 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 "�Ϻи���"
 
-#: 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 "�ѽð���"
 
-#: filter/filter-datespec.c:75
-msgid "month"
+#: 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 "�Ϸ羿"
+
+#: filter/filter-datespec.c:68
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr " %d �Ͼ�"
+
+#: filter/filter-datespec.c:69
+#, fuzzy
+msgid "1 week ago"
+msgstr "���־�"
+
+#: 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"
+#: 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
+#, 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 "%Y�� %b %d�� %a"
 
-#. 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 "�� �Ÿ����� �̸��� �־�� �մϴ�."
 
-#: 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'�� �������� �ʽ��ϴ�."
 
-#: 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"
@@ -10644,77 +10986,75 @@ 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
 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
 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 "������ ��"
 
@@ -10756,7 +11096,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 "���� ����"
 
@@ -10768,6 +11108,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 "������ ������"
@@ -10784,6 +11132,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 ""
@@ -10796,6 +11148,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"
@@ -10925,7 +11281,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 "�η�"
@@ -10956,7 +11312,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 "����"
 
@@ -10987,12 +11343,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 "������"
 
@@ -11028,8 +11384,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 "����"
 
@@ -11038,74 +11395,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
+#, 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 ""
 
-#: 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 "���� ���� �ҽ�"
+
+#: 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 ""
 
@@ -11115,12 +11488,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 "�켱����: %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"
@@ -11135,7 +11508,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"
@@ -11143,7 +11516,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"
@@ -11152,446 +11525,442 @@ 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 "���� ���� ���� %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 "IMAP ������ ���캾�ϴ�"
 
-#: 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 "���� ��¥(_S):"
 
-#: 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?"
 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 "�μ�"
 
-#: 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
 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
 #, fuzzy
 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 "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 ""
+#: 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/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 ���� �ۼ���."
 
-#: 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 "���� ���� �������̽�"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: 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.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
 #, 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."
 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/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "���� �����(_M)"
 
-#: 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 "���� ��ġ��(_P)"
 
-#: 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 "Evolution�� ���� ������Ҹ� �ʱ�ȭ �� �� �����ϴ�."
-
-#: mail/component-factory.c:1087
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Evolution ���� ���� ������Ұ� �ʱ�ȭ���� �ʾҽ��ϴ�."
-
-#: mail/component-factory.c:1093
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Evolution ���� ���� ������Ұ� �ʱ�ȭ���� �ʾҽ��ϴ�."
-
-#: 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 "\"%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 "%d�� ����"
 
-#: 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
 #, fuzzy, 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
 msgid "Create _Virtual Folder From Search..."
 msgstr "ã�� �Ϳ��� ���� ���� �����(_V)"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "���񿡵��� ��������(_S)"
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "�����̿� ���� ��������(_N)"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "�����̿� ���� ��������(_R)"
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "���ϸ� ����Ʈ�� ���� ��������(_L)"
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "���� ���� �Ÿ���(_J)"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "�����̿� ���� �Ÿ���(_D)"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "�����̿� ���� �Ÿ���(_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)"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "�� �޼����� ��ħ(_E)..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "�μ�(_P)"
 
-#: 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 "���� �̿��� ����(_R)"
 
-#: 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 "��Ͽ� ����(_L)"
 
-#: 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 "��ü�� ����(_A)"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "����(_F)"
 
-#: 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 "ǥ�� �Ϸ�(_G)"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1772
 msgid "Cl_ear Flag"
 msgstr "ǥ�� ���(_E)"
 
 #. 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 "���� ������ ǥ��(_K)"
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1777
 msgid "Mark as _Unread"
 msgstr "���� ���� ������ ǥ��(_U)"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "�߿��� ������ ǥ��(_I)"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1779
 msgid "_Mark as Unimportant"
 msgstr "�߿����� ���� ������ ǥ��(_M)"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1784
 msgid "U_ndelete"
 msgstr "�ǻ츲(_N)"
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1788
 msgid "Mo_ve to Folder..."
 msgstr "������ �ű�(_V)..."
 
-#: 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)..."
 
-#: 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 "�Ÿ��� ����(_Y)"
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1805
 msgid "Crea_te Rule From Message"
 msgstr "�޽����κ��� �Ÿ��� �����(_T)"
 
-#: mail/folder-browser.c:2036
+#: mail/folder-browser.c:2064
 msgid "VFolder on M_ailing List"
 msgstr "���ϸ� ����Ʈ�� ���� ��������(_A)"
 
-#: mail/folder-browser.c:2038
+#: mail/folder-browser.c:2066
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "���ϸ� ����Ʈ�� ���� �Ÿ��� (%s) (_M)"
 
-#: mail/folder-browser.c:2039
+#: mail/folder-browser.c:2067
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "���ϸ� ����Ʈ�� ���� �������� (%s) (_A)"
 
-#: 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.server.in.in.h:1
+#, fuzzy
+msgid "Evolution mbox 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: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 "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_Outlook_Importer.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
+msgid "Evolution Pine importer"
+msgstr "Evolution ���� �ۼ���."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -11625,97 +11994,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 "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 "ȣ��Ʈ(_H):"
 
-#: 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 "������̸�(_N):"
 
-#: 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 "���(_P):"
 
-#: 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
 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 "%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 "%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"
@@ -11726,7 +12095,12 @@ msgstr ""
 "    '%s'\n"
 "�� ���� ���������ϴ�."
 
-#: 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"
@@ -11734,31 +12108,37 @@ 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
 #, fuzzy
 msgid "Send anyway?"
 msgstr "�̸��� ������"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11766,55 +12146,55 @@ 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 ""
 
-#: 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 "%Y-%m-%d %a %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."
@@ -11822,7 +12202,7 @@ msgstr ""
 "�ӽ� ������ ������ ������ �޼�����\n"
 "��ĥ �� �ֽ��ϴ�."
 
-#: mail/mail-callbacks.c:2445
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11830,110 +12210,112 @@ msgstr ""
 "���� �����Կ� �ִ� �޼�����\n"
 "�ٽ� ���� �� �ֽ��ϴ�."
 
-#: 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:2584
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr "������ �ֽ��ϴ�, ������?"
+
+#: 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
-#, fuzzy
-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 "%2$d�� %1$d��"
 
-#: 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
 #, fuzzy, 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 "�̸����� ����ó"
 
-#: 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
-msgid "Add Signature"
-msgstr "���� ����"
+#: mail/mail-composer-prefs.c:926
+#, fuzzy
+msgid "Signature(s)"
+msgstr "����(_S)"
 
-#: 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 "
@@ -11942,7 +12324,12 @@ msgstr ""
 "�Ʒ��� �������� �̸��� ���� �ּҸ� �Է��Ͻʽÿ�. �� �Ʒ��� �ִ� \"����\" �ʵ�"
 "�� ������ ���� �� ������ ������ �ʰ� ������ ä���� �ʾƵ� �˴ϴ�."
 
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "���� �ޱ�(_R)"
+
+#: 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."
@@ -11950,17 +12337,26 @@ 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 "���� ����(_S)"
+
+#: 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 "
@@ -11969,418 +12365,397 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#. 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 "�����ϴ� �������� Ȯ��(_C) "
 
-#: 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 ����� SSL�� �������� �ʽ��ϴ�)"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(�� evolution ����� SSL�� �������� �ʽ��ϴ�)"
 
-#: 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
 #, fuzzy
 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 "�� ������ �� �� ������ �޼����� �׻� ������(_Y)"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "�׻� ���� ����(_B):"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "�׻� ����(_C):"
 
-#: 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 "�ڵ����� ��ũ �˾Ƴ�(_D)"
 
-#: 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 "���ڼ�(_H):"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "C_olors"
 msgstr "����(_O)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "�Է��� �� ����� �˻�(_T)"
 
-#: 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 "������� Ʋ�� ������ ����(_M):"
 
-#: 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 "�⺻��(_F)"
 
-#: 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
 msgid "Default character _encoding:"
 msgstr "�⺻ ���� ���ڵ�(_E):"
 
-#: 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 "������ ID..."
 
-#: 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
 msgid "Drafts _folder:"
 msgstr "�ӽ� ������ ����(_F):"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "���(_N)"
 
-#: 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 "���ڿ��� �ּ�(_A):"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "��ĥ�� ������ ���� ���(_T)"
 
-#: mail/mail-config.glade.h:54
+#: 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:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "������(_X):"
 
-#: 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 "HTML ���� �޼���(_H)"
 
-#: 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
 msgid "Highlight _quotations with"
 msgstr "�ο빮�� ���� ����� ����(_Q)"
 
-#: 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 ""
 
-#: 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
 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
+#: 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 "����(_G):"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP Ű ID(_K):"
 
-#: 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 "�� ����� ���(_M)"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "Re_ply-To:"
 msgstr "���� �ּ�(_P):"
 
-#: 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 "�ޱ� �ɼ�(_O)"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "Remember this _password"
 msgstr "�� ����� ���(_P)"
 
-#: 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
 msgid "S_ecurity"
 msgstr "����(_E)"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "���� MIME (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 "������ ����"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "���� ������ �޼��� ����(_M):"
 
-#: 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 "������ ������ �䱸�մϴ�(_V)"
 
-#: 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 "���� ����(_T): "
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "Shortcuts _type:"
 msgstr "����ۼ� ����(_T):"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "Specify _filename:"
 msgstr "�����̸� ����(_F):"
 
-#: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
-msgstr "����� �˻� ���"
-
 #: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr "����� �˻�(_C)"
@@ -12416,10 +12791,11 @@ msgid "V_ariable-width:"
 msgstr "������(_A):"
 
 #: 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"
@@ -12486,103 +12862,109 @@ msgid "_Enable"
 msgstr "���(_E)"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr "������(_F):"
-
-#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "���� ���(_F):"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "��ü�̸�(_F):"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr "HTML ����(_H)"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr "�ſ�(_I)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "�����̰� �ּҷϿ� ������ �׸� ����(_L)"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "�� �⺻ �������� �ϱ�(_M)"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "���� �� �޼��� ǥ��(_M)"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "�̸�(_N):"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "�׸��� ������ ����(_N)"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr "������ �����ϸ� �Ҹ��� �˸�(_P)"
 
-#: 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 "���� �ޱ�(_R)"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "���� ���(_R):"
 
-#: 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 "����(_S)"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "���� ����(_S)"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "�׸� ������ ����(_S)"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "����(_S)"
 
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "�긶����"
+
 #: mail/mail-config.glade.h:175
-msgid "_Use secure connection (SSL):"
-msgstr "���� ����(SSL) ���(_U):"
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "���� ����ó:"
 
 #: mail/mail-config.glade.h:176
-msgid "_Variable-width:"
-msgstr "������(_V):"
+msgid "_Use secure connection (SSL):"
+msgstr "���� ����(SSL) ���(_U):"
 
 #: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
 msgid "_every"
 msgstr "��(_E)"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr "����"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "����"
 
@@ -12608,192 +12990,194 @@ 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 "������ �ֽ��ϴ�, ������?"
+
+#: 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
 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 "�ܺ� �������α׷�"
 
-#: 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 "%b %d %p %l:%M"
 
-#: 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 "\"%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 "����"
 
-#: mail/mail-format.c:932
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "���� ����"
 
-#: mail/mail-format.c:963
-#, fuzzy
-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 "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
 
-#: 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 "���� ����"
 
-#: 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
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
@@ -12803,18 +13187,18 @@ msgstr "������ ������ �����ϴ�: %s: %s"
 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."
 msgstr ""
 
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
 #, fuzzy, 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 ""
 
@@ -12836,108 +13220,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 "%2$d�� �� %1$d�� �޼��� ����"
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%2$d�� %1$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 ""
 
-#: 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"
@@ -12946,7 +13330,7 @@ msgstr ""
 "��������� ���� ���� �����ϴ�: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12955,11 +13339,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"
@@ -12968,54 +13352,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 "�(_S)"
-
-#: 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 "��ġ��:"
 
@@ -13023,69 +13407,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 "�� ����� ���(_R)"
-
-#: 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 "�� ����� ���(_R)"
+
+#: 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 "�ӽ� ������ ������ ����: %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"
@@ -13095,43 +13475,51 @@ 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
 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 "���޵� �޽��� - %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 "���� ���� ����: %s"
 
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "���������� uri ���� ��ħ: %s"
 
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13144,97 +13532,97 @@ msgstr ""
 "    '%s'\n"
 "�� ���� ���������ϴ�."
 
-#: 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 "���� ���� ���� '%s'��(��) ��ġ�� �մϴ�."
 
-#: 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 "%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 "���� %p %l:%M"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "���� %p %l:%M "
 
-#: mail/message-list.c:1094
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "%a %p %l:%M"
 
-#: mail/message-list.c:1102
+#: mail/message-list.c:1116
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %p %l:%M"
 
-#: 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 "�޼��� ��� �ۼ���"
 
@@ -13269,47 +13657,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 ""
 
@@ -13338,53 +13726,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 "\"%2$s\"�� %1$s �Ʒ� �������� ã����"
 
-#: 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 "���� \"%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
@@ -13395,63 +13774,46 @@ 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 "����(_S)"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "���� ����(_U)"
 
-#: 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 "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 "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 "��� ����"
@@ -17160,7 +17522,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 "���"
 
@@ -18980,6417 +19342,6408 @@ 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
 #, fuzzy
 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 "��¥"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "���� ���� ������ ǥ��(_n)"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Martinsburg"
 msgstr "����"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsville"
 msgstr "����"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Massena"
 msgstr "���ɵ��Ͼ�"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 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
 #, fuzzy
 msgid "Mayaguez"
 msgstr "����"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayport"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mazatlan"
 msgstr "ī���彺ź"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 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
 #, fuzzy
 msgid "McCall"
 msgstr "����"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCarthy"
 msgstr "���"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 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
 #, fuzzy
 msgid "Meacham"
 msgstr "���"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Merril Field"
 msgstr "�߽� �׸�(_F)"
 
-#: 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 "�߽���"
 
-#: 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Miles City"
 msgstr "���� ����:"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 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 "%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
 #, fuzzy
 msgid "Minatitlan"
 msgstr "��Ÿ�Ͼ�"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Mitchell"
 msgstr "��ġ��:"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 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 "����"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Mojave"
 msgstr "�̵�"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Molde"
 msgstr "�޴���ȭ"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Monclova"
 msgstr "����"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Moncton"
 msgstr "����"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "�޺� ����"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 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 "�Ѵ޾�"
 
-#: 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 "����"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Morelia"
 msgstr "���񸮾�"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morgantown"
 msgstr "����"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Mount Shasta"
 msgstr "����"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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 "�����"
 
-#: 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 "���"
 
-#: 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 "����"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Natal"
 msgstr "īŸ��"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 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 "�� ����"
 
-#: 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 "�׷�����"
 
-#: 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 "�׷�����"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Newark"
 msgstr ""
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "New Bedford"
 msgstr "���ҽ� �ޱ�"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bern"
 msgstr "�� ����(_N)"
 
-#: 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 "��ij��"
 
-#: 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
 #, fuzzy
 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 "���� JFK ����"
 
-#: 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 "�뽺 ij�Ѹ���"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 #, fuzzy
 msgid "North Conway"
 msgstr "�븣����"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 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
 #, fuzzy
 msgid "North Platte"
 msgstr "�ϵ�"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "Northway"
 msgstr "�븣����"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "�������� �� ��ġ����"
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 #, fuzzy
 msgid "Norwich"
 msgstr "��"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwood"
 msgstr "�븣����"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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 "�ȶ��"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Oceanside"
 msgstr "���̽�����"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 #, fuzzy
 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
 #, fuzzy
 msgid "Oelwen"
 msgstr "����"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Okushiri Island"
 msgstr "������ ���� ����"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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 "����"
 
-#: 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 "����"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Oostende"
 msgstr "������"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 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 "������"
 
-#: 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Owyhee"
 msgstr "��"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 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 "��"
 
-#: 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 "�ȶ��"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 #, fuzzy
 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
 #, fuzzy
 msgid "Palmdale"
 msgstr "�ȶ��"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 #, fuzzy
 msgid "Palmer"
 msgstr "�߻�"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 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
 #, fuzzy
 msgid "Pamplona"
 msgstr "�ȶ��"
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 #, fuzzy
 msgid "Panama City"
 msgstr "�ij���"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Pantelleria"
 msgstr "��ҵ�"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Papa"
 msgstr "����"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Paphos"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Patna"
 msgstr "�ij���"
 
-#: 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 "�Ҹ� ����:"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Payson"
 msgstr "�Ҹ� ����:"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Pellston"
 msgstr "����"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pelotas"
 msgstr "�ٽ� ����"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Perth"
 msgstr "���"
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 #, fuzzy
 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
 #, fuzzy
 msgid "Philip"
 msgstr "�ʸ���"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 #, fuzzy
 msgid "Philipsburg"
 msgstr "�ʸ���"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 #, fuzzy
 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 "�μ�"
 
-#: 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 "�̸�����"
 
-#: 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 "��Ű��ź"
 
-#: 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 "��"
 
-#: 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 "���� �μ�"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Lay"
 msgstr "�μ� ���"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Ponca City"
 msgstr "��ȭ ���"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 #, fuzzy
 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
 #, fuzzy
 msgid "Pontiac"
 msgstr "����ó(_C)"
 
-#: 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 "������"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Porterville"
 msgstr "�̸�����"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Port Hardy"
 msgstr "ī�� �μ��ϱ�"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 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
 #, fuzzy
 msgid "Porto"
 msgstr "��Ʈ(_P):"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 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 "����"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Poza Rica"
 msgstr "�ڽ�Ÿ��ī"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 #, fuzzy
 msgid "Poznan"
 msgstr "������"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Pretoria"
 msgstr "�׷�����"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 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 "��ü"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Providence"
 msgstr "��/��(_S):"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Provincetown"
 msgstr "�̸�����"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 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
 #, fuzzy
 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 "����"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Pueblo"
 msgstr "����"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 #, fuzzy
 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
 #, fuzzy
 msgid "Puerto Escondido"
 msgstr "Ǫ�����丮��"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 #, fuzzy
 msgid "Puerto Lempira"
 msgstr "Ǫ�����丮��"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 #, fuzzy
 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
 #, fuzzy
 msgid "Puerto Montt"
 msgstr "Ǫ�����丮��"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 #, fuzzy
 msgid "Puerto Plata"
 msgstr "Ǫ�����丮��"
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 #, fuzzy
 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
 #, fuzzy
 msgid "Pula"
 msgstr "�ȶ��"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 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
 #, fuzzy
 msgid "Quantico"
 msgstr "����"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 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
 #, fuzzy
 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 "��"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 msgid "Reading"
 msgstr "�Ӹ���"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Rebun Island"
 msgstr "�з� ����"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 #, fuzzy
 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
 #, fuzzy
 msgid "Redding"
 msgstr "�Ӹ���"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redig"
 msgstr "����"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Rennes"
 msgstr "�˸�"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Reno"
 msgstr "�ٽ� ����"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Reynosa"
 msgstr "�ٽ� ����"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Rhinelander"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhode Island"
 msgstr "�з� ����"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 #, fuzzy
 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 "����"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rieti"
 msgstr "����Ƽ"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rifle"
 msgstr "����(_F)"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rijeka"
 msgstr "����"
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1880
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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 "���̺�����"
 
-#: 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
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1895
 #, fuzzy
 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
 #, fuzzy
 msgid "Roatan"
 msgstr "ũ�ξ�Ƽ��"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1898
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Rodos"
 msgstr "��"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rogers"
 msgstr "����"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1907
 #, fuzzy
 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 "��"
 
-#: 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Russia"
 msgstr "����Ʈ����"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1929
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "�긶����"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1943
 #, fuzzy
 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 "������"
 
-#: 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 "����"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1949
 #, fuzzy
 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
 #, fuzzy
 msgid "Salina"
 msgstr "�Ҹ�����"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1952
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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 "����"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samos"
 msgstr "����"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samsun"
 msgstr "��(_n)"
 
-#: 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
 #, fuzzy
 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 "�긶����"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "Sandane"
 msgstr "����"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandberg"
 msgstr "������"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sanderson"
 msgstr "������"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1977
 #, fuzzy
 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
 #, fuzzy
 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 "����"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1987
 #, fuzzy
 msgid "San Francisco"
 msgstr "�긶����"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1988
 #, fuzzy
 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
 #, fuzzy
 msgid "San Joaquin"
 msgstr "�긶����"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1991
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "San Miguel"
 msgstr "�긶����"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2001
 #, fuzzy
 msgid "San Nicholas Island"
 msgstr "���� ��"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2002
 #, fuzzy
 msgid "San Salvador"
 msgstr "�� ��ٵ���"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2003
 #, fuzzy
 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
 #, fuzzy
 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 "������"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
 #, fuzzy
 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
 #, fuzzy
 msgid "Santorini"
 msgstr "�긶����"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2019
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Sayun"
 msgstr "��(_n)"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2038
 #, fuzzy
 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 "����"
 
-#: 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 "����"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Sedalia"
 msgstr "�Ҹ�����"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2048
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Sharurah"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Shawbury"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2065
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Silver City"
 msgstr "����"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2086
 #, fuzzy
 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
 #, fuzzy
 msgid "Skive"
 msgstr "����"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2097
 #, fuzzy
 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
 #, fuzzy
 msgid "Slana"
 msgstr "�˹ٴϾ�"
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2102
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Sofia"
 msgstr "�Ҹ�����"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2110
 #, fuzzy
 msgid "Sogndal"
 msgstr "�찣��"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2111
 #, fuzzy
 msgid "Soldotna"
 msgstr "���κ��Ͼ�"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2112
 #, fuzzy
 msgid "Somerset"
 msgstr "�ҳ���"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
 #, fuzzy
 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 "����"
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "South Bend"
 msgstr "��"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Carolina"
 msgstr "�� ������ī ��ȭ��"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
 #, fuzzy
 msgid "South Dakota"
 msgstr "����"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "Southend"
 msgstr "��"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2122
 #, fuzzy
 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 "������"
 
-#: 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 "������"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2129
 #, fuzzy
 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 "��ü"
 
-#: 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 "�Ϸ�� ��¥:"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2135
 #, fuzzy
 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
 #, fuzzy
 msgid "Staverton"
 msgstr "����:"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2139
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "St Joseph"
 msgstr "����"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2148
 #, fuzzy
 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
 #, fuzzy
 msgid "Storm Lake"
 msgstr "������ī"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Stornoway"
 msgstr "�븣����"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2157
 #, fuzzy
 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
 #, fuzzy
 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 "�����"
 
-#: 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 "����"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sumburgh"
 msgstr "����θ�ũ"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2168
 #, fuzzy
 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
 #, fuzzy
 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 "��ü"
 
-#: 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 "����"
 
-#: 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 "�밡"
 
-#: 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 "�뱸 Ab"
 
-#: 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
 #, fuzzy
 msgid "Taif"
 msgstr "�븸"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Tainan"
 msgstr "�븸"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2203
 #, fuzzy
 msgid "Taiyuan"
 msgstr "�븸"
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiz"
 msgstr "�븸"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2205
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Taos"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2220
 #, fuzzy
 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
 #, fuzzy
 msgid "Taranto"
 msgstr "�븸"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Tarbes"
 msgstr "�׽�Ʈ"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2224
 #, fuzzy
 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 "��ü"
 
-#: 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 "�ٽ� ����"
 
-#: 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
 #, fuzzy
 msgid "Texas"
 msgstr "�׽�Ʈ"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2243
 #, fuzzy
 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 "����"
 
-#: 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 "�����"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Tianjin"
 msgstr "�븸"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2251
 #, fuzzy
 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
 #, fuzzy
 msgid "Tirana"
 msgstr "�븸"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2255
 #, fuzzy
 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
 #, fuzzy
 msgid "Titusville"
 msgstr "����"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2259
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Tonopah"
 msgstr "�밡"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2273
 #, fuzzy
 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
 #, fuzzy
 msgid "Torp"
 msgstr "��:"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torrance"
 msgstr "������"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torreon"
 msgstr "�ѱ���"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "���� ��¥(_S):"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2282
 #, fuzzy
 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
 #, fuzzy
 msgid "Trabzon"
 msgstr "����"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2289
 #, fuzzy
 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
 #, fuzzy
 msgid "Trelew"
 msgstr "�̸�����"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trenton"
 msgstr "����"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Tulcea"
 msgstr "ȭ����"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulsa"
 msgstr "ȭ����"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tupelo"
 msgstr "ȭ(_u)"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Turaif"
 msgstr "����"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turin"
 msgstr "����"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2319
 #, fuzzy
 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
 #, fuzzy
 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 "����"
 
-#: 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 "���� ����"
 
-#: 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
 #, fuzzy
 msgid "Uruapan"
 msgstr "�Ϻ�"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2344
 #, fuzzy
 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 "�ݱ�"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2354
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Varna"
 msgstr "�ٴ�����"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2374
 #, fuzzy
 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
 #, fuzzy
 msgid "Venezia"
 msgstr "���׼�����"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2378
 #, fuzzy
 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 "��"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2382
 #, fuzzy
 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
 #, fuzzy
 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 "���� �̸�:"
 
-#: 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Volk Field"
 msgstr "�߽� �׸�(_F)"
 
-#: 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 "����"
 
-#: 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 "���� ����"
 
-#: 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 "���"
 
-#: 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 "����"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterloo"
 msgstr "����"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Watertown"
 msgstr "����"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2431
 #, fuzzy
 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
 #, fuzzy
 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 "�� ����Ʈ"
 
-#: 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
 #, fuzzy
 msgid "Wenatchee"
 msgstr "����"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2440
 #, fuzzy
 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
 #, fuzzy
 msgid "West Burke"
 msgstr "���� ������"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "Westerland"
 msgstr "�׵�����"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
 #, fuzzy
 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
 #, fuzzy
 msgid "Wheeling"
 msgstr "ȸ��"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2451
 #, fuzzy
 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 "����"
 
-#: 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
 #, fuzzy
 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 "����"
 
-#: 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 "��й�ȣ �Է�"
 
-#: 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 "��ũ�γ׽þ�"
 
-#: 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
 #, fuzzy
 msgid "Woong Cheon"
 msgstr "ȫ��"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Wooster"
 msgstr "������:"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Worcester"
 msgstr "�� ������"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worland"
 msgstr "������"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2490
 #, fuzzy
 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
 #, fuzzy
 msgid "Wyoming"
 msgstr "������ ��"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2495
 #, fuzzy
 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
 #, fuzzy
 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 "���� ������"
 
-#: 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 "���/H-208 Hp"
 
-#: 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 "�޷�"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
 #, fuzzy
 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
 #, fuzzy
 msgid "Zanesville"
 msgstr "��ҵ�"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2532
 #, fuzzy
 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
+#, 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 "%B %d�� %k:%M"
 
-#: 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 "%d�� %B %l:%M"
 
-#: 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 "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
 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 "%Y�� %B %e�� %A"
 
-#: 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 "ȭ��"
 
-#: 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
 #, fuzzy
 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
 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 ""
 
@@ -25488,83 +25841,70 @@ msgstr "��ȹ(_S)"
 msgid "_Weather"
 msgstr "����(_W)"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution folder settings."
+#: 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:2
-msgid "Configure special folders and offline folder behavior here"
+#: 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.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 "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
 #, fuzzy
 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 "������ ������ �����ϴ�: %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
 #, fuzzy, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "%s���� ����..."
 
-#: 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 "Evolution ��ġ"
-
-#: 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"
@@ -25575,40 +25915,14 @@ msgstr ""
 "���� �� �����ϴ�\n"
 "����: %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 "������ �д� ���� ���� �߻�"
 
-#: shell/e-setup.c:282
-#, fuzzy, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"%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"
@@ -25616,16 +25930,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"
@@ -25637,25 +25942,25 @@ 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
 msgid "Default Folders"
 msgstr "�⺻ ����"
 
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
 msgid "Offline Folders"
 msgstr "�������� ����"
 
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 msgid "Autocompletion Folders"
 msgstr "�ڵ��ϼ� ����"
 
@@ -25664,96 +25969,96 @@ 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 "������ ������ �����ϴ�: %s: %s"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:188
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "������ ������ �����ϴ�: %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 ""
 "`%s'�� ������\n"
 "������ ���� �����ϴ�."
 
-#: 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
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: shell/e-shell-folder-commands.c:406
-#, fuzzy, c-format
-msgid "Delete \"%s\""
-msgstr "����"
-
-#: shell/e-shell-folder-commands.c:407
+#: shell/e-shell-folder-commands.c:405
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:412
+#, fuzzy, c-format
+msgid "Delete \"%s\""
+msgstr "����"
+
+#: shell/e-shell-folder-commands.c:485
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "������ ������ �����ϴ�: %s: %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 ������ ����"
 
-#: 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
 #, fuzzy, 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 "������ ������ �����ϴ�: %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"
@@ -25762,23 +26067,19 @@ msgstr ""
 "������ ������ ���� �� �����ϴ�:\n"
 "%s"
 
-#: 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"
@@ -25787,11 +26088,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 ""
 
-#: 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"
@@ -25800,22 +26101,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"
@@ -25824,11 +26125,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"
@@ -25837,17 +26138,17 @@ msgstr ""
 "%s��(��) ��������.\n"
 "%s��(��) �����մϴ�"
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, fuzzy, 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"
@@ -25856,63 +26157,63 @@ 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
 #, fuzzy
 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 "���� ����"
 
-#: 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"
@@ -25921,158 +26222,162 @@ 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
 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 "������ �����Ͻʽÿ�."
+
+#: 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
-#, fuzzy, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
-
-#: shell/e-shell-startup-wizard.c:169
-#, fuzzy
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "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 "���� �����"
 
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
 #, fuzzy
 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
+#: shell/e-shell-utils.c:129
 #, fuzzy
-msgid "Folder name cannot contain slashes."
+msgid "Folder name cannot contain the character \"/\"."
 msgstr ""
 "%s ���丮�� ������ ���� �����ϴ�:\n"
 "%s"
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr ""
+"%s ���丮�� ������ ���� �����ϴ�:\n"
+"%s"
+
+#: 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 "���� ������ ����: %s: %s"
 
-#: shell/e-shell-view-menu.c:196
-msgid "Bug buddy was not found in your $PATH."
-msgstr "�ý����� ��ο� Bug buddy�� ã�� �� �����ϴ�."
+#: 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 "Ximian 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
 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 "�¶��� �۾�(_W)"
 
-#: 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 "�������� �۾�(_W)"
 
-#: 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 ""
@@ -26085,12 +26390,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: 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"
@@ -26098,150 +26403,144 @@ 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
-#, 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'�׷���\n"
 "������ ����ðڽ��ϱ�?"
 
-#: 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 "���� ������(_S)"
 
-#: 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 "ū ������(_L)"
 
-#: 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 "�� �׷�(_N)..."
 
-#: 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 "�� �׷��� ����(_R)..."
 
-#: 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 "�� �׷� �̸��ٲ�(_N)..."
 
-#: 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 "�ٷΰ��� ���� ���߱�(_H)"
 
-#: 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 "�� ��� ����(_W)"
 
-#: 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 "�̸��ٲ�(_R)"
 
-#: 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 "����(_M)"
 
-#: 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 "�ٷΰ���"
 
@@ -26250,75 +26549,75 @@ 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
 #, fuzzy
 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 "������ ������ �����ϴ�: %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 "%s (%d%% �Ϸ�)"
 
-#: shell/evolution-folder-selector-button.c:94
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<������ �������� ���� ��������>"
 
@@ -26351,92 +26650,88 @@ msgid ""
 "%s"
 msgstr ""
 
-#: 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
 #, fuzzy
 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
 #, fuzzy
 msgid "No owner"
 msgstr "(�̸� ����)"
 
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1192
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Exists"
 msgstr "����(_x)"
 
-#: 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
 #, fuzzy
 msgid "Has subfolders"
 msgstr "%s���� ������ ����"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1212
 #, fuzzy
 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
+#: shell/evolution-test-component.c:703
 #, fuzzy
-msgid "Active connections"
-msgstr "���� ����"
+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 ""
 
-#: 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 ""
 
@@ -26456,15 +26751,15 @@ msgstr "����(_M):"
 msgid "_Tasks:"
 msgstr "�۾�(_T):"
 
-#: 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 "���� ���� ���� �����ϼ���:"
 
@@ -26484,37 +26779,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 "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
 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
@@ -26548,41 +26843,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 "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"
@@ -26592,7 +26888,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:250
+#: shell/main.c:290
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -26600,69 +26896,106 @@ msgstr ""
 "�������ϴ�\n"
 "Ximian 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
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution ���� ������ �� �����ϴ�."
 
-#: shell/main.c:403
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution ���� �ʱ�ȭ �� �� �����ϴ�: %s"
 
-#: 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
 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�� �� ���� �����ϴ�:\n"
+"%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..."
@@ -26756,7 +27089,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)"
 
@@ -26875,7 +27208,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 "����"
 
@@ -26902,7 +27235,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)"
 
@@ -27155,7 +27488,7 @@ msgstr "������ �޼��� ���"
 msgid "_Expunge"
 msgstr "����(_E)"
 
-#: 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)"
 
@@ -27410,8 +27743,9 @@ msgid "Post a Reply"
 msgstr "���� ��ġ��"
 
 #: ui/evolution-mail-message.xml.h:63
-msgid "Post a reply to a message message in a Public folder"
-msgstr ""
+#, fuzzy
+msgid "Post a reply to a message in a Public folder"
+msgstr "�޼����� ������ ����"
 
 #: ui/evolution-mail-message.xml.h:64
 #, fuzzy
@@ -27569,7 +27903,7 @@ msgstr "�ο�(_Q)"
 msgid "_Resend..."
 msgstr "�ٽ� ����(_R)..."
 
-#: 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)"
 
@@ -27584,12 +27918,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)"
 
@@ -27597,6 +27931,10 @@ msgstr "����(_V)"
 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 "���� ���� ����"
@@ -27765,7 +28103,7 @@ msgstr "HTML(_T)"
 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)"
 
@@ -27945,125 +28283,115 @@ msgid "Pi_lot Settings..."
 msgstr "���Ϸ� ����(_L)..."
 
 #: ui/evolution.xml.h:27
-#, fuzzy
-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
-#, fuzzy
-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 "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 "���� ����(_B)"
 
-#: 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 "Ximian Evolution ���� ������"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 msgid "_About Ximian Evolution..."
 msgstr "Ximian Evolution��(_A)..."
 
-#: 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 "���� ����(_F)"
 
-#: 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
 #, fuzzy
 msgid "_Remove Other User's Folder"
 msgstr "�ٸ� ����� ���� ����(_U)..."
 
-#: 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 "�ٷΰ��� ����(_S)"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 msgid "_Shortcut..."
 msgstr "�ٷΰ���(_S)..."
 
@@ -28140,9 +28468,8 @@ msgstr "�з�"
 msgid "_Tasks"
 msgstr "�۾�(_T)"
 
-#. 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"
 
@@ -28165,20 +28492,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 "���� ����(_C)"
 
 #. 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 "���� ����"
 
@@ -28189,19 +28516,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 "%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 "����"
 
-#: 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"
@@ -28210,81 +28537,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 "���� ���ڵ�"
 
@@ -28292,11 +28619,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 "� ����"
 
@@ -28312,64 +28640,372 @@ msgstr "����� ã�� ��ġ��(_E)..."
 msgid "_Advanced..."
 msgstr "����(_A)..."
 
-#: 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 "�(_S)"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:537
 msgid "_Find Now"
 msgstr "���� �(_F)"
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 msgid "_Clear"
 msgstr "���(_C)"
 
-#: 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 "Evolution �ּҷ� minicard ����"
 
-#: 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"
-msgstr "setup_vfs(): GNOME-VFS�� �ʱ�ȭ �� �� �����ϴ�"
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Evolution �ּҷ� minicard ����"
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "LDIF������ Evolution���� �����ɴϴ�"
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "VCard ������ Evolution���� �����ɴϴ�"
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "����ó�� ó���ϴ� Evolution ������Ʈ"
+
+#~ msgid "<- _Remove"
+#~ msgstr "<- �����(_R)"
+
+#, fuzzy
+#~ msgid "<< Fewer Options"
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "Evolution Attribute"
+#~ msgstr "Evolution �˸�"
+
+#, fuzzy
+#~ msgid "Mappings"
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "Select"
+#~ msgstr "���� ����"
+
+#~ msgid "_Add ->"
+#~ msgstr "���ϱ�(_A) ->"
+
+#, fuzzy
+#~ msgid "_Always"
+#~ msgstr "�˷���ī"
+
+#, fuzzy
+#~ msgid "_Delete Mapping"
+#~ msgstr "��� ����(_D)"
+
+#, fuzzy
+#~ msgid "_Edit Mapping"
+#~ msgstr "��� ����(_E)"
+
+#, fuzzy
+#~ msgid "_Evolution attribute:"
+#~ msgstr "Evolution �˸�"
+
+#, fuzzy
+#~ msgid "_More Options >>"
+#~ msgstr "����(_O)"
+
+#~ msgid "account-druid"
+#~ msgstr "���� ������"
+
+#~ msgid "account-editor"
+#~ msgstr "���� ������"
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr "�ּҷ� �̸� ���� �������̽��� ���� ���丮"
+
+#~ msgid "Edit Contact List"
+#~ msgstr "����ó ��� ��ġ��"
 
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): �׳��� �ʱ�ȭ �� �� �����ϴ�"
+#~ msgid "Unnamed Contact List"
+#~ msgstr "�̸����� ����ó ���"
 
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d�� ������ ����)"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "����ó(_O)..."
+
+#~ msgid "Phone Types"
+#~ msgstr "��ȭ ����"
+
+#~ msgid "Delete Contact?"
+#~ msgstr "����ó�� ������?"
+
+#, fuzzy
+#~ msgid "Display Cards?"
+#~ msgstr "ǥ��"
+
+#, fuzzy
+#~ msgid "Display Cards"
+#~ msgstr "ǥ��"
+
+#~ msgid "Alarm notification service"
+#~ msgstr "�˶� ���"
+
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "�׳��� �ʱ�ȭ �� �� �����ϴ�"
+
+#, 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 "Bonobo�� �ʱ�ȭ �Ҽ� �����ϴ�"
+
+#, fuzzy
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Evolution���� ������ �������Ƿ��� \"��������\"�� ��������."
+
+#, fuzzy
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "VCard ������ Evolution���� �����ɴϴ�"
+
+#, fuzzy
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "VCard ������ Evolution���� �����ɴϴ�"
+
+#, fuzzy
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr ""
+#~ "�޼����� ������ ����: %2$s �������� %1$s\n"
+#~ "  %3$s"
+
+#, fuzzy
+#~ msgid "Can't call getFolderAtPath on storage: %s"
+#~ msgstr "KPOP �������� �����Ҽ� ����: %s"
+
+#~ msgid "Warning!"
+#~ msgstr "���!"
+
+#~ msgid ""
+#~ "Could not create composer window, because you have not yet\n"
+#~ "configured any identities in the mail component."
+#~ msgstr ""
+#~ "���� �Ż� ������ �Է��� �Ǿ����� �ʾұ⶧����\n"
+#~ "�޽��� �ۼ�â�� ���� ���� �����ϴ�."
+
+#, 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 "Warning: Unsent Messages"
+#~ msgstr "���޵� �޽���"
+
+#, fuzzy
+#~ 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 "Factory to import mbox into Evolution"
+#~ msgstr "mbox���� Evolution���� �������� ���丮"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "mbox������ Evolution���� �����ɴϴ�"
+
+#, fuzzy
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
+
+#~ msgid "Really delete account?"
+#~ msgstr "������ ������ ����ڽ��ϱ�?"
+
+#, fuzzy
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "������ �������� �޼����� ǥ���մϴ�"
+
+#~ msgid "Add Signature"
+#~ msgstr "���� ����"
+
+#~ msgid "Account %d"
+#~ msgstr "���� %d"
+
+#~ msgid "On Screen fonts"
+#~ msgstr "ȭ�� �۲�"
+
+#~ msgid "Spell Checking Language"
+#~ msgstr "����� �˻� ���"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "������(_F):"
+
+#~ msgid "_Variable-width:"
+#~ msgstr "������(_V):"
+
+#~ 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 "Factory for the Evolution Summary component."
+#~ msgstr "Evolution ��� ������Ұ� �ʱ�ȭ ���� �ʾҽ��ϴ�."
+
+#~ msgid "Evolution installation"
+#~ msgstr "Evolution ��ġ"
+
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr "������ ��ġ�ҷ��� \"Ȯ��\", �������� \"���\"�� ��������."
+
+#, fuzzy
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s ���丮�� ������ ���� �����ϴ�:\n"
+#~ "%s"
+
+#~ msgid "New..."
+#~ msgstr "���� �����..."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
+
+#, fuzzy
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
+
+#~ msgid "Bug buddy was not found in your $PATH."
+#~ msgstr "�ý����� ��ο� Bug buddy�� ã�� �� �����ϴ�."
+
+#~ msgid "Don't remove"
+#~ msgstr "������������"
+
+#, fuzzy
+#~ msgid "Active connections"
+#~ msgstr "���� ����"
+
+#~ msgid "Host"
+#~ msgstr "ȣ��Ʈ"
+
+#~ msgid "Cannot initialize the Bonobo component system."
+#~ msgstr "���뺸 ������Ʈ �ý����� �ʱ�ȭ �� �� �����ϴ�."
+
+#~ msgid "Output File"
+#~ msgstr "��� ����"
+
+#, fuzzy
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "���Ϸ� ����..."
+
+#, fuzzy
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "���Ϸ��� �����մϴ�"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "���ο� �ּҷ� ����"
+
+#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
+#~ msgstr "setup_vfs(): GNOME-VFS�� �ʱ�ȭ �� �� �����ϴ�"
+
+#~ msgid "init_corba(): could not initialize GNOME"
+#~ msgstr "init_corba(): �׳��� �ʱ�ȭ �� �� �����ϴ�"
+
+#~ msgid "init_bonobo(): could not initialize Bonobo"
+#~ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 
 #, fuzzy
 #~ msgid "_Configure..."
@@ -28403,9 +29039,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "Copy selected messages"
 #~ msgstr "������ �޼����� �����մϴ�"
 
-#~ msgid "Cut selected messages"
-#~ msgstr "������ �޼����� �ڸ��ϴ�"
-
 #, fuzzy
 #~ msgid "Scanning for new messages"
 #~ msgstr "�޽������� ����"
@@ -28420,8 +29053,5 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "%u bytes"
 #~ msgstr "%u ����Ʈ"
 
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Evolution �������� �����"
-
 #~ msgid "_Preferences..."
 #~ msgstr "�⺻ ����(_P)..."
diff --git a/po/lt.po b/po/lt.po
index c78faf09b6..462334975e 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 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-10-28 22:33+0200\n"
 "Last-Translator: Gediminas Paulauskas <menesis@delfi.lt>\n"
 "Language-Team: Your language <komp_lt@konferencijos.lt>\n"
@@ -13,42 +13,52 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\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 "Gamykla importuoti VCard byloms � Evolution."
+msgid "Evolution LDIF importer"
+msgstr "Evolution importavimo pad�j�jas"
+
+#: 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
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
 #, fuzzy
-msgid "Imports LDIF files into Evolution."
-msgstr "Importuoja VCard bylas � Evolution."
+msgid "Evolution VCard Importer"
+msgstr "Evolution pa�to ra�ykl�."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Gamykla importuoti VCard byloms � Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution pa�to ra�ykl�."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importuoja VCard bylas � 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 "Saugoti kaip"
 
 #: 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 "Vardas"
 
 #: 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 "El. pa�tas"
 
 #: 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 "Pagrindinis"
 
@@ -58,16 +68,17 @@ msgstr "Pagr"
 
 #: 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 "Asistento"
 
 #: 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 "Darbo"
 
@@ -77,12 +88,12 @@ msgid "Bus"
 msgstr "Darb"
 
 #: 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 "Atsakiklis"
 
 #: 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 "Kompanijos"
 
@@ -93,12 +104,13 @@ msgstr "Komp"
 #: 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 "Nam�"
 
 #: 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 "Organizacija"
@@ -109,18 +121,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 "Mobilus"
 
 #: 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 "Automobilinis"
 
 #: 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 "Darbo faksas"
@@ -130,13 +142,13 @@ msgid "Bus Fax"
 msgstr "Darb 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 "Nam� faksas"
 
 #: 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 "Darbo 2"
 
@@ -145,43 +157,43 @@ msgid "Bus 2"
 msgstr "Darb 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 "Nam� 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 "Kitas"
 
 #: 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 "Kitas faksas"
 
 #: 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 "Ie�kas"
 
 #: 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 "Teleksas"
@@ -192,15 +204,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 "El. pa�tas 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 "El. pa�tas 3"
@@ -224,6 +236,7 @@ msgid "Dep"
 msgstr "Dep"
 
 #: 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 "Ofisas"
@@ -233,6 +246,7 @@ msgid "Off"
 msgstr "Ofis"
 
 #: 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 "Titulas"
@@ -247,6 +261,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: 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 "Vadybininkas"
@@ -260,6 +275,7 @@ msgid "Ass"
 msgstr "Asist"
 
 #: 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 "Pravard�"
@@ -269,16 +285,19 @@ msgid "Nick"
 msgstr "Prav"
 
 #: 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 "Sutuoktinis"
 
 #: 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 "Pastaba"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr "Kalendoriaus URI"
 
@@ -296,309 +315,400 @@ msgid "FBUrl"
 msgstr "LUUrl"
 
 #: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "Default server calendar"
+msgstr "I�saugoti kalendori�"
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "icsCalendar"
+msgstr "Kalendorius"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
 msgid "Anniversary"
 msgstr "Jubiliejus"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Jubil"
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "Gimimo data"
 
-#: 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 "Kategorijos"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Pavard�"
 
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:335
+#, fuzzy
+msgid "ECard"
+msgstr "Automobilinis"
+
+#: 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
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Bevardis kontakt� s�ra�as"
 
-#: addressbook/backend/ebook/e-card.c:2683
-msgid "Multiple VCards"
-msgstr "Keletas VCard korteli�"
+#: 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 "Pilnas vardas"
 
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
-msgstr "%s VCard"
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "_Adresas:"
+
+#: addressbook/backend/ebook/e-card.c:1328
+#, fuzzy
+msgid "Address Label"
+msgstr "Adres� kortel�s"
+
+#: addressbook/backend/ebook/e-card.c:1335
+#, fuzzy
+msgid "Phone"
+msgstr "Joks"
+
+#: addressbook/backend/ebook/e-card.c:1349
+#, fuzzy
+msgid "Birth date"
+msgstr "Gimimo data"
+
+#: 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 "Organizacija"
+
+#: 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 "Rol�"
 
-#: 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"
+"Pa�to programa: "
+
+#: addressbook/backend/ebook/e-card.c:1445
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "_Laisvas-u�si�m�s URL"
+
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Kalendorius"
+
+#: addressbook/backend/ebook/e-card.c:1466
+#, fuzzy
+msgid "Related Contacts"
+msgstr "I�trinti kontakt�?"
+
+#: addressbook/backend/ebook/e-card.c:1480
+#, fuzzy
+msgid "Category List"
+msgstr "Kategorija yra"
+
+#: 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�ra�as"
+
+#: addressbook/backend/ebook/e-card.c:1508
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "Kitas adresas"
+
+#: addressbook/backend/ebook/e-card.c:1515
+#, fuzzy
+msgid "Arbitrary"
+msgstr "Pagrindinis"
+
+#: addressbook/backend/ebook/e-card.c:1522
+#, fuzzy
+msgid "ID"
+msgstr "I"
+
+#: addressbook/backend/ebook/e-card.c:1529
+#, fuzzy
+msgid "Last Use"
+msgstr "�d�ti"
+
+#: addressbook/backend/ebook/e-card.c:1540
+#, fuzzy
+msgid "Use Score"
+msgstr "�vertis"
+
+#: 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 "Negal�jau inicializuoti 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 "Ie�koma..."
 
-#: addressbook/backend/pas/pas-backend-file.c:366
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr "�keliama..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:687
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+#, fuzzy
+msgid "Using Distinguished Name (DN)"
+msgstr "S�ra�o _vardas:"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "El. pa�to adresas:"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Jungiamasi prie LDAP serverio..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1230
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr "Pridedama kortel� � LDAP server�..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1336
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr "Pa�alinama kortel� i� LDAP serverio..."
 
-#: 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 "Taisoma kortel� LDAP serveryje..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2889
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "Gaunami LDAP paie�kos rezultatai..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2998
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 #, fuzzy
 msgid "Error performing search"
 msgstr "Klaida pa�alinant kortel�"
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:294
 #, fuzzy
 msgid "Default Sync Address:"
 msgstr "El. pa�to adresas:"
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Nepavyko �kelti �ymeklio\n"
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EBook ne�kelta\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 "Negal�jau paleisti wombat serverio"
 
-#: 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 "Negal�jau paleisti 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 "Nepavyko perskaityti piloto Address programos bloko"
 
-#: 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."
+#: 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:3
-msgid "A sample Bonobo control which displays an addressbook."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 #, fuzzy
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr "Evolution adres� knygel�s komponento gamykla."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Configure access to LDAP directory servers here"
-msgstr ""
+msgid "Evolution Addressbook"
+msgstr "Redaguoti adres� knygel�"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #, fuzzy
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Evolution adres� knygel�s konduito konfig�ravimo �rankis\n"
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "_Adres� knygel�s konfig�ravimas..."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Directory Servers"
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Adres� knygel�s adreso ???? gamykla"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Evolution Addressbook minicard viewer"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
 msgstr "Evolution adres� knygel�s ma�� korteli� vaizduokl�"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Evolution kontakt� tvarkymo komponentas."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Adres� knygel�s adreso vaizduokl�s gamykla"
-
-#: 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 "Adres� knygel�s adreso ???? gamykla"
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adres� knygel�s ma�� korteli� vaizduokl�"
 
-#: 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 adres� knygel�s komponento gamykla."
+msgid "Evolution Addressbook component"
+msgstr "Evolution adres� knygel�s ma�� korteli� vaizduokl�"
 
-#: 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 "Evolution adres� knygel�s ma�� korteli� vaizduokl�"
 
-#: 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 "Kontaktai"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:76
 msgid "Folder containing contact information"
 msgstr "Aplankas, kuriame laikoma kontakt� informacija"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP Server"
 msgstr "LDAP serveris"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP server containing contact information"
 msgstr "LDAP serveris, kuriame laikoma kontakt� informacija"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public Contacts"
 msgstr "Kontaktai"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public folder containing contact information"
 msgstr "Aplankas, kuriame laikoma kontakt� informacija"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Naujas kontaktas"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_Kontaktas"
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Sukurti nauj� kontakt�"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Naujas kontakt� s�ra�as"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "Kontakt� _s�ra�as"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:569
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Sukurti nauj� kontakt� s�ra��"
 
-#: addressbook/gui/component/addressbook-config.c:197
+#: addressbook/gui/component/addressbook-config.c:206
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "Negal�jau prisijungti prie LDAP serverio."
 
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 "Negal�jau autentikuotis � IMAP server�.\n"
 "%s\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 serverio atsakyme nebuvo %s informacijos"
 
-#: addressbook/gui/component/addressbook-config.c:1176
+#: addressbook/gui/component/addressbook-config.c:1215
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Klaida, �keliant filtro informacij�:\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 serverio atsakyme nebuvo %s informacijos"
 
-#: addressbook/gui/component/addressbook-config.c:1630
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr "S�skaitos vardas"
 
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr "Serverio vardas"
 
-#: 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 "Negal�jau inicializuoti gnome-vfs"
+#: addressbook/gui/component/addressbook-config.c:1676
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
 msgid "Other Contacts"
 msgstr "Kiti kontaktai"
 
-#: addressbook/gui/component/addressbook.c:474
-msgid "Unable to open addressbook"
-msgstr "Negaliu atidaryti adres� knygel�s"
-
-#: 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."
@@ -606,7 +716,7 @@ msgstr ""
 "Mes negal�jome atidaryti �ios adres� knygel�s. Pra�om patikrinti, ar\n"
 "kelias egzistuoja ir ar turi teises j� pasiekti."
 
-#: addressbook/gui/component/addressbook.c:490
+#: addressbook/gui/component/addressbook.c:522
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -617,7 +727,7 @@ msgstr ""
 "kad arba tu �vedei neteising� URI, arba tavo LDAP serveris\n"
 "neveikia"
 
-#: 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"
@@ -629,7 +739,7 @@ msgstr ""
 "tu turi sukompiliuoti program� i� CVS �altinio, prie� tai\n"
 "parsisiunt�s OpenLDAP i� �emiau esan�io adreso.\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"
@@ -640,50 +750,53 @@ msgstr ""
 "kad arba tu �vedei neteising� URI, arba tavo LDAP serveris\n"
 "neveikia"
 
-#. 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 "Negaliu atidaryti adres� knygel�s"
+
+#: 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 ""
 "Negal�jau autentikuotis � IMAP server�.\n"
 "%s\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 "�vesk %s slapta�od� (vartotojas %s)"
 
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:813
 #, fuzzy
 msgid "Name begins with"
 msgstr "baigiasi su"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:814
 #, fuzzy
 msgid "Email begins with"
 msgstr "baigiasi su"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorija yra"
 
 #. 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 "Bet kuris laukas turi savyje"
 
-#: addressbook/gui/component/addressbook.c:786
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "I�sami..."
 
-#: 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 +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"
@@ -699,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 "Bet kuri kategorija"
 
-#: addressbook/gui/component/addressbook.c:1132
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, kur� rodys Aplank� nar�ykl�"
 
@@ -726,138 +839,125 @@ msgstr "URI, kur� rodys Aplank� nar�ykl�"
 #. * 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 "(jokio)"
 
-#: 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 "Pagrindinis el. pa�tas"
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Pasirink veiksm�"
 
-#: 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 "Sukurti nauj� 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 "Prid�ti adres� prie esan�io kontakto �%s�"
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "U�klausiama adres� knygel�..."
 
-#: 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 "Keisti kontakto informacij�"
 
-#: 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 "Prid�ti prie kontakt�"
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "�lieti el. pa�to adres�"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "U�drausti u�klausas"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Leisti u�klausas (Pavojinga!)"
 
 #: 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 " _Patikrinti, kokie tipai palaikomi"
 
-#: 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
 msgid "1:00"
 msgstr ""
 
-#: 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 " _Pa�alinti"
+msgid "Add LDAP Server"
+msgstr "LDAP serveris"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Parinktys"
-
-#: 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 "Adres� knygel�s �altinis"
 
-#: 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 "Persp�jimai"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Anonymously"
 msgstr "Anoniminis"
 
-#: 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"
@@ -866,80 +966,61 @@ msgid ""
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Connecting"
 msgstr "V�l jungiamasi prie %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 "Prisitaikyti"
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "Pa�a_linti"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "S�ra�o _vardas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid "Edit LDAP Server"
+msgstr "LDAP serveris"
+
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Email Address:"
 msgstr "El. pa�to adresas:"
 
-#: 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 "Evolution naudos �� el. pa�to adres� autentikuotis � pa�to server�"
 
-#: 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 naudos �� el. pa�to adres� autentikuotis � pa�to server�"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Finished"
 msgstr "Rast_i"
 
-#: 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 "Esm�"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-#, fuzzy
-msgid "LDAP Attribute"
-msgstr "LDAP autentikacija"
-
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "LDAP Configuration Assistant"
 msgstr "Konfig�ravimas"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#, fuzzy
-msgid "Mappings"
-msgstr "Para�t�s"
-
-#: 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 "_kas"
 
-#: 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 +1030,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 "One"
 
-#: 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 "Paie�kos _sritis: "
 
 #. 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 "Ie�koma"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
-#, fuzzy
-msgid "Select"
-msgstr "Pa�ym�ti visus"
-
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Selected:"
 msgstr "I�trintas"
 
-#: 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 +1069,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 +1078,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 "�altinio informacija"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Jungiamasi prie serverio..."
 
-#: 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 "Nepalaikoma schema"
 
-#: 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 +1126,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 +1135,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 +1143,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 +1163,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 +1193,7 @@ msgstr ""
 "�is vardas bus naudojamas nurodyti tavo s�skaitai. Jis skirtas tiktai "
 "vaizdavimui."
 
-#: 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 +1201,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 "El. pa�to adresas:"
 
-#: 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 "_Prid�ti"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-#, fuzzy
-msgid "_Add ->"
-msgstr "Prid�ti"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-#, fuzzy
-msgid "_Add Mapping"
-msgstr "Prid�ti veiksm�"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-#, fuzzy
-msgid "_Add to DN"
-msgstr "Prid�ti veiksm�"
-
-#: addressbook/gui/component/ldap-config.glade.h:112
-#, fuzzy
-msgid "_Always"
-msgstr "Persp�jimai"
-
-#: addressbook/gui/component/ldap-config.glade.h:113
-#, fuzzy
-msgid "_Delete Mapping"
-msgstr "_I�trinti visk�"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "_Display name:"
 msgstr "Vaiz_davimas"
 
-#: 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,210 +1250,153 @@ msgstr ""
 msgid "_Edit"
 msgstr "K_eisti"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-#, fuzzy
-msgid "_Edit Mapping"
-msgstr "K_eisti �vyk�"
-
-#: 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 "_Parinktys"
-
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:91
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Prievadas:"
 
-#: 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 "Paie�kos _pagrindas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "_Serverio vardas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "U�tildymo laikas (minut�mis)"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
-#, fuzzy
-msgid "account-druid"
-msgstr "S�skaita"
-
-#: 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 "N�ra korteli�"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "connecting-tab"
 msgstr "V�l jungiamasi prie %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 "Esm�"
 
-#: 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 "Ie�koma"
 
-#: 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 adres� knygel�s vard� pasirinkimo s�saja."
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Adres� knygel�s vard� pasirinkimo s�sajos gamykla"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Pa�alinti visus"
 
 #. 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 "Pa�alinti"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
-msgid "Remove All"
-msgstr "Pa�alinti visus"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+msgstr "Naujas kontakt� s�ra�as"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact Info"
+msgstr "Keisti kontakto informacij�"
 
-#: 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 "Si�sti HTML pa�t�?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:405
-msgid "Edit Contact List"
-msgstr "Taisyti kontakt� s�ra��"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:423
-msgid "Unnamed Contact List"
-msgstr "Bevardis kontakt� s�ra�as"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:440
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d nerodom�)"
-
-#: 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 "Bevardis kontaktas"
 
-#: 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 "�altinis"
+
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr "Pasirinkti kontaktus i� adres� knygel�s"
 
-#: 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 "Rasti kontakt�"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Find"
+msgstr "Rasti:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "Pasirink vardus"
 
-#: 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 "I�trinti 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 "Kontaktai"
 
-#: 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 "_Kategorija:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr "_Aplankas:"
 
-#: 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 "_Asistento vardas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 #, fuzzy
 msgid "Add_ress..."
 msgstr "_Adresas..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr "_Jubiliejus:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 #, fuzzy
 msgid "Birthda_y:"
 msgstr "_Gimtadienis:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
-msgstr "K_ontaktai..."
-
 #: 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_tegorijos..."
@@ -1469,7 +1407,7 @@ msgstr "Bendradarbiavimas"
 
 #. 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 "Kontakt� redaktorius"
 
@@ -1479,7 +1417,7 @@ msgid "D_epartment:"
 msgstr "_Departamentas:"
 
 #: 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 "Detal�s"
 
@@ -1523,1144 +1461,1193 @@ msgstr "Organi_zacija:"
 msgid "P_rofession:"
 msgstr "_Profesija:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr "Telefon� tipai"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "S_pouse:"
 msgstr "S_utuoktinis:"
 
-#: 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 "_Tai yra pa�to siuntimo adresas"
 
-#: 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 "Nori gauti _HTML lai�kus"
 
-#: 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 "_I�trinti"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "_Pareigos:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr "_Vadybininko vardas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "_Slapyvardis:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_Ofisas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Public Calendar URL:"
 msgstr "_Vie�o kalendoriaus URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Web page address:"
 msgstr "_Tinklapio adresas:"
 
-#: 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 "�jungti"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr "Jungtin�s Valstijos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Afghanistan"
 msgstr "Afganistanas"
 
-#: 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 "Albanija"
 
-#: 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�yras"
 
-#: 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 "Andora"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 "Arm�nija"
 
-#: 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 "Australija"
 
-#: 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 "Austrija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Azerbaijan"
 msgstr "Azerbaid�anas"
 
-#: 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 "Bahamai"
 
-#: 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 "Bahreinas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bangladesh"
 msgstr "Banglade�as"
 
-#: 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 "Gudija"
 
-#: 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 "Belgija"
 
-#: 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 "Belizas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Benin"
 msgstr "Beninas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bermuda"
 msgstr "Bermudai"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bhutan"
 msgstr "Butanas"
 
-#: 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 "Bolivija"
 
-#: 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 "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 ""
 
-#: 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 "Brazilija"
 
-#: 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 "Bulgarija"
 
-#: 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 "Burundis"
 
-#: 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 "Kamer�nas"
 
-#: 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 "�aliasis ky�ulys"
 
-#: 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 "Centrin� Afrikos respublika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Chad"
 msgstr "�adas"
 
-#: 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 "�il�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "China"
 msgstr "Kinija"
 
-#: 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 "Kal�d� sala"
 
-#: 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 "Kolumbija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Comoros"
 msgstr "Komorai"
 
-#: 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 "Kongas"
 
-#: 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 "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 ""
 
-#: 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 "Kroatija"
 
-#: 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 "Kipras"
 
-#: 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 "�ekija"
 
-#: 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 "Danija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Djibouti"
 msgstr "D�ibutis"
 
-#: 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 "Dominikon� respublika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr "Ryt� Timoras"
 
-#: 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 "Ekvadoras"
 
-#: 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 "Egiptas"
 
-#: 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 "Pusiaujo Gvin�ja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Eritr�ja"
 
-#: 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 "Estija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Etiopija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "Folklendo salos"
 
-#: 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 "Fid�is"
 
-#: 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 "Suomija"
 
-#: 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 "Pranc�zija"
 
-#: 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 "Gabonas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Gambija"
 
-#: 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 "Gruzija"
 
-#: 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 "Vokietija"
 
-#: 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 "Gibraltaras"
 
-#: 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 "Graikija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Grenlandija"
 
-#: 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 "Gvadelup�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Guamas"
 
-#: 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 "Gvatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guinea"
 msgstr "Gvin�ja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea-bissau"
 msgstr "Bisau Gvin�ja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guyana"
 msgstr "Gajana"
 
-#: 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 "Haitis"
 
-#: 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 "�ventoji j�ra"
 
-#: 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 "Hond�ras"
 
-#: 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 "Honkongas"
 
-#: 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 "Vengrija"
 
-#: 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 "Islandija"
 
-#: 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 "Indija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Indonesia"
 msgstr "Indonezija"
 
-#: 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 "Airija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Izraelis"
 
-#: 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 "Italija"
 
-#: 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 "Japonija"
 
-#: 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 "Jordanas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kazachstanas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Kenija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Kiribatis"
 
-#: 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 "Kor�jos respublika"
 
-#: 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 "Kuveitas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kyrgyzstan"
 msgstr "Kirgistanas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Laos"
 msgstr "Laosas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Latvia"
 msgstr "Latvija"
 
-#: 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 "Liberija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liechtenstein"
 msgstr "Lichten�teinas"
 
-#: 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 "Lietuva"
 
-#: 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 "Liuksemburgas"
 
-#: 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 "Makedonija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Madagascar"
 msgstr "Madagaskaras"
 
-#: 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 "Malaizija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Maldives"
 msgstr "Maldyvai"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mali"
 msgstr "Malis"
 
-#: 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�alo salos"
 
-#: 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 "Mauritanija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Mauritius"
 msgstr "Mauricijus"
 
-#: 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 "Meksika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Micronesia"
 msgstr "Mikronezija"
 
-#: 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 "Monakas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mongolia"
 msgstr "Mongolija"
 
-#: 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 "Marokas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mozambique"
 msgstr "Mozambikas"
 
-#: 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 "Namibija"
 
-#: 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 "Nepalas"
 
-#: 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 "Olandija"
 
-#: 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 "Naujoji Kaledonija"
 
-#: 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 "Naujoji Zelandija"
 
-#: 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 "Nikaragva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Niger"
 msgstr "Nigeris"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nigeria"
 msgstr "Nigerija"
 
-#: 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 "Norfolko sala"
 
-#: 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 "Norvegija"
 
-#: 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 "Omanas"
 
-#: 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 "Pakistanas"
 
-#: 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 "Palestinos teritorija"
 
-#: 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 Naujoji Gvin�ja"
 
-#: 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 "Paragvajus"
 
-#: 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 "Filipinai"
 
-#: 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 "Lenkija"
 
-#: 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 "Portugalija"
 
-#: 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 Rikas"
 
-#: 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 "Kvataras"
 
-#: 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 "Rumunija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Russian Federation"
 msgstr "Rusijos Federacija"
 
-#: 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 ""
 
-#: 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 "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 Marinas"
 
-#: 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 "Saudo Arabija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Senegal"
 msgstr "Senegalas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Seychelles"
 msgstr "Sei�eliai"
 
-#: 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 Leon�"
 
-#: 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 "Singap�ras"
 
-#: 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 "Slovakija"
 
-#: 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 "Slov�nija"
 
-#: 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 "Somalis"
 
-#: 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 "Piet� Afrikos respublika"
 
-#: 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 "Ispanija"
 
-#: 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 "�v .Elena"
 
-#: 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 "Sudanas"
 
-#: 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 "Surinamas"
 
-#: 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 "Svazilendas"
 
-#: 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 "�vedija"
 
-#: 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 "�veicarija"
 
-#: 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 "Taivanas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tajikistan"
 msgstr "Tad�ikistanas"
 
-#: 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 "Tailandas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Togo"
 msgstr "Togas"
 
-#: 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 "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 "Trinidadas ir Tobagas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tunisia"
 msgstr "Tunisas"
 
-#: 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 "Turkija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Turkmenistan"
 msgstr "Turkm�nistanas"
 
-#: 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 "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 "Jungtiniai Arab� Emyratai"
 
-#: 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 "Jungtin� Karalyst�"
 
-#: 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 "Urugvajus"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uzbekistan"
 msgstr "Uzbekistanas"
 
-#: 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 "Venesuela"
 
-#: 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 "Vietnamas"
 
-#: 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 "Vakar� Sachara"
 
-#: 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 "Jemenas"
 
-#: 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 "Jugoslavija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Zambia"
 msgstr "Zambija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Zimbabwe"
 msgstr "Zimbabv�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Ar tu tikrai nori\n"
-"i�trinti �� kontakt�?"
+#: 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 "Tekstas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "I�trinti 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 "Automobilinis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:826
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
+#, fuzzy
+msgid "Is New Card"
+msgstr "Nauja"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
+#, fuzzy
+msgid "Writable Fields"
+msgstr "_Nuo laukas"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#, fuzzy
+msgid "Changed"
+msgstr "�adas"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 #, fuzzy
 msgid "Category editor not available."
 msgstr "N�ra jokios apra�ymo."
 
-#: 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 "�is kontaktas priklauso �ioms kategorijoms:"
 
-#: 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 "I�saugoti kaip 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 ""
+"Ar tu tikrai nori\n"
+"i�trinti �� kontakt�?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Ar tu tikrai nori\n"
+"i�trinti �� kontakt�?"
+
+#: 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 "Kontakto greitas prid�jimas"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr "Redaguoti vis�"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Pilnas vardas"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "E-mail"
 msgstr "El. pa�tas"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, fuzzy, c-format
+msgid "Error saving %s: %s"
+msgstr "Klaida i�saugant byl�: %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 "kortele.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:183
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 msgid "list"
 msgstr "s�ra�as"
 
-#: 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 +2656,147 @@ msgstr ""
 "%s jau egzistuoja.\n"
 "Ar nori �ra�yti vietoj jo?"
 
-#: 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 "U�ra�yti byl�?"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresas _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Patikrinti adres�"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Valst_yb�:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Adresas:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr "_Miestas:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_PO Box:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Valstija/Provincija:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_ZIP kodas:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Check Full Name"
 msgstr "Tikrinti piln� vard�"
 
-#: 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 "_Vardas:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Pavard�:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "Vi_durinis:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Gal�n�:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Titulas:"
 
-#: 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 "S�ra�o _vardas:"
 
-#: 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 "Nariai"
 
-#: 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 "�ra�yk el. pa�to adres� arba atitempk kontakt� � �emiau esant� s�ra��:"
 
-#: 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 "_Pasl�pti adresus siun�iant lai�kus �iam s�ra�ui"
 
-#: 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 "_Pa�alinti"
 
-#: 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 "Nauja"
+
 #. 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 "Kontakt� s�ra�o redaktorius"
 
-#: 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 "I�saugoti kaip VCard"
@@ -2867,276 +2851,297 @@ msgstr ""
 "Pakeistasis �io kontakto el. pa�tas ar vardas jau yra\n"
 "�iame aplanke. Ar nor�tum j� vis tiek prid�ti?"
 
-#: 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 "I�sami paie�ka"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr "Paie�ka"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr "N�ra korteli�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr "1 kortel�"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:152
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr "%d korteli�"
 
-#: 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 "Vokietija"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Klaida pradedant %s"
 
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#, fuzzy
+msgid "Model"
+msgstr "Mobilus"
+
 #: 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 "Klaida modifikuojant kortel�"
 
-#: 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 "S�km�"
 
-#: 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 "Ne�inoma klaida"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Saugykla atsijungta"
 
-#: 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 "Pri�jimas u�draustas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Kortel� nerasta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Kortel�s ID jau egzistuoja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protokolas nepalaikomas"
 
-#: 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 "Nutraukta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Autentikacija nepavyko."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Autentikacija b�tina"
 
-#: 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 "N�ra tokios bylos %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Kita klaida"
 
-#: 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 "Ar nori i�saugoti pakeitimus?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:77
+#, fuzzy
+msgid "_Discard"
+msgstr "Spausdinti kortel�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Klaida pridedant s�ra��"
 
-#: 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 "Klaida pridedant kortel�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:91
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Klaida modifikuojant s�ra��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Klaida pa�alinant s�ra��"
 
-#: 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 "Klaida pa�alinant kortel�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
-#, fuzzy
-msgid "Display Cards?"
-msgstr "Vaizdavimas"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-#, fuzzy
-msgid "Display Cards"
-msgstr "Vaizdavimas"
-
-#: 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 "N�ra korteli�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 #, fuzzy
 msgid "Copy card to"
 msgstr "N�ra korteli�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:353
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 #, fuzzy
 msgid "Move cards to"
 msgstr "N�ra korteli�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:355
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 #, fuzzy
 msgid "Copy cards to"
 msgstr "N�ra korteli�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "Keletas VCard korteli�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "%s 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 "Tipas"
+
+#: 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 "Adres� knygel�"
 
-#: 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 "I�saugoti kaip VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 #, fuzzy
 msgid "New Contact..."
 msgstr "Naujas kontaktas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Naujas kontakt� s�ra�as"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Eiti � aplank�..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 #, fuzzy
 msgid "Import..."
 msgstr "_Importuoti..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Ie�koti kontakt�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Adres� knygel�s �altiniai..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot nuostatos..."
 
-#: 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 "Persi�sti kontakt�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:815
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr "Si�sti lai�k� kontaktui"
 
-#: 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 "Spausdinti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr "Spausdinti vok�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Kopijuoti � aplank�..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Perkelti � aplank�..."
 
-#: 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 "I�kirpti"
 
-#: 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 "Kopijuoti"
 
-#: 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 "�d�ti"
 
-#: 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 "I�trinti"
 
-#: 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 "_Esamas vaizdas"
@@ -3145,7 +3150,7 @@ msgstr "_Esamas vaizdas"
 #. 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,�"
@@ -3154,12 +3159,12 @@ 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 ""
 ",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"
@@ -3227,20 +3232,61 @@ msgstr "Kitas telefonas"
 msgid "Primary Phone"
 msgstr "Pagrindinis telefonas"
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
 msgstr "ir %d kitoki� korteli�."
 
-#: addressbook/gui/widgets/e-minicard-control.c:187
+#: addressbook/gui/widgets/e-minicard-control.c:206
 msgid "and one other card."
 msgstr "ir viena kitokia kortel�."
 
-#: addressbook/gui/widgets/e-minicard-control.c:316
+#: addressbook/gui/widgets/e-minicard-control.c:318
 msgid "Save in addressbook"
 msgstr "I�saugoti adres� knygel�je"
 
-#: 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 "Plotis:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+#, fuzzy
+msgid "Height"
+msgstr "Auk�tis:"
+
+#: 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 "_Nuo laukas"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+#, fuzzy
+msgid "Field Name"
+msgstr "Pavard�"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+#, fuzzy
+msgid "Text Model"
+msgstr "Teksto _dydis"
+
+#: 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 "Kolumbija"
+
+#: addressbook/gui/widgets/e-minicard-view.c:141
 #, fuzzy
 msgid ""
 "\n"
@@ -3255,7 +3301,7 @@ msgstr ""
 "\n"
 "Dukart spragtel�k, kad sukurtum nauj� Kontakt�."
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 #, fuzzy
 msgid ""
 "\n"
@@ -3268,21 +3314,41 @@ msgstr ""
 "\n"
 "Dukart spragtel�k, kad sukurtum nauj� Kontakt�."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#: addressbook/gui/widgets/e-minicard-view.c:452
+#, fuzzy
+msgid "Adapter"
+msgstr "Andora"
+
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "I�trintas"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "U�duo�i� rikiavimas"
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Korteli� rodinys"
 
-#: 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 "Savait�s rodinys"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr "Spausdinti vok�"
 
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1130
 msgid "Print cards"
 msgstr "Spausdinti korteles"
 
-#: 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 "Spausdinti kortel�"
 
@@ -3356,7 +3422,6 @@ msgid "Include:"
 msgstr "�traukti:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Guls�ias lapas"
 
@@ -3376,17 +3441,16 @@ msgstr "Para�t�s"
 msgid "Number of columns:"
 msgstr "Stulpeli� skai�ius:"
 
-#: 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 "Parinktys"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Orientacija"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "Puslapis"
 
@@ -3402,9 +3466,7 @@ msgstr "Popierius"
 msgid "Paper source:"
 msgstr "Popieriaus �altinis:"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Sta�ias lapas"
 
@@ -3465,43 +3527,167 @@ msgstr "�_riftas..."
 msgid "Untitled appointment"
 msgstr "K_eisti �vyk�"
 
-#: 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-a"
+
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
+msgid "2nd"
+msgstr "2-a"
+
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
+msgid "3rd"
+msgstr "3-a"
+
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:478
+msgid "4th"
+msgstr "4-a"
+
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:478
+msgid "5th"
+msgstr "5-a"
+
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
+msgid "6th"
+msgstr "6-ta"
+
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
+msgid "7th"
+msgstr "7-ta"
+
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
+msgid "8th"
+msgstr "8-ta"
+
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:479
+msgid "9th"
+msgstr "9-ta"
+
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:479
+msgid "10th"
+msgstr "10-ta"
+
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
+msgid "11th"
+msgstr "11-ta"
+
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
+msgid "12th"
+msgstr "12-ta"
+
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
+msgid "13th"
+msgstr "13-ta"
+
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:480
+msgid "14th"
+msgstr "14-ta"
+
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:480
+msgid "15th"
+msgstr "15-ta"
+
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
+msgid "16th"
+msgstr "16-ta"
+
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
+msgid "17th"
+msgstr "17-ta"
+
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
+msgid "18th"
+msgstr "18-ta"
+
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:481
+msgid "19th"
+msgstr "19-ta"
+
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:481
+msgid "20th"
+msgstr "20-ta"
+
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
+msgid "21st"
+msgstr "21-a"
+
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
+msgid "22nd"
+msgstr "22-a"
+
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
+msgid "23rd"
+msgstr "23-a"
+
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:482
+msgid "24th"
+msgstr "24-ta"
+
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:482
+msgid "25th"
+msgstr "25-ta"
+
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
+msgid "26th"
+msgstr "26-ta"
+
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
+msgid "27th"
+msgstr "27-ta"
+
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
+msgid "28th"
+msgstr "28-ta"
+
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:483
+msgid "29th"
+msgstr "29-ta"
+
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:483
+msgid "30th"
+msgstr "30-ta"
+
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:484
+msgid "31st"
+msgstr "31-a"
+
+#: 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 "Auk�tas"
 
-#: 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 "Normalus"
 
-#: 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 "�emas"
 
 #. 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 "Neapibr��tas"
 
-#: 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 "�vyko klaida, bendraujant su kalendoriaus serveriu"
 
-#: 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 "Nepavyko perskaityti piloto Calendar programos bloko"
 
@@ -3510,91 +3696,80 @@ msgstr "Nepavyko perskaityti piloto Calendar programos bloko"
 msgid "Default Priority:"
 msgstr "_Svarbumas:"
 
-#: 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 "Negal�jau perskaityti piloto ToDo programos bloko"
 
-#: 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 "Kalendoriaus ir u�duo�i� nuostatos"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Evolution pa�to komponento gamykla."
-
-#: 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 kalendoriaus iTip/iMip vaizduokl�"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalendoriaus ir u�duo�i� nuostatos"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution komponentas tvarkyti kalendoriui."
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution pa�to komponento."
 
-#: 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 "Testinio komponento gamykla."
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution pa�to nustatymas"
 
-#: 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 kalendoriaus iTip/iMip vaizduokl�"
 
-#: 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 kalendoriaus iTip/iMip vaizduokl�"
 
-#: 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 naujien� tvarkykl�"
 
-#: 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 "Evolution kalendoriaus komponento gamykla."
+msgid "Evolution Tasks viewer"
+msgstr "Evolution naujien� tvarkykl�"
 
-#: 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 "Aliarmo prane�imo tarnyba"
 
-#: 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
 #, fuzzy
 msgid "Starting:"
 msgstr "Nuostatos"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 #, fuzzy
 msgid "Ending:"
 msgstr "Indeksuojama:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
 msgid "invalid time"
 msgstr "blogas laikas"
 
-#: 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 "Persp�ti %s"
@@ -3616,11 +3791,17 @@ msgstr "U�tildymo laikas (minut�mis)"
 msgid "_Edit appointment"
 msgstr "K_eisti �vyk�"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "N�ra jokios apra�ymo."
 
-#: 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 "�sp�jimas"
+
+#: 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"
@@ -3632,13 +3813,7 @@ msgstr ""
 "si�st� lai�k�.  Evolution vietoj to parodys normal�\n"
 "u�uominos dialog�."
 
-#: 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 "�sp�jimas"
-
-#: 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 "
@@ -3649,16 +3824,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 "Kit� kart� nebeklausti."
 
-#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
-msgid "Could not initialize GNOME"
-msgstr "Negal�jau inicializuoti GNOME"
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize gnome-vfs"
+msgstr "Negal�jau inicializuoti gnome-vfs"
 
-#: 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 "Negal�jau sukurti laikino katalogo: %s"
@@ -3675,36 +3850,36 @@ msgstr "Apra�ymas turi savyje"
 msgid "Comment contains"
 msgstr "Komentaras turi savyje"
 
-#: 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 "Netinkantys"
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:404
 msgid "%A %d %B %Y"
 msgstr "%A, %Y m. %B %d 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 m. %B %d 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"
 
@@ -3715,67 +3890,168 @@ msgstr ""
 "Negal�jau sukurti kalendoriaus rodinio. Patikrink, ar gerai �diegti ORBit ir "
 "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 "Kalendorius"
+
+#: calendar/gui/calendar-component.c:71
+msgid "Folder containing appointments and events"
+msgstr "Aplankas, kuriame saugomi �vykiai ir susitikimai"
+
+#: calendar/gui/calendar-component.c:75
+#, fuzzy
+msgid "Public Calendar"
+msgstr "_Vie�o kalendoriaus URL:"
+
+#: calendar/gui/calendar-component.c:76
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Aplankas, kuriame saugomi �vykiai ir susitikimai"
+
+#: 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 "U�duotys"
+
+#: calendar/gui/calendar-component.c:81
+msgid "Folder containing to-do items"
+msgstr "Aplankas, kuriame yra u�duotys"
+
+#: calendar/gui/calendar-component.c:85
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Spausdinti korteles"
+
+#: calendar/gui/calendar-component.c:86
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Aplankas, kuriame yra u�duotys"
+
+#: calendar/gui/calendar-component.c:730
+#, fuzzy
+msgid "New appointment"
+msgstr "Naujas �vykis"
+
+#: calendar/gui/calendar-component.c:730
+#, fuzzy
+msgid "_Appointment"
+msgstr "�vykis"
+
+#: calendar/gui/calendar-component.c:731
+msgid "Create a new appointment"
+msgstr "Sukurti nauj� �vyk�"
+
+#: calendar/gui/calendar-component.c:735
+#, fuzzy
+msgid "New meeting"
+msgstr "Naujien� �altini� nuostatos"
+
+#: calendar/gui/calendar-component.c:735
+#, fuzzy
+msgid "_Meeting"
+msgstr "Susitikimas"
+
+#: calendar/gui/calendar-component.c:736
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Sukurti nauj� u�duot�"
+
+#: calendar/gui/calendar-component.c:740
+#, fuzzy
+msgid "New task"
+msgstr "Nauja u�duotis"
+
+#: calendar/gui/calendar-component.c:740
+msgid "_Task"
+msgstr "_U�duotis"
+
+#: calendar/gui/calendar-component.c:741
+msgid "Create a new task"
+msgstr "Sukurti nauj� u�duot�"
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Naujas �vykis"
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Naujas �_vykis"
+
+#: calendar/gui/calendar-component.c:746
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Sukurti nauj� �vyk�"
+
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
+#: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "Asmeni�kas"
 
-#: 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 "Slaptas"
 
-#: 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 "Vie�as"
 
-#: 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 "P"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "E"
 msgstr "R"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "W"
 msgstr "V"
 
-#: 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 "Laisvas"
 
-#: 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 "U�imtas"
 
-#: 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 "Neprad�ta"
 
-#: 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 "Vykdoma"
 
-#: 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 "U�baigta"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3786,342 +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 "Joks"
 
-#: calendar/gui/calendar-model.c:1723
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Pasikartojantis"
 
-#: calendar/gui/calendar-model.c:1725
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Priskirtas"
 
-#: 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 "Taip"
 
-#: 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 "Ne"
 
-#: calendar/gui/calendar-view-factory.c:148
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Dien� rodinys"
 
-#: calendar/gui/calendar-view-factory.c:151
+#: calendar/gui/calendar-view-factory.c:121
 msgid "Work Week View"
 msgstr "Darbo savait�s rodinys"
 
-#: calendar/gui/calendar-view-factory.c:154
+#: calendar/gui/calendar-view-factory.c:124
 msgid "Week View"
 msgstr "Savait�s rodinys"
 
-#: calendar/gui/calendar-view-factory.c:157
+#: calendar/gui/calendar-view-factory.c:127
 msgid "Month View"
 msgstr "M�nesio rodinys"
 
-#: 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 "Kalendorius"
-
-#: calendar/gui/component-factory.c:72
-msgid "Folder containing appointments and events"
-msgstr "Aplankas, kuriame saugomi �vykiai ir susitikimai"
-
-#: calendar/gui/component-factory.c:76
+#: calendar/gui/comp-editor-factory.c:456
 #, fuzzy
-msgid "Public Calendar"
-msgstr "_Vie�o kalendoriaus URL:"
-
-#: calendar/gui/component-factory.c:77
-#, fuzzy
-msgid "Public folder containing appointments and events"
-msgstr "Aplankas, kuriame saugomi �vykiai ir susitikimai"
-
-#: 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 "U�duotys"
-
-#: calendar/gui/component-factory.c:82
-msgid "Folder containing to-do items"
-msgstr "Aplankas, kuriame yra u�duotys"
-
-#: calendar/gui/component-factory.c:86
-#, fuzzy
-msgid "Public Tasks"
-msgstr "Spausdinti korteles"
-
-#: calendar/gui/component-factory.c:87
-#, fuzzy
-msgid "Public folder containing to-do items"
-msgstr "Aplankas, kuriame yra u�duotys"
-
-#: calendar/gui/component-factory.c:750
-#, fuzzy
-msgid "New appointment"
-msgstr "Naujas �vykis"
-
-#: calendar/gui/component-factory.c:750
-#, fuzzy
-msgid "_Appointment"
-msgstr "�vykis"
-
-#: calendar/gui/component-factory.c:751
-msgid "Create a new appointment"
-msgstr "Sukurti nauj� �vyk�"
-
-#: calendar/gui/component-factory.c:755
-#, fuzzy
-msgid "New meeting"
-msgstr "Naujien� �altini� nuostatos"
-
-#: calendar/gui/component-factory.c:755
-#, fuzzy
-msgid "_Meeting"
-msgstr "Susitikimas"
-
-#: calendar/gui/component-factory.c:756
-#, fuzzy
-msgid "Create a new meeting request"
-msgstr "Sukurti nauj� u�duot�"
-
-#: calendar/gui/component-factory.c:760
-#, fuzzy
-msgid "New task"
-msgstr "Nauja u�duotis"
-
-#: calendar/gui/component-factory.c:760
-msgid "_Task"
-msgstr "_U�duotis"
-
-#: calendar/gui/component-factory.c:761
-msgid "Create a new task"
-msgstr "Sukurti nauj� u�duot�"
-
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "New All Day Appointment"
-msgstr "Naujas �vykis"
+msgid "Error while opening the calendar"
+msgstr "�vyko klaida, bendraujant su kalendoriaus serveriu"
 
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "All _Day Appointment"
-msgstr "Naujas �_vykis"
+#: 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 "Sukurti nauj� �vyk�"
+msgid "Permission denied to open the calendar"
+msgstr "Pri�jimas u�draustas"
 
-#: calendar/gui/control-factory.c:123
+#: calendar/gui/control-factory.c:119
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Negal�jau atidaryti aplanko su �%s�"
 
-#: calendar/gui/control-factory.c:167
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "URI, kur� rodys kalendorius"
 
-#: 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 "Persp�jim� garsu parinktys"
 
-#: calendar/gui/dialogs/alarm-options.c:368
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Persp�jim� prane�imu parinktys"
 
-#: calendar/gui/dialogs/alarm-options.c:377
-msgid "Mail Alarm Options"
+#: calendar/gui/dialogs/alarm-options.c:438
+#, fuzzy
+msgid "Email Alarm Options"
 msgstr "Persp�jim� pa�tu parinktys"
 
-#: calendar/gui/dialogs/alarm-options.c:386
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Persp�jim� programa parinktys"
 
-#: calendar/gui/dialogs/alarm-options.c:395
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Ne�inom� persp�jim� parinktys"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Alarm Repeat"
 msgstr "Persp�jim� kartojimas"
 
-#: 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 "Rodomas prane�imas"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "Lai�ko tekstas"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "Groti gars�:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "Kartoti persp�jim�"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "Paleisti program�:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "Si�sti"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr "Su tokiais argumentais:"
 
-#: 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 "dien�"
 
-#: 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 "valand�"
 
-#: 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 "minu�i�"
 
-#: calendar/gui/dialogs/alarm-page.c:319
-#, c-format
-msgid "%d days"
-msgstr "%d dien�"
-
-#: calendar/gui/dialogs/alarm-page.c:322
-msgid "1 day"
-msgstr "1 diena"
-
-#: calendar/gui/dialogs/alarm-page.c:327
-#, c-format
-msgid "%d weeks"
-msgstr "%d savai�i�"
-
-#: calendar/gui/dialogs/alarm-page.c:330
-msgid "1 week"
-msgstr "1 savait�"
-
-#: calendar/gui/dialogs/alarm-page.c:335
-#, c-format
-msgid "%d hours"
-msgstr "%d valand�"
-
-#: calendar/gui/dialogs/alarm-page.c:338
-msgid "1 hour"
-msgstr "1 valanda"
-
-#: calendar/gui/dialogs/alarm-page.c:343
-#, c-format
-msgid "%d minutes"
-msgstr "%d minu�i�"
-
-#: 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 sekund�i�"
-
-#: 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 "Groti gars�"
-
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
-msgstr "Rodyti prane�im�"
-
-#: calendar/gui/dialogs/alarm-page.c:391
-msgid "Send an email"
-msgstr "Pasi�sti lai�k�"
-
-#: calendar/gui/dialogs/alarm-page.c:395
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
-msgstr "Paleisti program�"
-
-#: calendar/gui/dialogs/alarm-page.c:401
-msgid "Unknown action to be performed"
-msgstr "Ne�inomas veiksmas, kur� reikia atlikti"
-
-#: calendar/gui/dialogs/alarm-page.c:413
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "%s %s prie� �vykio prad�i�"
-
-#: calendar/gui/dialogs/alarm-page.c:416
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "%s %s po �vykio prad�ios"
-
-#: calendar/gui/dialogs/alarm-page.c:421
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr "%s �vykio prad�ios metu"
-
-#: calendar/gui/dialogs/alarm-page.c:430
-#, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "%s %s prie� �vykio pabaig�"
-
-#: calendar/gui/dialogs/alarm-page.c:433
-#, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "%s %s po �vykio pabaigos"
-
-#: calendar/gui/dialogs/alarm-page.c:438
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr "%s �vykio pabaigos metu"
-
-#: 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 ""
-
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -4132,46 +4221,63 @@ msgstr "Pagrindai"
 msgid "Date/Time:"
 msgstr "Data/Laikas:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "Rodyti prane�im�"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "Groti gars�"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "U�uominos"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "Paleisti program�"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "Pasi�sti lai�k�"
+
+#: 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 "Ap�valga:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_Parinktys..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "po"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "prie�"
 
-#: 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 "dien�(as)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "�vykio pabaig�"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "valand�(as)"
 
-#: 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 "minut�(es)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "�vykio prad�i�"
 
@@ -4195,7 +4301,7 @@ msgstr "30 minu�i�"
 msgid "60 minutes"
 msgstr "60 minu�i�"
 
-#: 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 "Persp�jimai"
@@ -4221,7 +4327,8 @@ msgid "Days"
 msgstr "Dien�"
 
 #: 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 "Penktadienis"
 
@@ -4234,7 +4341,8 @@ msgid "Minutes"
 msgstr "Minu�i�"
 
 #: 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 "Pirmadienis"
 
@@ -4244,7 +4352,8 @@ msgid "S_un"
 msgstr "_Sek"
 
 #: 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 "�e�tadienis"
 
@@ -4257,7 +4366,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Rodyti savai�i� _numerius datos navigatoriuje"
 
 #: 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 "Sekmadienis"
 
@@ -4276,7 +4386,8 @@ msgid "Task List"
 msgstr "_U�duo�i� s�ra�as"
 
 #: 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 "Ketvirtadienis"
 
@@ -4293,7 +4404,8 @@ msgid "Time format:"
 msgstr "Laiko formatas:"
 
 #: 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 "Antradienis"
 
@@ -4302,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 "Tre�iadienis"
 
@@ -4345,7 +4458,7 @@ msgid "_Fri"
 msgstr "Pe_n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "_Esm�"
 
@@ -4390,157 +4503,161 @@ msgstr "_Tre"
 msgid "before every appointment"
 msgstr "prie� �vykio prad�i�"
 
-#: 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 "Ar tu tikrai nori at�aukti ir i�trinti �� susitikim�?"
 
-#: 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 "Ar tu tikrai nori at�aukti ir i�trinti �i� u�duot�?"
 
-#: 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 "Ar tu tikrai nori at�aukti ir i�trinti �� �urnalo �ra��?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "�is �vykis buvo i�trintas."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "�i u�duotis buvo i�trinta."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "�is �urnalo �ra�as buvo i�trintas."
 
-#: 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  Tu ka�k� pakeitei. U�mir�ti tuos pakeitimus ir u�daryti redaktori�?"
 
-#: 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  Tu nieko nepakeitei, u�daryti redaktori�?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "�is �vykis buvo pakeistas."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "�i u�duotis buvo pakeista."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "�is �urnalo �ra�as buvo pakeistas."
 
-#: 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  Tu ka�k� pakeitei. U�mir�ti tuos pakeitimus ir atnaujinti redaktori�?"
 
-#: 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  Tu nieko nepakeitei, atnaujinti redaktori�?"
 
-#: 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 "Ne�inoma klaida: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr " iki "
 
-#: 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 " (U�baigta "
 
-#: 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 "U�baigta "
 
-#: 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 "Negal�jau tvarkingai atnaujinti byl�"
 
-#: 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 "Negal�jau tvarkingai atnaujinti byl�"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Keisti �vyk�"
 
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "�vykis -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "U�duotis -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "�urnalo �ra�as -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "N�ra ap�valgos"
 
-#: 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 "I�saugoti kaip..."
 
-#: 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 "Nepavyko gauti esamos versijos!"
 
@@ -4598,90 +4715,103 @@ msgstr "Pavesti kam:"
 msgid "Enter Delegate"
 msgstr "�vesti, kam pavedama"
 
-#: 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 "�vykis"
 
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "U�uomina"
 
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Pasikartojimas"
 
-#: 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 "Dienotvark�"
 
-#: 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 "Susitikimas"
 
-#: 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 "Prad�ios 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 "_Prad�ios laikas:"
+
+#: 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 "Vis_os dienos �vykis"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "_U�imtas"
 
-#: 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 "Klasifikacija"
 
-#: 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 "S_laptas"
 
-#: 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 ir laikas"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "_Laisvas"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 #, fuzzy
 msgid "L_ocation:"
 msgstr ""
 "\n"
 "Geogr. vietov�: "
 
-#: 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 "As_meni�kas"
 
-#: 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 "_Vie�as"
 
-#: 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 "Rodyti laik� kaip"
 
-#: 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_ntrauka:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Kontaktai..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "P_abaigos laikas:"
@@ -4690,20 +4820,24 @@ msgstr "P_abaigos laikas:"
 msgid "_Start time:"
 msgstr "_Prad�ios laikas:"
 
-#: 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 "Organizatorius yra b�tinas."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:446
 #, fuzzy
 msgid "At least one attendee is required."
 msgstr "Reikalingas bent vienas dalyvis"
 
-#: calendar/gui/dialogs/meeting-page.c:594
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr "Tas asmuo jau dalyvauja susitikime!"
 
-#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr "_Pavesti kam..."
 
@@ -4743,16 +4877,11 @@ msgid "Member"
 msgstr "Narys"
 
 #: 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 "Rol�"
-
 #: 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 +4889,6 @@ msgstr "Rol�"
 msgid "Status"
 msgstr "B�sena"
 
-#: 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 "Tipas"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4777,106 +4899,87 @@ msgid "_Change Organizer"
 msgstr "_Keisti organizatori�:"
 
 #: 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 "Pakv_iesti kitus..."
 
-#: 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-a"
+#: 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-a"
+#: 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-a"
+#: 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
-msgid "th"
-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/recurrence-page.c:629
+#: calendar/gui/dialogs/recur-comp.c:77
+#, fuzzy
+msgid "All Instances"
+msgstr "_Visos stotys:"
+
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "�iame �vykyje yra pasikartojim�, kuri� Evolution negali keisti."
 
-#: calendar/gui/dialogs/recurrence-page.c:898
-msgid "Recurrent date is wrong"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:806
+#, fuzzy
+msgid "Recurrence date is invalid"
+msgstr "Laikas netaisyklingas"
 
-#: calendar/gui/dialogs/recurrence-page.c:1007
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr "lygiai"
 
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:977
 #, fuzzy
 msgid "first"
 msgstr "s�ra�as"
 
-#: 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 "Kitas"
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:980
 #, fuzzy
 msgid "fourth"
 msgstr "�iaur�s"
 
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:981
 #, fuzzy
 msgid "last"
 msgstr "s�ra�as"
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1004
 #, fuzzy
 msgid "Other Date"
 msgstr "Kitas faksas"
 
-#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "diena"
 
-#: 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 "kart�(us) pasitaikys"
 
@@ -4940,24 +5043,29 @@ msgstr "savait�(es)"
 msgid "year(s)"
 msgstr "metus"
 
-#: 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 "Susitikimo informacija buvo pakeista. Si�sti atnaujint� informacij�?"
 
-#: 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 "Susitikimo informacija buvo pakeista. Si�sti atnaujint� informacij�?"
 
-#: 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 "U�duoties informacija buvo pakeista. Si�sti atnaujint� informacij�?"
 
-#: 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 "U�duoties informacija buvo pakeista. Si�sti atnaujint� informacij�?"
 
+#: calendar/gui/dialogs/task-details-page.c:397
+#, fuzzy
+msgid "Completed date is wrong"
+msgstr "U�baigta "
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, fuzzy, no-c-format
@@ -4968,42 +5076,40 @@ msgstr "% U�baigta"
 msgid "Date Completed:"
 msgstr "U�baigimo 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 "Reikalauja veiksmo"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Pa�anga"
 
-#: 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 "_Svarbumas:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_B�sena:"
 
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "Esm�"
 
-#: 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 "Priskyrimas"
 
-#: 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 "Apra�ymas:"
 
@@ -5011,140 +5117,237 @@ msgstr "Apra�ymas:"
 msgid "Sta_rt Date:"
 msgstr "P_rad�ios data:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Kontaktai..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Kada reikia:"
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d dien�"
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "1 diena"
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d savai�i�"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 savait�"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d valand�"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 valanda"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d minu�i�"
+
+#: 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 sekund�i�"
+
+#: 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 "Pasi�sti lai�k�"
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr "Ne�inomas veiksmas, kur� reikia atlikti"
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s prie� �vykio prad�i�"
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s po �vykio prad�ios"
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s �vykio prad�ios metu"
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s prie� �vykio pabaig�"
+
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s po �vykio pabaigos"
+
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s �vykio pabaigos metu"
+
+#: 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
 #, fuzzy, c-format
 msgid "30%"
 msgstr "389"
 
-#: 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
 #, fuzzy, c-format
 msgid "80%"
 msgstr "389"
 
-#: 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 "I�trinti pa�ym�tus kontaktus"
 
-#: 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 "Ati_daryti"
 
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:951
 #, fuzzy
 msgid "_Save as..."
 msgstr "I�saugoti kaip..."
 
-#: 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 "S_pausdinti..."
 
-#: 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 "_I�kirpti"
 
-#: 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 "_Kopijuoti"
 
-#: 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 "�_d�ti"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:962
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Priskirti u�duot�"
 
-#: calendar/gui/e-calendar-table.c:1000
+#: calendar/gui/e-calendar-table.c:963
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Persi�sti kaip i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "_Pa�ym�ti u�baigta"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:965
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Pa�ym�ti u�duotis u�baigtomis"
 
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "_I�trinti pa�ym�tas u�duotis"
 
-#: 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 "Spausk �ia, kad prid�tum u�duot�"
@@ -5153,8 +5356,8 @@ msgstr "Spausk �ia, kad prid�tum u�duot�"
 msgid "Alarms"
 msgstr "Persp�jimai"
 
-#: 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 "U�baigta"
 
@@ -5183,8 +5386,8 @@ msgid "Start Date"
 msgstr "Prad�ios 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 "Ap�valga"
 
@@ -5192,19 +5395,15 @@ msgstr "Ap�valga"
 msgid "Task sort"
 msgstr "U�duo�i� rikiavimas"
 
-#: 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 %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"
 
@@ -5219,513 +5418,592 @@ 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 minu�i� padalos"
 
 #. 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 %e"
 
 #. 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 " "
 
 #. 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 "Naujas �_vykis"
 
-#: 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 "Naujas visos _dienos �vykis"
 
-#: 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 "Susitikimas"
 
-#: 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 "Nauja u�duotis"
 
-#: 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 "Spausdinti..."
 
-#: 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 "Eiti � �ia_ndien�"
 
-#: 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 "_Eiti � dat�..."
 
-#: 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 "_Skelbti laisvas/u�imtas informacij�"
 
-#: 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 "_Pa�to nuostatos..."
 
-#: 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 "I�_saugoti kaip..."
 
-#: 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 "�traukti s_usitikim� � dienotvark�"
 
-#: 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 "Persi�sti kaip i_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
 msgid "Make this Occurrence _Movable"
 msgstr "Leisti per_kelti �� pasitaikym�"
 
-#: 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 "I�trinti �� _pasitaikym�"
 
-#: 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 "I�trinti _visus pasitaikymus"
 
-#: calendar/gui/e-itip-control.c:615
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Yes. (Complex Recurrence)"
+msgstr "_Paprastas pakartojimas"
+
+#: calendar/gui/e-itip-control.c:716
+#, fuzzy
+msgid "Every day"
+msgstr "Kas"
+
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "Every %d days"
+msgstr "%d dien�"
+
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Every week"
+msgstr "Kas"
+
+#: calendar/gui/e-itip-control.c:726
+#, fuzzy, c-format
+msgid "Every %d weeks"
+msgstr "%d savai�i�"
+
+#: 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 savai�i�"
+
+#: calendar/gui/e-itip-control.c:739
+#, fuzzy
+msgid " and "
+msgstr "Sm�lis"
+
+#: 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 "Vienas _m�nuo"
+
+#: 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 "Kas"
+
+#: 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 "Susitikimo pa_baigos laikas:"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:851
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "U�baigta "
 
-#: 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 "kalendoriaus informacija"
 
 #. Title
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:913
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Kalendorius"
 
-#: 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 "ne�inomas siunt�jas"
 
 #. 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 ""
 "\n"
 "Geogr. vietov�: "
 
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-itip-control.c:1073
 #, fuzzy
 msgid "Status:"
 msgstr "_B�sena:"
 
-#: 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 "Priimtas"
 
-#: 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 "Negalutinis"
 
-#: 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 "Atmestas"
 
-#: 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 "Ne�inomas"
 
-#: 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 "Pasirink veiksm�"
 
-#: 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 "Gerai"
 
-#: calendar/gui/e-itip-control.c:955
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "Accept"
 msgstr "Priimtas"
 
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:1175
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Negalutinis"
 
-#: calendar/gui/e-itip-control.c:957
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Decline"
 msgstr "Atmestas"
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:1200
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "_Skelbti laisvas/u�imtas informacij�"
 
-#: 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 "Susitikimo informacija"
 
-#: 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 "Nutraukti"
 
-#: 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 "Su�inoti naujausi� susitikimo informacij�"
 
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Susitikimo informacija"
 
-#: 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 "Su�inoti naujausi� susitikimo informacij�"
 
-#: 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 "Su�inoti naujausi� susitikimo informacij�"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1329
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Susitikimas"
 
-#: 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 "Su�inoti naujausi� susitikimo informacij�"
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1334
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Susitikimo pa_baigos laikas:"
 
-#: 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 "Su�inoti naujausi� susitikimo informacij�"
 
-#: calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1339
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Susitikimo pa_baigos laikas:"
 
-#: 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 "Su�inoti naujausi� susitikimo informacij�"
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1347
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Susitikimas"
 
-#: 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 "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1136
+#: calendar/gui/e-itip-control.c:1355
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Susitikimo informacija"
 
-#: 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 "Ie�koti lai�ke"
 
-#: 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 "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1388
 #, fuzzy
 msgid "Task Information"
 msgstr "Informacija"
 
-#: 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 "_Skelbti laisvas/u�imtas informacij�"
 
-#: 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 "Susitikimas"
 
-#: 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 "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1401
 #, fuzzy
 msgid "Task Update"
 msgstr "buvo po"
 
-#: 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 "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1406
 #, fuzzy
 msgid "Task Update Request"
 msgstr "buvo po"
 
-#: 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 "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1414
 #, fuzzy
 msgid "Task Reply"
 msgstr "Atsakyti"
 
-#: 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 "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1422
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Nutraukti veiksm�"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1430
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Kalendoriaus �inut�"
 
-#: 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 "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1450
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "_Skelbti laisvas/u�imtas informacij�"
 
-#: 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 "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1455
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "_Laisvas-u�si�m�s URL"
 
-#: 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 "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1460
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "_Laisvas-u�si�m�s URL"
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1465
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Praeit� lai�k�"
 
-#: 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 "Atrodo, jog aplankas yra neatkuriamai sugadintas."
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1604
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "�iame lai�ke yra tik Bcc gav�jai."
 
-#: 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
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "�vyko klaida parsiun�iant naujien� �altin�"
 
-#: 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 "Elementas negal�jo b�ti i�si�stas!\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 "Negal�jau atidaryti aplanko su �%s�"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Atnaujinimas u�baigtas\n"
 
-#: calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalendoriaus byla negal�jo b�ti atnaujinta!\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 "Negal�jau atidaryti aplanko su �%s�"
 
-#: calendar/gui/e-itip-control.c:1766
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Dalyvio b�sena atnaujinta\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 "Dalyvio b�sena atnaujinta\n"
 
-#: calendar/gui/e-itip-control.c:1804
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Pa�alinimas u�baigtas"
 
-#: 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 "Elementas i�si�stas!\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 "Elementas negal�jo b�ti i�si�stas!\n"
 
-#: calendar/gui/e-itip-control.c:1961
+#: calendar/gui/e-itip-control.c:2206
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Pasirink aplank�"
 
-#: calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:2213
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Pasirink aplank�"
@@ -5767,223 +6045,227 @@ msgstr "pabaigos-data"
 msgid "date-start"
 msgstr "prad�ios-data"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr "Pirmininkaujantys asmenys"
 
-#: 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 "B�tini dalyviai"
 
-#: calendar/gui/e-meeting-model.c:86
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr "Neb�tini dalyviai"
 
-#: calendar/gui/e-meeting-model.c:87
+#: calendar/gui/e-meeting-model.c:83
 #, fuzzy
 msgid "Resources"
 msgstr "Resursas"
 
-#: 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 "Individas"
 
-#: 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 "Grup�"
 
-#: 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 "Resursas"
 
-#: 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 "Kambarys"
 
-#: 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 "Pirmininkas"
 
-#: 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 "B�tinas dalyvis"
 
-#: 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 "Neb�tinas dalyvis"
 
-#: 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 "Ne dalyvis"
 
-#: 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 "Reikalauja veiksmo"
+
+#: 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 "Negalutinis"
 
-#: 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 "Pavestas"
 
-#: 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 "Vykdomas"
 
 #. 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, %Y m. %B %e"
 
 #. 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 "Nesu darbe"
 
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "N�ra informacijos"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Parinktys"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Rodyti tik _darbo valandas"
 
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Rodyti _atitraukt�"
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "_Atnaujinti Laisvas/U�imtas"
 
-#: 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 "_Automati�kai parinkti"
 
-#: 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 "_Visi �mon�s ir resursai"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Visi �_mon�s ir vienas resursas"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "_B�tini �mon�s"
 
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "B�tini �mon�s ir _vienas resursas"
 
-#: calendar/gui/e-meeting-time-sel.c:654
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Susitikimo _prad�ios laikas:"
 
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Susitikimo pa_baigos laikas:"
 
-#: 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 "Atidaromos u�duotys i� %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 "Negal�jau �kelti u�duo�i� � �%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 "Metodas, reikalingas �kelti �%s�, nepalaikomas"
 
-#: 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 "Negal�jau atidaryti aplanko su �%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 "Klaida pradedant %s"
 
-#: calendar/gui/e-tasks.c:540
+#: calendar/gui/e-tasks.c:554
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "U�baigimo data"
 
-#: calendar/gui/e-tasks.c:563
+#: calendar/gui/e-tasks.c:577
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "I�trinti pa�ym�tus kontaktus"
 
-#: calendar/gui/e-tasks.c:656
+#: calendar/gui/e-tasks.c:672
 #, fuzzy
 msgid "Expunging"
 msgstr "I�valyti"
 
-#: calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Naujas �_vykis..."
 
-#: calendar/gui/gnome-cal.c:1530
+#: calendar/gui/gnome-cal.c:1503
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Negal�jau atidaryti aplanko su �%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 "Metodas, reikalingas atidaryti �%s�, nepalaikomas"
 
-#. 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 "Persp�ti %s"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5991,7 +6273,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"
@@ -5999,7 +6281,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 "Atidaromas kalendorius i� %s"
@@ -6065,331 +6347,186 @@ msgstr "Spalis"
 msgid "September"
 msgstr "Rugs�jis"
 
-#: 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 "Turi b�ti nurodytas organizatorius."
 
-#: calendar/gui/itip-utils.c:383
+#: calendar/gui/itip-utils.c:298
 #, fuzzy
 msgid "At least one attendee is necessary"
 msgstr "Reikalingas bent vienas dalyvis"
 
-#: 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 "kalendoriaus informacija"
 
-#: 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 "Informacija"
 
-#: 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 "Neb�tina informacija"
 
-#: 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 "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:394
 #, fuzzy
 msgid "Calendar information"
 msgstr "kalendoriaus informacija"
 
-#: 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 "Atnaujinti s�ra��"
 
-#: 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 "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/itip-utils.c:598
+#: calendar/gui/itip-utils.c:525
 #, fuzzy
 msgid "iCalendar information"
 msgstr "kalendoriaus informacija"
 
-#: calendar/gui/itip-utils.c:756
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Tu turi b�ti �vykio dalyvis."
 
-#: calendar/gui/main.c:70
-#, fuzzy
-msgid "Could not activate Bonobo"
-msgstr "Negal�jau inicializuoti Bonobo"
-
-#: calendar/gui/main.c:99
-#, fuzzy
-msgid "Could not create the component editor factory"
-msgstr "Negal�jau sukurti laikino katalogo: %s"
-
-#: calendar/gui/print.c:456
-msgid "1st"
-msgstr "1-a"
-
-#: calendar/gui/print.c:456
-msgid "2nd"
-msgstr "2-a"
-
-#: calendar/gui/print.c:456
-msgid "3rd"
-msgstr "3-a"
-
-#: calendar/gui/print.c:456
-msgid "4th"
-msgstr "4-a"
-
-#: calendar/gui/print.c:456
-msgid "5th"
-msgstr "5-a"
-
-#: calendar/gui/print.c:457
-msgid "6th"
-msgstr "6-ta"
-
-#: calendar/gui/print.c:457
-msgid "7th"
-msgstr "7-ta"
-
-#: calendar/gui/print.c:457
-msgid "8th"
-msgstr "8-ta"
-
-#: calendar/gui/print.c:457
-msgid "9th"
-msgstr "9-ta"
-
-#: calendar/gui/print.c:457
-msgid "10th"
-msgstr "10-ta"
-
-#: calendar/gui/print.c:458
-msgid "11th"
-msgstr "11-ta"
-
-#: calendar/gui/print.c:458
-msgid "12th"
-msgstr "12-ta"
-
-#: calendar/gui/print.c:458
-msgid "13th"
-msgstr "13-ta"
-
-#: calendar/gui/print.c:458
-msgid "14th"
-msgstr "14-ta"
-
-#: calendar/gui/print.c:458
-msgid "15th"
-msgstr "15-ta"
-
-#: calendar/gui/print.c:459
-msgid "16th"
-msgstr "16-ta"
-
-#: calendar/gui/print.c:459
-msgid "17th"
-msgstr "17-ta"
-
-#: calendar/gui/print.c:459
-msgid "18th"
-msgstr "18-ta"
-
-#: calendar/gui/print.c:459
-msgid "19th"
-msgstr "19-ta"
-
-#: calendar/gui/print.c:459
-msgid "20th"
-msgstr "20-ta"
-
-#: calendar/gui/print.c:460
-msgid "21st"
-msgstr "21-a"
-
-#: calendar/gui/print.c:460
-msgid "22nd"
-msgstr "22-a"
-
-#: calendar/gui/print.c:460
-msgid "23rd"
-msgstr "23-a"
-
-#: calendar/gui/print.c:460
-msgid "24th"
-msgstr "24-ta"
-
-#: calendar/gui/print.c:460
-msgid "25th"
-msgstr "25-ta"
-
-#: calendar/gui/print.c:461
-msgid "26th"
-msgstr "26-ta"
-
-#: calendar/gui/print.c:461
-msgid "27th"
-msgstr "27-ta"
-
-#: calendar/gui/print.c:461
-msgid "28th"
-msgstr "28-ta"
-
-#: calendar/gui/print.c:461
-msgid "29th"
-msgstr "29-ta"
-
-#: calendar/gui/print.c:461
-msgid "30th"
-msgstr "30-ta"
-
-#: calendar/gui/print.c:462
-msgid "31st"
-msgstr "31-a"
-
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr "Sk"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "Pr"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "An"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "Tr"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "Kt"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "Pn"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "�t"
 
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Pasirinkta diena (%a, %Y %d %b)"
 
-#: 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, %Y %b %d"
 
-#: calendar/gui/print.c:1900
+#: calendar/gui/print.c:1922
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Pasirinkta savait� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr "Pasirinktas m�nuo (%Y %b)"
 
 #. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr "Pasirinkti metai (%Y)"
 
-#: calendar/gui/print.c:2249
+#: calendar/gui/print.c:2267
 #, fuzzy
 msgid "Task"
 msgstr "_U�duotis"
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2326
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "_B�sena:"
 
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Svarbumas:"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2358
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Procent� u�baigta"
 
-#: 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"
 "Kategorijos: "
 
-#: calendar/gui/print.c:2375
+#: calendar/gui/print.c:2395
 #, fuzzy
 msgid "Contacts: "
 msgstr "Ko_ntaktai:"
 
-#: calendar/gui/print.c:2430
-msgid "Print Calendar"
-msgstr "Spausdinti kalendori�"
-
-#: 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 "Spaudinio per�i�ra"
 
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "Spausdinti element�"
 
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "Spausdinimo nuostatos"
 
-#: calendar/gui/tasks-control-factory.c:75
-#, fuzzy
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Negal�jau sukurti kalendoriaus rodinio. Patikrink, ar gerai �diegti ORBit ir "
-"OAF."
-
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr "Vaizduojamo u�duo�i� aplanko 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 "
@@ -6402,92 +6539,54 @@ msgstr ""
 "\n"
 "Tikrai i�trinti tuos lai�kus?"
 
-#: 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 "Kit� kart� nebeklausti."
 
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:615
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Spausdinti korteles"
 
-#: 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 pa�m� u�duotis, kurios buvo tavo kalendoriaus aplanke ir "
-"automati�kai perk�l� jas � nauj� u�duo�i� aplank�."
-
-#: 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 band� paimti u�duotis, kurios buvo tavo kalendoriaus aplanke ir "
-"perkelti jas � nauj� u�duo�i� aplank�.\n"
-"Kai kurios u�duotys negal�jo b�ti perkeltos, taigi �� proces� gali b�ti "
-"bandoma pakartoti ateityje."
-
-#: 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 "SPATKP�"
 
-#: 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 "Gamykla importuoti VCard byloms � Evolution."
+msgid "Evolution Calendar intelligent importer"
+msgstr "Evolution kalendoriaus iTip/iMip vaizduokl�"
 
-#: 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 "Importuoja VCard bylas � Evolution."
+msgid "Evolution iCalendar importer"
+msgstr "Evolution kalendoriaus iTip/iMip vaizduokl�"
 
-#: 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 "Importuoja VCard bylas � Evolution."
+msgid "Evolution vCalendar importer"
+msgstr "Evolution kalendoriaus iTip/iMip vaizduokl�"
 
-#: calendar/importers/icalendar-importer.c:168
-#, fuzzy, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr ""
-"Negaliu gauti lai�ko: %s i� aplanko %s\n"
-"  %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Kalendoriaus �inut�"
 
-#: calendar/importers/icalendar-importer.c:180
-#, fuzzy, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "Negal�jau prisijungti prie serverio: %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 "U�uomina"
 
-#: calendar/importers/icalendar-importer.c:697
+#: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Kalendoriaus �inut�"
 
-#: calendar/importers/icalendar-importer.c:722
+#: calendar/importers/icalendar-importer.c:663
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6496,11 +6595,15 @@ msgstr ""
 "Evolution rado Pine pa�to byl�.\n"
 "Ar nor�tum jas importuoti � Evolution?"
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:670
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Atidaryti kalendori�"
 
+#: 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 tikisi 0 argument�"
@@ -8196,34 +8299,44 @@ 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 "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:210
+#: camel/camel-cipher-context.c:218
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:262
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:296
+#: camel/camel-cipher-context.c:304
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: camel/camel-data-cache.c:169
+#: camel/camel-cipher-context.c:342
+#, fuzzy
+msgid "You may not import keys with this cipher"
+msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
+
+#: camel/camel-cipher-context.c:374
+#, fuzzy
+msgid "You may not export keys with this cipher"
+msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
+
+#: camel/camel-data-cache.c:133
 #, fuzzy
 msgid "Unable to create cache path"
 msgstr ""
 "Negaliu sukurti i�vesties bylos: %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 "Negal�jau atidaryti ke�o katalogo: %s"
@@ -8263,87 +8376,94 @@ msgstr "�ra�omas aplankas '%s'"
 msgid "You must be working online to complete this operation"
 msgstr "Tu turi dirbti prisijung�s, kad u�baigtum �� veiksm�"
 
-#: 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 "Nepavyko i�koduoti lai�ko."
+
+#: 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 "Nepavyko i�koduoti lai�ko."
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "Negal�jau sukurti katalogo %s: %s"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Sinchronizuojami aplankai"
 
-#: 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 "Klaida nagrin�jant filtr�: %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 "Klaida vykdant filtr�: %s: %s"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Negaliu atidaryti kaupo aplanko"
 
-#: camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Negaliu apdoroti kaupo aplanko"
 
-#: camel/camel-filter-driver.c:966
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Gaunamas lai�kas %d (%d%%)"
 
-#: camel/camel-filter-driver.c:970
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Negaliu atidaryti lai�ko"
 
-#: 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 "Nes�km� ties lai�ku %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 "Sinchronizuojamas aplankas"
 
-#: camel/camel-filter-driver.c:1058
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Gaunamas lai�kas %d i� %d"
 
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Nes�km� ties lai�ku %d i� %d"
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Nepavyko i�koduoti lai�ko."
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Blogi argumentai"
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Blogi argumentai"
 
-#: camel/camel-filter-search.c:514
-#, fuzzy, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Nepavyko i�koduoti lai�ko."
-
-#: camel/camel-filter-search.c:550
-#, fuzzy, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Nepavyko i�koduoti lai�ko."
-
-#: 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 "Klaida vykdant filtro paie�k�: %s: %s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8352,7 +8472,7 @@ msgstr ""
 "Negaliu i�nagrin�ti paie�kos i�rai�kos: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8361,11 +8481,11 @@ msgstr ""
 "Klaida vykdant paie�kos i�rai�k� �%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) reikalauja vienintelio loginio rezultato"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Vykdoma u�klausa ne�inomai antra�tei: %s"
@@ -8398,7 +8518,7 @@ msgstr "Perkeliami lai�kai"
 msgid "Copying messages"
 msgstr "Lai�kai kopijuojami � %s"
 
-#: camel/camel-gpg-context.c:697
+#: camel/camel-gpg-context.c:724
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8406,72 +8526,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 "Nutraukta."
 
-#: 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 "Netik�tas atsakymas i� POP serverio: %s"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:814
 #, fuzzy
 msgid "No data provided"
 msgstr "Nenurodytas aplanko vardas."
 
-#: camel/camel-gpg-context.c:830
+#: camel/camel-gpg-context.c:857
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Negaliu u��ifruoti �io lai�ko: nenurodyti jokie gav�jai."
 
-#: 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 "Nepavyko i�koduoti lai�ko."
 
-#: 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 "Nepavyko i�koduoti lai�ko."
 
-#: 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 "Nepavyko i�koduoti lai�ko."
 
-#: 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 "Nepavyko i�koduoti lai�ko."
 
-#: 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 "Negal�jau sukurti laikinos bylos: %s"
@@ -8496,23 +8617,22 @@ msgstr ""
 msgid "Could not lock '%s'"
 msgstr "Negal�jau u�rakinti '%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 "Negal�jau sukurti %s u�rakto bylos: %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 "Baig�si laikas, belaukiant %s u�rakto bylos. Bandyk v�liau."
 
-#: camel/camel-lock.c:206
+#: camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Nepavyko gauti u�rakto naudojant 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 "Nepavyko gauti u�rakto naudojant flock(2): %s"
@@ -8522,51 +8642,51 @@ msgstr "Nepavyko gauti u�rakto naudojant flock(2): %s"
 msgid "Could not check mail file %s: %s"
 msgstr "Negal�jau patikrinti pa�to bylos %s: %s"
 
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Negal�jau atidaryti pa�to bylos %s: %s"
 
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Negal�jau atidaryti laikinos pa�to bylos %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 "Nepavyko �ra�yti lai�k� � laikin� byl� %s: %s"
 
-#: camel/camel-movemail.c:188
+#: camel/camel-movemail.c:187
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Negal�jau sukurti pipe: %s"
 
-#: 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 "Nepavyko programa Movemail: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 msgid "(Unknown error)"
 msgstr "(Ne�inoma klaida)"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Klaida skaitant pa�to byl�: %s"
 
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Klaida �ra�ant laikin� pa�to byl�: %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 "Klaida kopijuojant laikin� pa�to byl�: %s"
@@ -8583,26 +8703,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 "Kita klaida"
 
-#: 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 "Negal�jau �kelti %s: Moduli� �k�limas �ioje sistemoje nepalaikomas."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:141
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Negal�jau �kelti %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 "Negal�jau �kelti %s: Modulyje n�ra inicializacijos kodo."
@@ -8654,11 +8774,11 @@ msgstr ""
 "Su �ia parinktimi prie serverio bus jungiamasi naudojant saug� CRAM-MD5 "
 "slapta�od�, jei serveris tai palaiko."
 
-#: 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."
@@ -8666,52 +8786,125 @@ msgstr ""
 "Su �ia parinktimi prie serverio bus jungiamasi naudojant saug� CRAM-MD5 "
 "slapta�od�, jei serveris tai palaiko."
 
-#: 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 "Serverio atsakyme nebuvo autorizacijos duomen�\n"
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Serverio atsakyme buvo nepilni autorizacijos duomenys\n"
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr "Serverio atsakymas netenkina\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 ""
+"Su �ia parinktimi jungiantis prie serverio bus naudojama Kerberos 4 "
+"autentikacija."
+
+#: 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 "Blogas autentikacijos atsakymas i� serverio."
+
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "Nepavyko i�koduoti lai�ko."
+
+#: camel/camel-sasl-gssapi.c:299
+#, fuzzy
+msgid "Unsupported security layer."
+msgstr "Nepalaikomas tipas"
+
+#: 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 ""
 "Su �ia parinktimi jungiantis prie serverio bus naudojama Kerberos 4 "
 "autentikacija."
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, fuzzy, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr "Negal�jau sukurti pipe: %s"
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1059
-msgid "Bad authentication response from server."
-msgstr "Blogas autentikacijos atsakymas i� serverio."
-
 #: camel/camel-sasl-login.c:32
 #, fuzzy
 msgid "Login"
@@ -8764,7 +8957,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 "Nepavyko sukompiliuoti reguliarios i�rai�kos: %s: %s"
@@ -8784,36 +8977,36 @@ msgstr "URL �%s� turi b�ti su hostu"
 msgid "URL '%s' needs a path component"
 msgstr "URL �%s� turi b�ti su keliu"
 
-#: 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 "Atsakymo adresas:"
 
-#: 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 ""
 
@@ -8825,12 +9018,12 @@ msgstr "Virtuali� aplank� pa�to tiek�jas."
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pa�to skaitymui naudojant u�klaus� i� kit� aplank� aib�s"
 
-#: 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 "Protokolui �%s� n�ra tiek�jo."
 
-#: camel/camel-session.c:545
+#: camel/camel-session.c:548
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8839,177 +9032,177 @@ msgstr ""
 "Negal�jau sukurti katalogo %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 "Pra�om �vesti savo slapta�od� d�l %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 ""
 
-#: 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 "Nepavyko rasti sertifikato d�l \"%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 "Nepavyko i�koduoti lai�ko."
 
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
 msgid "Failed to verify certificates."
 msgstr "Nepavyko patikrinti sertifikat�."
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Negaliu sukurti aplanko u�rakto ant %s: %s"
 
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Negaliu sukurti aplanko u�rakto ant %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 #, fuzzy
 msgid "Unable to get issuer's certificate"
 msgstr "Nepavyko patikrinti sertifikat�."
 
-#: 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 "Nepavyko patikrinti sertifikat�."
 
-#: 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 "Para�o byla:"
 
-#: 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 "Klaida �keliant %s"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 #, fuzzy
 msgid "Out of memory"
 msgstr "Nesu darbe"
 
-#: 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 "Nepavyko patikrinti sertifikat�."
 
-#: 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 "Blogas argumentas"
 
-#: 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"
@@ -9018,15 +9211,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"
@@ -9044,7 +9237,7 @@ msgstr ""
 "Ar nori priimti vis tiek?"
 
 #. 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"
@@ -9059,35 +9252,35 @@ msgstr ""
 "\n"
 "Ar nori priimti vis tiek?"
 
-#: 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 "Negal�jau i�nagrin�ti URL �%s�"
@@ -9102,40 +9295,40 @@ msgstr "Klaida pradedant %s"
 msgid "No such message %s in %s"
 msgstr "N�ra tokio lai�ko %s aplanke %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 "Patikrinti, ar yra nauj� lai�k� visuose aplankuose"
 
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Negaliu i�trinti aplanko: %s: Bloga operacija"
 
-#: camel/camel-vee-store.c:319
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Negaliu i�trinti aplanko: %s: N�ra tokio aplanko"
 
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
 
-#: camel/camel-vee-store.c:340
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Negaliu pervadinti aplanko: %s: N�ra tokio aplanko"
 
 #: 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 "Veiksmas nutrauktas"
 
 #: 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 "Serveris netik�tai atsijung�: %s"
@@ -9158,52 +9351,52 @@ msgstr "Netik�tas atsakymas i� IMAP serverio: %s"
 msgid "IMAP command failed: %s"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr "Serverio atsakymas baig�si per anksti."
 
-#: 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 serverio atsakyme nebuvo %s informacijos"
 
-#: 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 "Netik�tas atsakymas OK i� IMAP serverio: %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 "Negal�jau sukurti katalogo %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 "Nepavyko �kelti %s santraukos"
 
-#: 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 "Aplankas serveryje buvo sunaikintas ir v�l sukurtas."
 
 #. 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 "Ie�koma pakeist� lai�k�"
 
-#: 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 "Nepavyko i�koduoti lai�ko."
 
-#: 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"
@@ -9212,24 +9405,24 @@ msgstr ""
 "Negaliu gauti lai�ko: %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 "N�ra tokio lai�ko"
 
-#: 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 "�is lai�kas �iuo metu nepasiekiamas"
 
-#: 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 "Negal�jau rasti lai�ko teksto FETCH atsakyme"
 
@@ -9259,7 +9452,7 @@ msgstr "Tikrinama, ar yra nauj� lai�k�"
 msgid "Check for new messages in all folders"
 msgstr "Patikrinti, ar yra nauj� lai�k� visuose aplankuose"
 
-#: 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 "Aplankai"
 
@@ -9289,7 +9482,7 @@ msgstr "Pa�to skaitymui ir ra�ymui IMAP serveriuose."
 
 #: 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 "Slapta�odis"
 
@@ -9309,62 +9502,61 @@ msgstr "SMTP serveris %s"
 msgid "IMAP service for %s on %s"
 msgstr "SMTP serveris %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 "Jungtis nutraukta"
 
-#: 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 "Negal�jau prisijungti prie %s (prievadas %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 ""
 "Negal�jau prisijungti prie POP serverio.\n"
 "Klaida siun�iant vartotojo vard�: %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 "Veiksmas nepalaikomas"
 
-#: 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 "Autentikacija nepavyko."
 
-#: 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 serveris %s nepalaiko pra�yto autentikacijos tipo %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 "Nepalaikoma %s tipo autentikacija"
 
-#: 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 "%sPra�om �vesti IMAP slapta�od� d�l %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 "Tu ne�vedei slapta�od�io."
 
-#: 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"
@@ -9374,24 +9566,24 @@ msgstr ""
 "Negal�jau autentikuotis � IMAP server�.\n"
 "%s\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 "N�ra tokio aplanko %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 "Aplanko varde negali b�ti Return simbolio."
 
-#: 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 "Ne�inoma klaida: %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 "T�vinis aplankas negali tur�ti vaikini� aplank�"
 
@@ -9467,8 +9659,8 @@ msgid ""
 msgstr "Vietinio pa�to skaitymui ir laikymui standartin�se mbox bylose"
 
 #: 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 "Saugyklos �aknis %s n�ra absoliutus kelias"
@@ -9480,36 +9672,36 @@ msgstr "Saugyklos �aknis %s n�ra n�ra paprastas katalogas"
 
 #: 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 "Negal�jau gauti aplanko �%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 "Vietin�se saugyklose n�ra 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 "Vietin� pa�to byla %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 "Negal�jau pervadinti aplanko �%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 "Negal�jau pervadinti aplanko: %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 "Negal�jau i�trinti aplanko santraukos bylos �%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 "Negal�jau i�trinti aplanko indekso bylos �%s�: %s"
@@ -9519,7 +9711,7 @@ msgstr "Negal�jau i�trinti aplanko indekso bylos �%s�: %s"
 msgid "Could not save summary: %s: %s"
 msgstr "Negal�jau i�saugoti santraukos: %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 "Nepavyko prid�ti lai�ko � santrauk�: ne�inoma prie�astis"
 
@@ -9533,14 +9725,14 @@ msgstr "Nes�km� ties lai�ku %d"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Negal�jau pridurti lai�ko prie maildir aplanko: %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 "Blogas lai�ko turinys"
 
 #: 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"
@@ -9552,14 +9744,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 "N�ra tokio aplanko �%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"
@@ -9574,73 +9766,73 @@ msgid "`%s' is not a maildir directory."
 msgstr "�%s� n�ra maildir katalogas."
 
 #: 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 "Negal�jau i�trinti aplanko �%s�: %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:169
 msgid "not a maildir directory"
 msgstr "ne maildir katalogas"
 
 #: 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 ""
 "Negal�jau sukurti aplanko: �%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 "Negaliu atidaryti maildir katalogo kelio: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:539
+#: camel/providers/local/camel-maildir-summary.c:541
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Tikrinama, ar yra nauj� lai�k�"
 
-#: camel/providers/local/camel-maildir-summary.c:640
+#: camel/providers/local/camel-maildir-summary.c:644
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Ie�koma nauj� lai�k�"
 
-#: 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 "�ra�omas aplankas"
 
-#: 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 "Negaliu sukurti aplanko u�rakto ant %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 "Negaliu atidaryti pa�to d��ut�s: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:278
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Veiksmas nutrauktas"
 
-#: 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 "Negaliu pridurti lai�ko prie mbox bylos: %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"
@@ -9649,11 +9841,11 @@ msgstr ""
 "Negaliu gauti lai�ko: %s i� aplanko %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 "Atrodo, jog aplankas yra neatkuriamai sugadintas."
 
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Nepavyko sukurti lai�ko: Sugadinta pa�to d��ut�?"
 
@@ -9696,75 +9888,75 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Aplankas �%s� n�ra tu��ias. Nei�tryniau."
 
-#: 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 "Negal�jau atidaryti aplanko: %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 "Negal�jau patikrinti aplanko: %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 "Negal�jau atidaryti bylos: %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 "Negal�jau atidaryti laikinos pa�to bylos: %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 "Negal�jau u�daryti �altinio aplanko %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 "Negal�jau u�daryti laikino aplanko:  %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 "Negal�jau pervadinti aplanko: %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 "Santrauka ir aplankas nesutampa net po sinchronizavimo"
 
-#: 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 "Ne�inoma klaida: %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 "Negal�jau pervadinti aplanko: %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 "Klaida ra�ant � laikin� pa�to d��ut�: %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 "Nepavyko ra�yti � laikin� pa�to d��ut�: %s: %s"
@@ -9784,67 +9976,67 @@ msgstr "Negal�jau pridurti lai�ko prie mh aplanko: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "�%s� n�ra katalogas."
 
-#: 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 "Negaliu atidaryti MH katalogo kelio: %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 aplank� negalima pervadinti"
 
-#: 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 "Saugyklos �aknis %s n�ra n�ra paprastas katalogas"
 
-#: 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 "N�ra tokio aplanko �%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� n�ra paprasta byla."
 
-#: 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 pa�to byla %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 aplank� negalima pervadinti"
 
-#: camel/providers/local/camel-spool-store.c:213
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr "Spool aplank� negalima pervadinti"
 
-#: camel/providers/local/camel-spool-store.c:221
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr "Spool aplank� negalima i�trinti"
 
-#: 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 "Negal�jau atidaryti laikinos pa�to bylos %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 "Negal�jau u�daryti �altinio aplanko %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 ""
@@ -9924,45 +10116,45 @@ msgid "Retrieving POP summary"
 msgstr "Parsiun�iama POP santrauka"
 
 #: 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 "Veiksmas nutrauktas"
 
-#: 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 "Negal�jau gauti aplanko �%s�: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:306
+#: camel/providers/pop3/camel-pop3-folder.c:308
 msgid "Expunging deleted messages"
 msgstr "Sunaikinami i�trinti lai�kai"
 
-#: 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 "N�ra lai�ko su 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 "Parsiun�iamas POP lai�kas %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 ""
 "Negaliu gauti lai�ko: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Ne�inoma klaida"
@@ -9980,7 +10172,7 @@ msgstr "Palikti lai�kus serveryje"
 msgid "Delete after %s day(s)"
 msgstr "I�trinti po %s dienos(�)"
 
-#: 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"
 
@@ -10007,27 +10199,27 @@ msgstr ""
 "slapta�odis per APOP protokol�. Tai gali veikti ne visiems vartotojams netgi "
 "serveriuose, kurie teigia, jog j� palaiko."
 
-#: 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 "Negal�jau prisijungti prie %s (prievadas %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 ""
 "Negal�jau prisijungti prie POP serverio.\n"
 "Klaida siun�iant vartotojo vard�: %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 "Negal�jau prisijungti prie POP serverio %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 "
@@ -10036,28 +10228,28 @@ msgstr ""
 "Negaliu prisijungti prie POP serverio.\n"
 "Jis nepalaiko pra�yto autentikacijos mechanizmo."
 
-#: 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 "Nepavyko IMAP komanda: %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 "Negal�jau autentikuotis � KPOP server�: %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 "%sPra�om �vesti POP3 slapta�od� d�l %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"
@@ -10066,13 +10258,13 @@ msgstr ""
 "Negal�jau prisijungti prie POP serverio.\n"
 "Klaida siun�iant slapta�od�: %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�ra tokio aplanko �%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"
 
@@ -10083,50 +10275,50 @@ msgid ""
 msgstr ""
 "Pa�to siuntimui, perleid�iant j� vietin�s sistemos �sendmail� programai."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
 #, fuzzy
 msgid "Could not parse recipient list"
 msgstr "Negal�jau i�nagrin�ti 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 "Negal�jau sukurti pipe � sendmail: %s: pa�tas nei�si�stas"
 
-#: 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 "Negal�jau i�si�sti lai�ko: %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'as baig� darb� signalu %s: pa�tas nei�si�stas."
 
-#: 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 "Negal�jau paleisti %s: pa�tas nei�si�stas."
 
-#: 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'as baig� darb� b�sena %d: pa�tas nei�si�stas."
 
-#: 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 "Pa�to siuntimas per sendmail program�"
 
-#: 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"
 
@@ -10136,141 +10328,141 @@ msgstr ""
 "Pa�to siuntimui, prisijungiant prie nutolusio pa�to serverio naudojant "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaks�s klaida, komanda neatpa�inta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr "Sintakses klaida parametruose arba argumentuose"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr "Komanda ne�gyvendinta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr "Komandos parametras ne�gyvendintas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr "Sistemos b�sena, arba sistemos pagalbos atsakymas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr "Pagalbos �inut�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr "Paslauga pasiruo�usi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr "Paslauga u�daro transmisijos kanal�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr "Paslauga neprieinama, u�daromas transmisijos kanalas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr "Pra�ytas pa�to veiksmas pavyko, u�baigtas"
 
-#: 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 "Pra�ytas pa�to veiksmas ne�vykdytas: pa�to d��ut� neprieinama"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Pra�ytas veiksmas ne�vykdytas: pa�to d��ut� neprieinama"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr "Pra�ytas veiksmas nutrauktas: klaida vykdant"
 
-#: 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 "Pra�ytas veiksmas ne�vykdytas: tr�ksta vietos sistemoje"
 
-#: 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 "Pra�ytas veiksmas ne�vykdytas: per�engta vietos saugykloje riba"
 
-#: 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 "Pra�ytas veiksmas ne�vykdytas: pa�to d��ut�s vardas neleistinas"
 
-#: 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 "Tranzakcija nepavyko"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Nepateiktas slapta�odis."
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr "Autentikacijos mechanizmas per silpnas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Pra�ytam autentikacijos mechanizmui b�tinas �ifravimas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr "Laikina autentikacijos nes�km�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "Autentikacija b�tina"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 #, fuzzy
 msgid "Welcome response error"
 msgstr "RSET atsakymo klaida: %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 ""
 "Negal�jau prisijungti prie POP serverio.\n"
 "Klaida siun�iant vartotojo vard�: %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 "Atrodo, jog aplankas yra neatkuriamai sugadintas."
 
-#: 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 "Baig�si AUTH u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET atsakymo klaida: %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 serveris %s nepalaiko pra�yto autentikacijos tipo %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 "%sPra�om �vesti SMTP slapta�od� d�l %s@%s"
@@ -10299,11 +10491,11 @@ msgstr "SMTP pa�to siuntimas per %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Negaliu si�sti lai�ko: siunt�jo adresas neteisingas."
 
-#: 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 "Siun�iamas lai�kas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:703
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
 
@@ -10312,63 +10504,63 @@ msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr "SMTP pasveikinimas"
 
-#: 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 "Baig�si RSET u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET atsakymo klaida: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr "SMTP autentikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr "Klaida sukuriant SASL autentikacijos objekt�."
 
-#: 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 "Baig�si AUTH u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr "AUTH u�klausa nepavyko."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr "Blogas autentikacijos atsakymas i� serverio.\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 "Baig�si MAIL FROM u�klausos laiko riba: %s: pa�tas nei�si�stas"
 
-#: 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 atsakymo klaida: %s: pa�tas nei�si�stas"
 
-#: 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 "Baig�si RCPT TO u�klausos laiko riba: %s: pa�tas nei�si�stas"
 
-#: 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 "Baig�si DATA u�klausos laiko riba: %s: pa�tas nei�si�stas"
@@ -10376,82 +10568,82 @@ msgstr "Baig�si DATA u�klausos laiko riba: %s: pa�tas nei�si�stas"
 #. 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 atsakymo klaida: %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 ""
 "Baig�si DATA siuntimo laiko riba: lai�ko nutraukimas: %s: pa�tas nei�si�stas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Blogas autentikacijos atsakymas i� serverio."
 
-#: 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 "Baig�si RSET u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET atsakymo klaida: %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 "Baig�si AUTH u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET atsakymo klaida: %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 "priedas"
 
-#: 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 "Pa�alinti pa�ym�tus elementus i� pried� s�ra�o"
 
-#: composer/e-msg-composer-attachment-bar.c:551
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Prisegti pried�..."
 
-#: composer/e-msg-composer-attachment-bar.c:552
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "Prisegti byl� prie �io lai�ko"
 
-#: 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 "Negal�jau prisegti bylos %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 "Negaliu prisegti bylos %s: ne paprasta byla"
@@ -10469,11 +10661,15 @@ msgid "MIME type:"
 msgstr "MIME tipas:"
 
 #: 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 "Pasi�lyti automatin� priedo parodym�"
 
-#: 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 "Paspausk �ia, jei reikia adres� knygel�s"
 
@@ -10484,45 +10680,45 @@ msgstr "Paspausk �ia, jei reikia adres� knygel�s"
 #. * 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 "Atsakyti-kam:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:411
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Nuo:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Tema:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:432
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "�vesk lai�ko gav�jus"
 
-#: 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 "�vesk adresus, kurie gaus �io lai�ko carbon copy"
 
-#: 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."
@@ -10533,27 +10729,28 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:447
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "_Prievadas:"
 
-#: composer/e-msg-composer-hdrs.c:449
+#: composer/e-msg-composer-hdrs.c:549
 #, fuzzy
 msgid "Posting destination"
 msgstr "apra�ymas"
 
-#: 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 "Prisegti byl�"
 
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:533
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Negal�jau prisijungti prie POP serverio %s."
 
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10562,34 +10759,30 @@ msgstr ""
 "Klaida skaitant byl� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1160
-msgid "Warning!"
-msgstr "�sp�jimas!"
-
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Byla egzistuoja, u�ra�yti?"
 
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Klaida i�saugant byl�: %s"
 
-#: composer/e-msg-composer.c:1207
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Klaida �keliant byl�: %s"
 
-#: composer/e-msg-composer.c:1240
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Klaida prieinant prie bylos: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Nepavyko gauti lai�ko i� redaktoriaus"
 
-#: composer/e-msg-composer.c:1255
+#: composer/e-msg-composer.c:1269
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10598,7 +10791,7 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1276
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10607,7 +10800,16 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %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 ""
+"Negaliu sukurti i�vesties bylos: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10616,7 +10818,7 @@ msgstr ""
 "Klaida automati�kai i�saugant lai�k�: %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?"
@@ -10624,7 +10826,7 @@ msgstr ""
 "Ximian Evolution rado nei�saugot� byl� i� praeitos sesijos.\n"
 "Ar nor�tum pabandyti jas atkurti?"
 
-#: composer/e-msg-composer.c:1525
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10635,34 +10837,39 @@ msgstr ""
 "\n"
 "Ar nor�tum i�saugoti jo pakeitimus?"
 
-#: 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 "�sp�jimas: Pakeistas lai�kas"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Atidaryti byl�"
 
-#: composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Signature:"
 msgstr "I�saugoti para��"
 
-#: 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 "Sukurti lai�k�"
 
-#: 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"
@@ -10673,7 +10880,7 @@ msgstr ""
 "Negal�jau sukurti ra�ykl�s lango:\n"
 "Nepavyko aktyvuoti HTML redaktoriaus komponento."
 
-#: 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."
@@ -10681,25 +10888,12 @@ msgstr ""
 "Negal�jau sukurti ra�ykl�s lango:\n"
 "Nepavyko aktyvuoti HTML redaktoriaus komponento."
 
-#: 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 ""
-"Negal�jau sukurti ra�ykl�s lango, nes tu dar nenurodei\n"
-"jokios asmenyb�s pa�to komponente."
-
-#: composer/evolution-composer.c:408
-#, fuzzy
-msgid "Cannot initialize the Evolution composer."
-msgstr "Negal�jau inicializuoti Evolution ra�ykl�s."
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr ""
@@ -10749,8 +10943,111 @@ msgstr "Tema savyje turi"
 msgid "Subject does not contain"
 msgstr "Tema savyje neturi"
 
-#: 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 "Nesu darbe"
+
+#: designs/OOA/ooa.glade.h:5
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "_B�sena:"
+
+#: 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 "Nesu darbe"
+
+#: designs/OOA/ooa.glade.h:13
+#, fuzzy
+msgid "Yes, Change Status"
+msgstr "B�sena"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:2
+#, fuzzy
+msgid "<b>Receiving Email</b>"
+msgstr "Pa�to gavimas"
+
+#: designs/read_receipts/read.glade.h:3
+#, fuzzy
+msgid "<b>Sending Email:</b>"
+msgstr "Pa�to siuntimas"
+
+#: 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 "Gav�jai"
+
+#: 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?"
@@ -10758,214 +11055,240 @@ msgstr ""
 "Byla tokiu vardu jau yra.\n"
 "U�ra�yti j�?"
 
-#: e-util/e-passwords.c:363
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "U�ra�yti byl�?"
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Prisiminti �� slapta�od�"
 
-#: e-util/e-passwords.c:365
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Prisiminti �� slapta�od� iki �ios sesijos galo"
 
-#: 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 "Kategorijos"
 
 #. 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 "sekund�i�"
+#: 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 sekund�i�"
 
-#: filter/filter-datespec.c:72
-msgid "hour"
-msgstr "valanda"
+#: filter/filter-datespec.c:66
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 minut�"
 
-#: filter/filter-datespec.c:74
-msgid "week"
-msgstr "savait�"
+#: filter/filter-datespec.c:66
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "%d minu�i�"
 
-#: filter/filter-datespec.c:74 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "savai�i�"
+#: filter/filter-datespec.c:67
+#, fuzzy
+msgid "1 hour ago"
+msgstr "1 valanda"
+
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d valand�"
 
-#: filter/filter-datespec.c:75
-msgid "month"
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "1 day ago"
+msgstr "1 diena"
+
+#: 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 savait�"
+
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d savai�i�"
+
+#: filter/filter-datespec.c:70
+#, fuzzy
+msgid "1 month ago"
 msgstr "m�nesis"
 
-#: filter/filter-datespec.c:75 filter/filter.glade.h:23
-msgid "months"
-msgstr "m�nesi�"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr " "
 
-#: filter/filter-datespec.c:76
-msgid "year"
-msgstr "metai"
+#: filter/filter-datespec.c:71
+msgid "1 year ago"
+msgstr ""
 
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
-msgid "years"
-msgstr "met�"
+#: 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 "Tu u�mir�ai pasirinkti dat�."
 
-#: filter/filter-datespec.c:269
+#: filter/filter-datespec.c:275
 msgid "<click here to select a date>"
 msgstr "<spausk �ia, kad pasirinktum dat�>"
 
-#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
 msgid "now"
 msgstr "dabar"
 
 #. 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 " "
-
-#: filter/filter-datespec.c:407
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Pasirink laik�, su kuriuo palyginti"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Filtravimo taisykl�s"
 
-#: 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 "Stiliaus vardas:"
 
-#: 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'as �%s� neegzistuoja arba n�ra paprasta byla."
 
-#: filter/filter-file.c:307
+#: filter/filter-file.c:298
 #, fuzzy
 msgid "Choose a file"
 msgstr "Pasirink veiksm�"
 
 #. and now for the action area
-#: filter/filter-filter.c:513
+#: filter/filter-filter.c:491
 msgid "Then"
 msgstr "Tada"
 
-#: filter/filter-filter.c:527
-msgid "Add action"
-msgstr "Prid�ti veiksm�"
-
-#: 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 "Stiliaus vardas:"
 
-#: 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 "Pasirink aplank�"
 
-#: filter/filter-input.c:200
+#: filter/filter-input.c:191
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10974,79 +11297,77 @@ msgstr ""
 "Klaida reguliarioje i�rai�koje �%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 "Svarbus"
 
 #. 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 "Dirbama"
 
 #. 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 "Togas"
 
 #. 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 "po"
 
-#: 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 "Bandyti"
 
-#: filter/filter-rule.c:223
+#: filter/filter-rule.c:219
 #, fuzzy
 msgid "You must name this filter."
 msgstr "Keisti �io aplanko pavadinim�"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:751
 msgid "Rule name: "
 msgstr "Taisykl�s pavadinimas:"
 
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:755
 msgid "Untitled"
 msgstr "Bevard�"
 
-#: filter/filter-rule.c:785
+#: filter/filter-rule.c:772
 msgid "If"
 msgstr "Jeigu"
 
-#: filter/filter-rule.c:803
+#: filter/filter-rule.c:790
 msgid "Execute actions"
 msgstr "�vykdyti veiksmus"
 
-#: filter/filter-rule.c:807
+#: filter/filter-rule.c:794
 msgid "if all criteria are met"
 msgstr "jei visos s�lygos tenkinamos"
 
-#: filter/filter-rule.c:812
+#: filter/filter-rule.c:799
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "jei kuri nors s�lyga tenkinama"
 
-#: filter/filter-rule.c:823
-msgid "Add criterion"
-msgstr "Prid�ti s�lyg�"
-
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "incoming"
 msgstr "gaunamas"
 
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "outgoing"
 msgstr "siun�iamas"
 
@@ -11098,7 +11419,7 @@ msgstr ""
 "Lai�ko data bus palyginta su laiku,\n"
 "kur� tu nurodai �ia."
 
-#: 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�s aplankai"
 
@@ -11110,6 +11431,14 @@ msgstr "laikas, santykinis esamam laikui"
 msgid "ago"
 msgstr " "
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "m�nesi�"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr "sekund�i�"
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "tik nurodyti aplankai"
@@ -11127,6 +11456,10 @@ msgstr "tavo nurodytas laikas"
 msgid "vFolder Sources"
 msgstr "vAplank� �altiniai"
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "savai�i�"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "su visais aktyviais nutolusiais aplankais"
@@ -11139,6 +11472,10 @@ msgstr "su visais vietiniais ir aktyviais nutolusiais aplankais"
 msgid "with all local folders"
 msgstr "su visais vietiniais aplankais"
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "met�"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -11270,7 +11607,7 @@ msgstr "n�ra"
 msgid "is not Flagged"
 msgstr "n�ra"
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 msgid "Label"
 msgstr ""
 
@@ -11300,7 +11637,7 @@ msgstr "Si�sti lai�k� kontaktui"
 msgid "Play Sound"
 msgstr "Groti gars�:"
 
-#: 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 "Skaitytas"
 
@@ -11331,12 +11668,12 @@ msgstr "yra didesnis u�"
 msgid "returns less than"
 msgstr "yra ma�esnis u�"
 
-#: 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 "�vertis"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "Siunt�jas"
 
@@ -11373,8 +11710,9 @@ msgstr "prasideda su"
 msgid "Stop Processing"
 msgstr "Sustabdyti vykdym�"
 
-#: 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 "Tema"
 
@@ -11383,69 +11721,85 @@ msgstr "Tema"
 msgid "Unset Status"
 msgstr "Priskirti b�sen�"
 
-#: filter/rule-editor.c:180
-msgid "Rules"
-msgstr "Taisykl�s"
-
-#: 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 "Taisykl�s"
+
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Prid�ti taisykl�"
 
-#: filter/rule-editor.c:388
+#: filter/rule-editor.c:372
 msgid "Edit Rule"
 msgstr "Keisti taisykl�"
 
-#: filter/score-editor.c:130
+#: filter/rule-editor.c:689
+#, fuzzy
+msgid "Rule name"
+msgstr "Taisykl�s pavadinimas:"
+
+#: filter/score-editor.c:114
 msgid "Score Rules"
 msgstr "�ver�io taisykl�s"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Keisti �io aplanko pavadinim�"
 
-#: filter/vfolder-rule.c:215
+#: filter/vfolder-rule.c:222
 msgid "You need to to specify at least one folder as a source."
 msgstr "Tu turi nurodyti bent vien� aplank� kaip �altin�"
 
-#: importers/elm-importer.c:95
+#: filter/vfolder-rule.c:499
+#, fuzzy
+msgid "VFolder source"
+msgstr "vAplank� �altiniai"
+
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuoja tavo sen� Elm pa�t�"
 
 #: 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 "Importuojama..."
 
 #: 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 "Pra�ome palaukti"
 
 #: 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 "Importuojama %s kaip %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 "Skanuojama %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 "Pa�tas"
 
-#: 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?"
@@ -11453,7 +11807,7 @@ msgstr ""
 "Evolution rado Elm pa�to byl�\n"
 "Ar nor�tum jas importuoti � Evolution?"
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -11465,12 +11819,12 @@ msgstr ""
 "Evolution rado GnomeCard byl�.\n"
 "Ar nor�tum jas importuoti � 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 "_Svarbumas:"
 
-#: 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"
@@ -11485,7 +11839,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"
@@ -11493,7 +11847,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"
@@ -11502,39 +11856,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 importuoja tavo senus Netscape duomenis"
 
 #. 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 "�iuk�l�s"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Vietin� pa�to byla %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 "Skanuojamas katalogas"
 
-#: 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 "Pradedama importuoti"
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Nuostatos"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Keisti filtrus"
 
-#: 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?"
@@ -11542,11 +11898,11 @@ msgstr ""
 "Evolution rado Netscape pa�to byl�.\n"
 "Ar nor�tum jas importuoti � 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 importuoja tavo senus Pine duomenis"
 
-#: 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?"
@@ -11554,423 +11910,411 @@ msgstr ""
 "Evolution rado Pine pa�to byl�.\n"
 "Ar nor�tum jas importuoti � 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
 #, fuzzy
 msgid "Composer Preferences"
 msgstr "Kalendoriaus nuostatos"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Evolution pa�to komponento gamykla."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Evolution pa�to komponento gamykla."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Evolution pa�to komponento gamykla."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Evolution ra�ykl�s komponento gamykla."
-
-#: 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 pa�to komponento gamykla."
 
-#: 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 "Sukurti ir keisti pa�to s�skaitas ir kitas nuostatas"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Evolution komponentas pa�tui tvarkyti."
+#: 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 "Evolution pa�to nustatymas"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
 msgstr "Evolution pa�to ra�ykl�."
 
-#: 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 "Evolution pa�to komponento."
+msgid "Evolution Mail composer"
+msgstr "Evolution pa�to ra�ykl�."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Evolution pa�to aplanko vaizdavimo komponentas."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution pa�to nustatymas"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
-msgstr "Evolution pa�to aplanko gamyklos komponentas."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Pa�to nustatymo s�saja"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
-msgstr "Evolution ra�ykl�s komponento gamykla."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution pa�to aplanko vaizdavimo komponentas."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
-msgstr "Pa�to ap�valgos komponento gamykla."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Evolution pa�to nustatymas"
 
-#: 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 pa�to komponento."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 #, fuzzy
 msgid "Font Preferences"
 msgstr "Kalendoriaus nuostatos"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Pa�to s�skaita"
 
-#: 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 "Kalendoriaus nuostatos"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-msgid "Mail configuration interface"
-msgstr "Pa�to nustatymo s�saja"
-
-#: mail/component-factory.c:102
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Aplankas, kuriame yra lai�kai"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public Mail"
 msgstr "Vie�as"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "Aplankas, kuriame yra lai�kai"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Virtuali �iuk�lin�"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Virtualus �iuk�lin�s aplankas"
 
-#: mail/component-factory.c:132
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "�iame aplanke negali b�ti lai�k�."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Savyb�s..."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Pakeisti �io aplanko savybes"
 
-#: 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 "Tu nenustatei pa�to siuntimo metodo"
 
-#: 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 "�sp�jimas: Pakeistas lai�kas"
-
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Naujas pa�to lai�kas"
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "_Pa�to lai�kas"
 
-#: mail/component-factory.c:1041
+#: mail/component-factory.c:1061
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Sukurti lai�k�"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "New Message Post"
 msgstr "Kit� lai�k�"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "_Post Message"
 msgstr "S_pausdinti lai�k�"
 
-#: mail/component-factory.c:1050
+#: mail/component-factory.c:1070
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Naujas pa�to lai�kas"
 
-#: mail/component-factory.c:1078
-#, fuzzy
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Negaliu inicializuoti Evolution pa�to komponento."
-
-#: mail/component-factory.c:1087
-#, fuzzy
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Negaliu inicializuoti Evolution pa�to komponento."
-
-#: mail/component-factory.c:1093
-#, fuzzy
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Negaliu inicializuoti Evolution pa�to komponento."
-
-#: mail/component-factory.c:1334 mail/component-factory.c:1364
+#: mail/component-factory.c:1353
 #, fuzzy
 msgid "Connecting..."
 msgstr "Jungiamasi prie serverio..."
 
-#: mail/component-factory.c:1375
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Negaliu u�registruoti saugyklos apvalkale"
 
-#: mail/folder-browser-ui.c:471
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "�%s� savyb�s"
 
-#: mail/folder-browser-ui.c:473
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Savyb�s"
 
-#: 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 "Negal�jau sukurti laikino katalogo: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr "%d nauji"
 
-#: 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 pasl�pti"
 
-#: 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 pa�ym�ti"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr "%d nei�si�sti"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d sent"
 msgstr "%d i�si�sti"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr "%d i� viso"
 
-#: mail/folder-browser.c:1118
+#: mail/folder-browser.c:1182
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Sukurti _virtual� aplank� i� lai�ko"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "vAplankas pagal _Tem�"
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "vAplankas pagal Siu_nt�j�"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "vAplankas pagal _Gav�jus"
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "vAplankas pagal _Konferencij�"
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "Filtras pagal T_em�"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "Filtras pagal Si_unt�j�"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "Filtras pagal Ga_v�jus"
 
-#: 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 "Filtras pagal K_onferencij�"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "_Taisyti kaip nauj� lai�k�..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "S_pausdinti"
 
-#: 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 "_Atsakyti siunt�jui"
 
-#: 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 "Atsakyti � _konferencij�"
 
-#: 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 "Atsakyti _visiems"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "P_ersi�sti"
 
-#: 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 "U�baigta"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1772
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "I�valyti"
 
 #. 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 "Pa�ym�ti s_kaitytu"
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1777
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Pa�ym�ti _neskaitytu"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "Pa�ym�ti svarb_iu"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1779
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Pa�ym�ti nesva_rbiu"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1784
 #, fuzzy
 msgid "U_ndelete"
 msgstr "S_ugr��inti"
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1788
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Perkelti � aplank�..."
 
-#: 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_opijuoti � aplank�..."
 
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1797
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Prid�ti siunt�j� � adres� knygel�"
 
-#: mail/folder-browser.c:1774
+#: mail/folder-browser.c:1801
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Pritaikyti filtrus"
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1805
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Sukurti _taisykl� i� lai�ko"
 
-#: mail/folder-browser.c:2036
+#: mail/folder-browser.c:2064
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "vAplankas pagal Konferencij�"
 
-#: mail/folder-browser.c:2038
+#: mail/folder-browser.c:2066
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtras pagal Konferencij� (%s)"
 
-#: mail/folder-browser.c:2039
+#: mail/folder-browser.c:2067
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "vAplankas pagal Konferencij� (%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 "�p_rastas"
 
-#: mail/folder-info.c:71
+#: mail/folder-info.c:70
 msgid "Getting Folder Information"
 msgstr "Gaunama informacija apie aplank�"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "Gamykla importuoti mbox byloms � Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Evolution pa�to ra�ykl�."
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolution pa�to ra�ykl�."
+
+#: 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 pa�to ra�ykl�."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Importuoja mbox bylas � 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 "Gamykla importuoti Outlook Express 4 byloms � 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 "Importuoja Outlook Express 4 bylas � Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Evolution pa�to ra�ykl�."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -12007,100 +12351,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 "Tu ne�vedei visos b�tinos informacijos."
 
 #. 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 s�skait� tvarkykl�"
 
-#: 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 "_Hostas:"
 
-#: 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 "_Vartotojo vardas:"
 
-#: 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 "_Kelias:"
 
-#: mail/mail-account-gui.c:1847
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr "Tu negali sukurti dviej� aplank� tuo pa�iu vardu."
 
-#: mail/mail-accounts.c:224
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr "Ar tu tikrai nori i�trinti �i� s�skait�?"
 
-#: mail/mail-accounts.c:228
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "Nei�trinti"
 
-#: mail/mail-accounts.c:231
-msgid "Really delete account?"
-msgstr "Ar tikrai i�trinti s�skait�?"
-
-#: 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 "I�jungti"
 
-#: 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 "�jungti"
 
-#: 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 "�p_rastas"
+
+#: 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 "�jungta"
 
-#: 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 "_S�skaitos vardas:"
 
-#: 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 Rikas"
 
-#: mail/mail-autofilter.c:78
+#: mail/mail-autofilter.c:74
 #, fuzzy, c-format
 msgid "Mail to %s"
 msgstr "Lai�kai � %s"
 
-#: mail/mail-autofilter.c:242
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Tema yra %s"
 
-#: mail/mail-autofilter.c:258
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Lai�kai nuo %s"
 
-#: mail/mail-autofilter.c:275
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s konferencija"
 
-#: mail/mail-autofilter.c:327
+#: mail/mail-autofilter.c:323
 msgid "Add Filter Rule"
 msgstr "Prid�ti filtro taisykl�"
 
-#: 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"
@@ -12112,7 +12456,12 @@ msgstr ""
 "    '%s'\n"
 "Ir buvo atnaujinti."
 
-#: 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 "Kit� kart� neberodyti �ios �inut�s."
+
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -12124,7 +12473,16 @@ msgstr ""
 "gauti ir ra�yti lai�kus.\n"
 "Ar nor�tum sutvarkyti j� dabar?"
 
-#: 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 ""
+"Tu turi susitvarkyti asmenyb�,\n"
+"tik tada gal�si kurti lai�kus."
+
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -12132,7 +12490,7 @@ msgstr ""
 "Tu turi susitvarkyti asmenyb�,\n"
 "tik tada gal�si kurti lai�kus."
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -12141,7 +12499,7 @@ msgstr ""
 "tik tada gal�si kurti lai�kus."
 
 #. 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"
@@ -12150,11 +12508,11 @@ msgstr ""
 "Tu siunti HTML formatuot� lai�k�, bet sekantys gav�jai nem�gsta HTML "
 "formatuoto pa�to:\n"
 
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "Si�sti vistiek?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12162,7 +12520,7 @@ msgstr ""
 "�is lai�kas neturi temos.\n"
 "Tikrai si�sti?"
 
-#: 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."
@@ -12170,11 +12528,11 @@ msgstr ""
 "Kadangi kontakt� s�ra�as, kuriam tu siunti, yra sukonfig�ruotas sl�pti "
 "s�ra�o adresus, �iame lai�ke bus tik Bcc gav�jai."
 
-#: mail/mail-callbacks.c:360
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr "�iame lai�ke yra tik Bcc gav�jai."
 
-#: mail/mail-callbacks.c:364
+#: mail/mail-callbacks.c:322
 #, fuzzy
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -12182,11 +12540,11 @@ msgid ""
 "Send anyway?"
 msgstr "Gali b�ti, kad pa�to serveris"
 
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr "Tu turi nurodyti gav�jus, kad gal�tum i�si�sti �� lai�k�."
 
-#: 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?"
@@ -12194,28 +12552,28 @@ msgstr ""
 "Nepavyko atidaryti �ios s�skaitos juodra��i� aplanko.\n"
 "Ar nor�tum naudoti �prastin� juodra��i� aplank�?"
 
-#: mail/mail-callbacks.c:1207
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "ne�inomas siunt�jas"
 
-#: 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 ra��:"
 
-#: 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 "Perkelti lai�k�(us) �"
 
-#: 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 "Kopijuoti lai�k�(us) �"
 
-#: mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ar tu tikrai nori taisyti visus %d lai�kus?"
 
-#: mail/mail-callbacks.c:2406
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12223,7 +12581,7 @@ msgstr ""
 "Tu gali taisyti tik lai�kus, esan�ius \n"
 "Juodra��i� aplanke."
 
-#: mail/mail-callbacks.c:2445
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12231,42 +12589,46 @@ msgstr ""
 "Tu gali i� naujo pasi�sti lai�kus\n"
 "tik i� Sent aplanko."
 
-#: mail/mail-callbacks.c:2459
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Ar tu tikrai nori v�l si�sti visus %d lai�kus?"
 
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "Joks lai�kas nepa�ym�tas"
 
-#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
-msgid "Overwrite file?"
-msgstr "U�ra�yti byl�?"
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"Negaliu gauti lai�ko: %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 jau egzistuoja.\n"
+"Ar nori �ra�yti vietoj jo?"
+
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "I�saugoti lai�k� kaip..."
 
-#: mail/mail-callbacks.c:2586
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "I�saugoti lai�kus kaip..."
 
-#: mail/mail-callbacks.c:2655
+#: mail/mail-callbacks.c:2687
 #, fuzzy
-msgid "Go to next folder with unread messages?"
-msgstr "Parodyti kit� neskaityt� lai�k�"
-
-#: 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 ""
@@ -12275,7 +12637,7 @@ msgstr ""
 "\n"
 "Tikrai i�trinti tuos lai�kus?"
 
-#: mail/mail-callbacks.c:3018
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12284,64 +12646,64 @@ msgstr ""
 "Klaida, �keliant filtro informacij�:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3030
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtrai"
 
-#: mail/mail-callbacks.c:3074
+#: mail/mail-callbacks.c:2831
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Gaunamas lai�kas %d i� %d"
 
-#: mail/mail-callbacks.c:3129
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "Spausdinti lai�k�"
 
-#: 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 "Nepavyko atspausdinti lai�ko"
 
-#: 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 "Ar tu tikrai nori atidaryti visus %d lai�kus atskiruose languose?"
 
-#: 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 "Bevardis kontaktas"
 
-#: 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 "apra�ymas"
+msgid "You must specify a valid script name."
+msgstr "Stiliaus vardas:"
 
-#: 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 "apra�ymas"
 
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
+#: mail/mail-composer-prefs.c:864
 #, fuzzy
-msgid "Unnamed"
-msgstr "Bevardis kontaktas"
+msgid "Language(s)"
+msgstr "Kalba"
 
-#: mail/mail-composer-prefs.c:875
+#: mail/mail-composer-prefs.c:906
 #, fuzzy
 msgid "Add script signature"
 msgstr "Prid�ti s�lyg�"
 
-#: mail/mail-composer-prefs.c:876
+#: mail/mail-composer-prefs.c:926
 #, fuzzy
-msgid "Add Signature"
-msgstr "I�saugoti para��"
+msgid "Signature(s)"
+msgstr "_HTML para�as:"
+
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr "Asmenyb�"
 
-#: 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 "
@@ -12352,7 +12714,12 @@ msgstr ""
 "laukai �emiau gali likti tu�ti,\n"
 "nebent tu nori �traukti �i� informacij� tavo siun�iamuose lai�kuose."
 
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "Pa�to gavimas"
+
+#: mail/mail-config-druid.c:390
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -12362,11 +12729,16 @@ msgstr ""
 "gerai ne�inai, paklausk savo sistemos administratoriaus arba interneto "
 "paslaug� teik�jo."
 
-#: mail/mail-config-druid.c:150
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Pra�om pasirinkti i� �emiau esan�i� parink�i�"
 
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:400
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Pa�to siuntimas"
+
+#: mail/mail-config-druid.c:402
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -12376,7 +12748,11 @@ msgstr ""
 "gerai ne�inai, paklausk savo sistemos administratoriaus arba interneto "
 "paslaug� teik�jo."
 
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "S�skaitos tvarkymas"
+
+#: mail/mail-config-druid.c:409
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -12390,156 +12766,139 @@ msgstr ""
 "vien� Evolution pa�to s�skait�. Pra�om �vesti �ios s�skaitos pavadinim� "
 "�emiau esan�iame laukelyje. �is pavadinimas bus naudojamas tik vaizdavimui."
 
-#. set window title
-#: mail/mail-config-druid.c:637
-msgid "Evolution Account Assistant"
-msgstr "Evolution s�skait� pad�j�jas"
-
-#: mail/mail-config.c:622
-#, fuzzy, c-format
-msgid "Account %d"
-msgstr "S�skaita"
-
-#: mail/mail-config.c:2316
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Tikrinama paslauga"
 
-#: 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 "Jungiamasi prie serverio..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr " _Patikrinti, kokie tipai palaikomi"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: 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 "S�skaita"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "S�skaitos informacija"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "S�skaitos tvarkymas"
-
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Prid�ti s�lyg�"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Add new signature..."
 msgstr "I�saugoti para��"
 
-#: 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 "Visada pa_sira�yti siun�iamus lai�kus, kai naudojama �i s�skaita"
 
-#: 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 "Prisegti byl� prie �io lai�ko"
 
-#: 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 "Priedas"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentikacija"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Automati�kai tikrinti pa�t� kas"
 
-#: 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 "Ne�inoma koduot�: %s"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "C_olors"
 msgstr "_U�daryti"
 
-#: 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 "Tikrinama, ar yra nauj� lai�k�"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Spalva v�luojamoms u�duotims"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Sukurti lai�k�"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Konfig�ravimas"
 
-#: 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 ""
 "Sveikinu, tavo pa�to konfig�ravimas u�baigtas.\n"
 "\n"
@@ -12547,304 +12906,301 @@ msgstr ""
 "\n"
 "Paspausk �Baigti�, kad i�saugotum nuostatas."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "�p_rastas"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "�p_rastas"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "�prasta koduot�: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Gaunamas pa�tas"
 
-#: 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 "Negaliu atidaryti lai�ko"
 
-#: 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 "Baigta"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Juodra��i� aplankas:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "�ju_ngti"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Emacs"
 msgstr "Ryt�"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Pa�to s�skaita"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Email _address:"
 msgstr "El. pa�to adresas:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_I�tu�tinti �iuk�li� aplankus i�einant"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr "Evolution s�skait� pad�j�jas"
+
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Execute Command..."
 msgstr "�vykdyti veiksmus"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "baigiasi su"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Font Properties"
 msgstr "S�skaitos savyb�s"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Persi�sti lai�kai"
 
-#: 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 "_Pary�kinti citatas su"
 
-#: 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 "Asmenyb�"
-
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Viduje"
 
-#: 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 "I�saugoti ir u�daryti"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "�kelt_i paveiksl�lius"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Pa�to nustatymas"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Pa�to d��ut�s vieta"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Lai�ko antra�t�"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "_Lai�ko rodymas"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Lai�kas turi savyje"
+
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronezija"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Pa�to nustatymas"
 
-#: 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 "Neb�tina informacija"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zacija:"
 
-#: 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 "Pasirink spalv�"
 
-#: 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 "Paklausti prie� siun�iant lai�kus vien tik su _Bcc gav�jais"
 
-#: 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 "Spausdinti pa�ym�tus kontaktus"
 
-#: 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 "Negaliu atidaryti lai�ko"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr "Cituojant"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr "Prisi_minti �� slapta�od�"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Atsakyti-kam:"
 
-#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr "Pa�to gavimas"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Gavimo nuostatos"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Prisiminti �� slapta�od�"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "B�tina informacija"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "�p_rastas"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Saugumas"
 
-#: 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 "Pa�to siuntimas"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "I�si�st� _lai�k� aplankas:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "I�si�sti lai�kai ir juodra��iai"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris reikalauja autentikacijos"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Serverio nustatymas"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "Serverio _tipas:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Trump�s"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stiliaus vardas:"
 
-#: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
-msgstr ""
-
 #: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
@@ -12882,10 +13238,11 @@ msgid "V_ariable-width:"
 msgstr "Kintamos krypties"
 
 #: 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 ""
 "Sveikas patek�s � Evolution pa�to nustatymo pad�j�j�.\n"
 "\n"
@@ -12960,119 +13317,124 @@ msgid "_Enable"
 msgstr "�jungti"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr ""
-
-#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Persi�sti kaip"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Pilnas vardas:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML lai�kuose"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Identity"
 msgstr "Asmenyb�"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "�ke_lti paveiksl�lius, jei siunt�jas yra adres� knygel�je"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Pa_daryti �i� s�skait� �prastine"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Pa�ym�ti lai�kus skaitytais po"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Vardas:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "_Niekada ne�kelti paveiksl�li� i� tinklo"
 
-#: 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 "Paklausti, kai siun�iamas HTML lai�kas kontaktams, kurie j� nenori"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Paklausti prie� siun�iant lai�kus su _tu��ia tema"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Pa�to gavimas"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Atsakyti visiems"
 
-#: 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 "_Saugumas"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Pa�to siuntimas"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Rodyti laik� kaip"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML para�as:"
 
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "San Marinas"
+
 #: mail/mail-config.glade.h:175
 #, fuzzy
-msgid "_Use secure connection (SSL):"
-msgstr "Naudoti s_augi� jungt� (SSL)"
+msgid "_Terminal Font:"
+msgstr "Originalus kontaktas:"
 
 #: mail/mail-config.glade.h:176
 #, fuzzy
-msgid "_Variable-width:"
-msgstr "Kintamos krypties"
+msgid "_Use secure connection (SSL):"
+msgstr "Naudoti s_augi� jungt� (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 "_kas"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "color"
 msgstr " spalva"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "apra�ymas"
 
@@ -13098,129 +13460,131 @@ msgstr "Negal�jau sukurti ra�ykl�s lango."
 msgid "Could not create a S/MIME decode context."
 msgstr "Negal�jau sukurti ra�ykl�s lango."
 
-#: mail/mail-display.c:321
+#: mail/mail-display.c:193
+#, fuzzy, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Byla tokiu vardu jau yra.\n"
+"U�ra�yti j�?"
+
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "I�saugoti pried�"
 
-#: mail/mail-display.c:386
+#: mail/mail-display.c:406
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Negal�jau sukurti laikino katalogo: %s"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:454
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "I�saugoti pried�"
 
-#: mail/mail-display.c:433
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr "�i�r�ti viduje"
 
-#: mail/mail-display.c:434
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "Atidaryti su %s..."
 
-#: mail/mail-display.c:494
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "�i�r�ti viduje (per %s)"
 
-#: mail/mail-display.c:498
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "Sl�pti"
 
-#: mail/mail-display.c:519
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "I�orin� �i�rykl�"
 
-#: mail/mail-display.c:1319
+#: mail/mail-display.c:1365
 #, fuzzy
 msgid "Downloading images"
 msgstr "�kelt_i paveiksl�lius"
 
-#: mail/mail-display.c:1496
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "�keliamas lai�ko turinys"
 
-#: mail/mail-display.c:1783
+#: mail/mail-display.c:1879
 #, fuzzy
 msgid "Overdue:"
 msgstr "_V�luojamos u�duotys:"
 
-#: mail/mail-display.c:1787
+#: mail/mail-display.c:1883
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %H:%M"
 
-#: mail/mail-display.c:2114
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Nuorod� atidaryti nar�ykl�je"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Kopijuoti nuorodos adres�"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "I�saugoti nuorod� kaip (FIXME)"
 
-#: mail/mail-display.c:2119
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "I�saugoti paveiksl�l� kaip..."
 
-#: mail/mail-folder-cache.c:743
+#: mail/mail-folder-cache.c:744
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Skanuojama %s"
 
-#: mail/mail-format.c:656
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr "%s priedas"
 
-#: 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 "Negal�jau i�nagrin�ti MIME lai�ko. Rodomas �altinis."
 
-#: 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 "Blogas adresas"
 
-#: 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 "Nuo"
 
-#: mail/mail-format.c:917
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Atsakyti-kam"
 
-#: 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 "Kam"
 
-#: 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"
-"Pa�to programa: "
-
-#: mail/mail-format.c:1848
+#: mail/mail-format.c:1451
 #, fuzzy
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
@@ -13228,63 +13592,63 @@ msgstr ""
 "�is lai�kas yra pasira�ytas skaitmeniniu para�u, patikrinus nustatyta, kad "
 "jis autenti�kas"
 
-#: mail/mail-format.c:1875
+#: mail/mail-format.c:1479
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Negal�jau prisijungti prie POP serverio %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 ""
 "�is lai�kas yra pasira�ytas skaitmeniniu para�u, patikrinus nustatyta, kad "
 "jis autenti�kas"
 
-#: 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 ""
 "�is lai�kas yra pasira�ytas skaitmeniniu para�u, bet neina patikrinti, ar "
 "jis autenti�kas"
 
-#: mail/mail-format.c:2157
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Rodykl� � FTP svetain� (%s)"
 
-#: mail/mail-format.c:2171
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Rodykl� � vietin� byl� (%s), galiojanti svetain�je �%s�"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Rodykl� � vietin� byl� (%s)"
 
-#: mail/mail-format.c:2205
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Rodykl� � nutolusius duomenis (%s)"
 
-#: mail/mail-format.c:2213
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Rodykl� � ne�inomus i�orinius duomenis (�%s� tipo)"
 
-#: mail/mail-format.c:2218
+#: mail/mail-format.c:1807
 #, fuzzy
 msgid "Malformed external-body part."
 msgstr "Blogai suformuota i�orinio k�no dalis."
 
-#: 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 "Ypatingi aplankai"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr "I� naujo konfig�ruojamas aplankas"
 
-#: 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"
@@ -13293,12 +13657,12 @@ msgstr ""
 "Negaliu i�saugoti metainfo. Tikriausiai tau daugiau\n"
 "nebepavyks atidaryti �io aplanko: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:804
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Negaliu sukurti aplanko u�rakto ant %s: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
@@ -13310,7 +13674,7 @@ msgstr ""
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Kei�iamas aplanko �%s� formatas � �%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."
@@ -13318,12 +13682,12 @@ msgstr ""
 "Jei tu nebegali daugiau atidaryti �ios pa�to\n"
 "d��ut�s, tau teks sutaisyti j� rankut�mis."
 
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "V�l konfig�ruoti %s"
 
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
 msgstr "Tu negali pakeisti nevietinio aplanko formato."
 
@@ -13345,108 +13709,108 @@ msgstr ""
 "Klaida vykdant veiksm�:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Dirbama"
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Filtruojamas aplankas"
 
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Gaunamas pa�tas"
 
-#: 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 "Ta�iau lai�kas buvo s�kmingai i�si�stas."
 
-#: mail/mail-ops.c:618
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Siun�iamas �%s�"
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Siun�iamas lai�kas %d i� %d"
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Nes�km� ties lai�ku %d i� %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 "U�baigta."
 
-#: mail/mail-ops.c:853
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Lai�kas i�saugomas � aplank�"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Lai�kai perkeliami � %s"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Lai�kai kopijuojami � %s"
 
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanuojami aplankas, esantys �%s�"
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Persi�sti lai�kai"
 
-#: mail/mail-ops.c:1277
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atidaromas aplankas %s"
 
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "Atidaroma saugykla %s"
 
-#: mail/mail-ops.c:1422
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Trinamas aplankas %s"
 
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "�ra�omas aplankas '%s'"
 
-#: mail/mail-ops.c:1567
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Atnaujinamas aplankas"
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1594
 msgid "Expunging folder"
 msgstr "I�valomas aplankas"
 
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Gaunamas lai�kas %s"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Gaunami %d lai�kai"
 
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1801
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "I�saugomi %d lai�kai"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13455,7 +13819,7 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13464,11 +13828,11 @@ msgstr ""
 "Klaida i�saugant lai�kus �: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "I�saugomas priedas"
 
-#: mail/mail-ops.c:2041
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13477,54 +13841,54 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2071
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Negal�jau �ra�yti duomen�: %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atsijungiama nuo %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "V�l jungiamasi prie %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "_Ie�koti"
-
-#: mail/mail-search.c:137
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(Lai�kas be temos)"
 
-#: mail/mail-search.c:240
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "Lai�kas be temos"
 
-#: mail/mail-search.c:244
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "Tu��ias lai�kas"
 
-#: mail/mail-search.c:291
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "Ie�koti lai�ke"
 
-#: mail/mail-search.c:321
+#: mail/mail-search.c:285
+msgid "Search"
+msgstr "Paie�ka"
+
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "Skirti raid�i� dyd�"
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr "Ie�koti pirmyn"
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "Rasti:"
 
-#: mail/mail-search.c:346
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "Tinka:"
 
@@ -13532,69 +13896,65 @@ msgstr "Tinka:"
 msgid "Cancelling..."
 msgstr "Nutraukiama..."
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serveris: %s, tipas: %s"
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Kelias: %s, tipas: %s"
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:252
 #, c-format
 msgid "Type: %s"
 msgstr "Tipas: %s"
 
-#: mail/mail-send-recv.c:293
+#: mail/mail-send-recv.c:297
 msgid "Send & Receive Mail"
 msgstr "Siun�iamas ir gaunamas pa�tas"
 
-#: mail/mail-send-recv.c:295
+#: mail/mail-send-recv.c:299
 msgid "Cancel All"
 msgstr "Nutraukti visus"
 
-#: mail/mail-send-recv.c:355
+#: mail/mail-send-recv.c:378
 msgid "Updating..."
 msgstr "Atnaujinama..."
 
-#: 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 "Laukiama..."
 
-#: mail/mail-session.c:221
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr "Vartotojas nutrauk� veiksm�."
 
-#: mail/mail-session.c:272
-msgid "_Remember this password"
-msgstr "_Prisiminti �� slapta�od�"
-
-#: mail/mail-session.c:273
-#, fuzzy
-msgid "_Remember this password for the remainder of this session"
-msgstr "Prisiminti �� slapta�od� iki �ios sesijos galo"
-
-#: mail/mail-session.c:330
+#: mail/mail-session.c:258
 #, c-format
 msgid "Enter Password for %s"
 msgstr "�vesk %s slapta�od�"
 
-#: mail/mail-session.c:333
+#: mail/mail-session.c:260
 msgid "Enter Password"
 msgstr "�vesk slapta�od�"
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-session.c:280
+msgid "_Remember this password"
+msgstr "_Prisiminti �� slapta�od�"
+
+#: mail/mail-session.c:281
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Prisiminti �� slapta�od� iki �ios sesijos galo"
+
+#: mail/mail-signature-editor.c:80
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Negal�jau i�saugoti para�o bylos."
 
-#: mail/mail-signature-editor.c:175
-msgid "Save signature"
-msgstr "I�saugoti para��"
-
-#: 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"
@@ -13604,44 +13964,52 @@ msgstr ""
 "\n"
 "Ar nor�tum i�saugoti pakeitimus?"
 
-#: 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 "I�saugoti para��"
+
+#: mail/mail-signature-editor.c:389
 #, fuzzy
 msgid "Edit signature"
 msgstr "Prid�ti s�lyg�"
 
-#: mail/mail-signature-editor.c:372
+#: mail/mail-signature-editor.c:429
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "_HTML para�as:"
 
-#: 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 "Vardas:"
 
-#: mail/mail-tools.c:262
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Persi�stas lai�kas - %s"
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "Persi�stas lai�kas"
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "Persi�stas lai�kas"
 
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:92
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Kuriamas aplankas %s"
 
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Atnaujinami vAplankai pagal uri: %s"
 
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13654,98 +14022,98 @@ msgstr ""
 "    '%s'\n"
 "Ir buvo atnaujinti."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "vAplankai"
 
-#: mail/mail-vfolder.c:819
+#: mail/mail-vfolder.c:835
 #, fuzzy
 msgid "vFolders"
 msgstr "Aplankai"
 
-#: mail/mail-vfolder.c:861
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Keisti vAplank�"
 
-#: mail/mail-vfolder.c:877
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Bandoma keisti neegzistuojant� vAplank� '%s'."
 
-#: mail/mail-vfolder.c:931
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Naujas vAplankas"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(N�ra temos)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Lai�kas"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:740
 msgid "Unseen"
 msgstr "Nematytas"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:741
 msgid "Seen"
 msgstr "Matytas"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr "Atsakytas"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:743
 msgid "Multiple Unseen Messages"
 msgstr "Keletas nematyt� lai�k�"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:744
 msgid "Multiple Messages"
 msgstr "Keletas lai�k�"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:748
 msgid "Lowest"
 msgstr "�emiausias"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:749
 msgid "Lower"
 msgstr "�emesnis"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:753
 msgid "Higher"
 msgstr "Auk�tesnis"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:754
 msgid "Highest"
 msgstr "Auk��iausias"
 
-#: 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 "�iandien %H:%M"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Vakar %H:%M"
 
-#: mail/message-list.c:1094
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1102
+#: mail/message-list.c:1116
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %H:%M"
 
-#: 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 "Generuojamas lai�k� s�ra�as"
 
@@ -13779,47 +14147,47 @@ msgstr "Gautas"
 msgid "Size"
 msgstr "Dydis"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:62
 #, fuzzy
 msgid "Call"
 msgstr "Atsakiklis"
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Eiti pirmyn"
 
-#: 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 "�altinio informacija"
 
-#: 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 "Persi�sti"
 
-#: 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 "Atsakyti"
 
-#: 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 "Atsakyti visiems"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:71
 #, fuzzy
 msgid "Review"
 msgstr "Per�i�ra"
 
-#: 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 ""
 
@@ -13849,53 +14217,44 @@ msgstr "_Kada reikia:"
 msgid "_Flag:"
 msgstr "Bylos vardas:"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Skanuojami aplankas, esantys �%s�"
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, fuzzy, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Skanuojami aplankas, esantys �%s�"
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "U�sakomas aplankas �%s�"
 
-#: mail/subscribe-dialog.c:338
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Atsisakoma aplanko �%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 "Aplankas"
 
-#: mail/subscribe-dialog.c:1450
+#: mail/subscribe-dialog.c:1389
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "I�saugoti � aplank�..."
 
-#: mail/subscribe-dialog.c:1557
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Joks serveris nepasirinktas"
 
-#: mail/subscribe-dialog.c:1621
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Pra�om pasirinkti server�."
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "All folders"
-msgstr "Visi aplankai"
-
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "Apri file"
-msgstr "Balandis"
-
 #: 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
@@ -13906,66 +14265,47 @@ msgid "Close"
 msgstr "U�daryti"
 
 #: mail/subscribe-dialog.glade.h:4
-#, fuzzy
-msgid "Display Options"
-msgstr "Vaizdavimo parinktys"
-
-#: mail/subscribe-dialog.glade.h:5
-msgid "Folders whose names begin with:"
-msgstr "Aplankai, kuri� vardai prasideda su:"
-
-#: mail/subscribe-dialog.glade.h:6
 msgid "Manage Subscriptions"
 msgstr "Tvarkyti u�sakymus"
 
-#: 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 "Atnaujinti s�ra��"
 
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:6
 #, fuzzy
 msgid "S_elect server: "
 msgstr "Pa�ym�ti visk�"
 
-#: mail/subscribe-dialog.glade.h:9
-#, fuzzy
-msgid "Salve file"
-msgstr "Pasirink byl�"
-
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "_U�sakyti"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "_Atsisakyti"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for the Evolution Summary."
-msgstr "Aplankas, kuriame yra Evolution ap�valga"
-
-#: 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 "Aplankas, kuriame yra Evolution ap�valga"
 
-#: 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 pa�to ra�ykl�."
 
-#: 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 "Testinio komponento gamykla."
+msgid "Evolution Summary component"
+msgstr "Evolution pa�to ra�ykl�."
 
-#: 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 pa�to komponento gamykla."
+msgid "Evolution Summary configuration control"
+msgstr "Testinio komponento gamykla."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 #, fuzzy
 msgid "Summary Preferences"
 msgstr "Kalendoriaus nuostatos"
@@ -17750,7 +18090,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 ""
 
@@ -19580,6500 +19920,6489 @@ msgid "Marion-Wytheville"
 msgstr ""
 
 #: my-evolution/Locations.h:1325
-#, fuzzy
-msgid "Marquette"
-msgstr "Martinika"
-
-#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 #, fuzzy
 msgid "Marseilles"
 msgstr "�vair�s"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 #, fuzzy
 msgid "Marshall"
 msgstr "Mar�alo salos"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 #, fuzzy
 msgid "Marshalltown"
 msgstr "Mar�alo salos"
 
-#: 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 "Martinika"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "Pa�ym�ti _neskaitytu"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Martinsburg"
 msgstr "Martinika"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsville"
 msgstr "Martinika"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Maryland"
 msgstr "Airija"
 
-#: 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 "Malaizija"
 
-#: 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 "Makedonija"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Matamoros"
 msgstr "Komorai"
 
-#: 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 "Vad"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mayaguez"
 msgstr "Vadybininkas"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayport"
 msgstr "Siuntimas"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mazatlan"
 msgstr "Kazachstanas"
 
-#: 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 "Visi"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 #, fuzzy
 msgid "McCall"
 msgstr "Malis"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCarthy"
 msgstr "Kovas"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McClellan"
 msgstr "�vair�s"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 #, fuzzy
 msgid "McComb"
 msgstr "Komp"
 
-#: 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 "Kovas"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Medford"
 msgstr "prie�"
 
-#: 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 "Vad"
 
-#: 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 "Makedonija"
 
-#: 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 "Penktadienis"
 
-#: 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 "_Nuo laukas"
 
-#: 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 "Malis"
 
-#: 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 "Vi_durinis:"
 
-#: 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 "Vi_durinis:"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Midland"
 msgstr "Suomija"
 
-#: 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 "Bylos tipas:"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Milford"
 msgstr "kol"
 
-#: 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 "Lai�kai � %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
 #, fuzzy
 msgid "Minatitlan"
 msgstr "Mauritanija"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 #, fuzzy
 msgid "Minchumina"
 msgstr "gaunamas"
 
-#: 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 "Mikronezija"
 
-#: 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 "n�ra"
 
-#: 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 "Tinka:"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 msgid "Mitilini"
 msgstr "Konferencija"
 
-#: 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 "Pr"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "Mobilus telefonas"
 
-#: 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 "Mobilus"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Modesto"
 msgstr "�emiausias"
 
-#: 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 "Perkelti"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Molde"
 msgstr "Mobilus"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Moldova"
 msgstr "Pirmadienis"
 
-#: 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
 #, fuzzy
 msgid "Monclova"
 msgstr "Monakas"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Moncton"
 msgstr "Monakas"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Monida"
 msgstr "Pirmadienis"
 
-#: 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 "Monakas"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Montague"
 msgstr "Vadybininkas"
 
-#: 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
 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 "M�nesio rodinys"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Montego Bay"
 msgstr "Mongolija"
 
-#: 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�nesis"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 #, fuzzy
 msgid "Monterrey"
 msgstr "Pertraukta"
 
-#: 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 "Monakas"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Montpelier"
 msgstr "M�nesio rodinys"
 
-#: 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 "�riftai"
 
-#: 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 "Mongolija"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morgantown"
 msgstr "Organizacija"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Moriarty"
 msgstr "Pagrindinis"
 
-#: 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 "Mobilus"
 
-#: 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 "M�nesio rodinys"
 
-#: 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 "Pietry�i�"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "M�nesio rodinys"
 
-#: 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 "Vad"
 
-#: 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 "Bir�elis"
 
-#: 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 "Mauritanija"
 
-#: 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 "Darb"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Muscatine"
 msgstr "Martinika"
 
-#: 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 "mazgai"
 
-#: 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 "Bahreinas"
 
-#: 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 "Vardas"
 
-#: 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 "�sp�jimas"
 
-#: 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 "Japonija"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Naples"
 msgstr "Vardas"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Napoli"
 msgstr "Malis"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Narvik"
 msgstr "Prav"
 
-#: 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 "Italija"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natchez"
 msgstr "Tinka:"
 
-#: 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 "Nauja u�duotis"
 
-#: 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 "Grenada"
 
-#: 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 "Grenada"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 #, fuzzy
 msgid "Newark"
 msgstr "Nauja u�duotis"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "New Bedford"
 msgstr "Naujien� �altinis"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bern"
 msgstr "Naujas �_vykis"
 
-#: 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 "Naujienos"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "Naujoji Zelandija"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "Newfoundland"
 msgstr "Naujoji Zelandija"
 
-#: 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 "Naujas �_vykis"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Iberia"
 msgstr "Naujoji Kaledonija"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Jersey"
 msgstr "Naujas lai�kas"
 
-#: 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 "Olandija"
 
-#: 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 "�iaur�s"
 
-#: 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 "Naujas �_vykis"
 
-#: 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 "Nauja"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "New York"
 msgstr "Naujas vAplankas"
 
-#: 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 "I�matavimai:"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nipawin"
 msgstr "Ispanija"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nis"
 msgstr "yra"
 
-#: 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 "Normalus"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nome"
 msgstr "Vardas"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Norfolk"
 msgstr "Norfolko sala"
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 #, fuzzy
 msgid "Norfolk NAS"
 msgstr "Norfolko sala"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 #, fuzzy
 msgid "Norrkoping"
 msgstr "Dirbama"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "North Adams"
 msgstr "�iaur�s ryt�"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Bend"
 msgstr "�iaur�s"
 
-#: 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 "Norvegija"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Dakota"
 msgstr "�iaur�s ryt�"
 
-#: 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 "�iaur�s ryt�"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "Northway"
 msgstr "Norvegija"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "�iaur�s vakar�"
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 #, fuzzy
 msgid "Norwich"
 msgstr "�iaur�s"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwood"
 msgstr "Norvegija"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Notodden"
 msgstr "Pastaba"
 
-#: 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 "Neprad�ta"
 
-#: 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 "Tailandas"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oaxaca"
 msgstr "Jamaika"
 
-#: 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 "Islandija"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 #, fuzzy
 msgid "Odense"
 msgstr "One"
 
-#: 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 "Atidaryti"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Ogden"
 msgstr "Atidaryti"
 
-#: 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 "Kitas"
 
-#: 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 "Kal�d� sala"
 
-#: 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 "Kal�d� sala"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 #, fuzzy
 msgid "Olathe"
 msgstr "Kitas"
 
-#: 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 "Albanija"
 
-#: 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 "Omanas"
 
-#: 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 "Omanas"
 
-#: 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 "Orientacija"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Oostende"
 msgstr "Dalyvis"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Oran"
 msgstr "Omanas"
 
-#: 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 "Org"
 
-#: 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 "Org"
 
-#: 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 "Airija"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orlando"
 msgstr "Airija"
 
-#: 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 "Klaida"
 
-#: 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 "sekund�"
 
-#: 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 "Australija"
 
-#: 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 "savait�"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Oxford"
 msgstr "kol"
 
-#: 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 "Puslapis"
 
-#: 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 "Ie�kas"
 
-#: 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 "Ie�kas"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palm Springs"
 msgstr "Pa�to nuostatos"
 
-#: 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 "Samoa"
 
-#: 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 "Nutraukta"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Papa"
 msgstr "Japonija"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Paphos"
 msgstr "Laosas"
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 #, fuzzy
 msgid "Paris"
 msgstr "Pagr"
 
-#: 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
 #, fuzzy
 msgid "Pasco"
 msgstr "Slapta�odis"
 
-#: 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 "Groti gars�:"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Payson"
 msgstr "Groti gars�:"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Pellston"
 msgstr "Klausimas"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pelotas"
 msgstr "I� naujo �kelti"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pendleton"
 msgstr "Pasirinkimas:"
 
-#: 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 "Gruzija"
 
-#: 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 "Pagr"
 
-#: 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 "Filipinai"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 #, fuzzy
 msgid "Philipsburg"
 msgstr "Filipinai"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 #, fuzzy
 msgid "Phillips"
 msgstr "Filipinai"
 
-#: 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 "Per�i�ra"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 #, fuzzy
 msgid "Pine Bluff"
 msgstr "Pine pa�tas"
 
-#: 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 "Pakistanas"
 
-#: 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�nesis"
 
-#: 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 "Spausdinti vok�"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Lay"
 msgstr "Spausdinti ap�valg�"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Mugu"
 msgstr "Spausdinti lai�k�"
 
-#: 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 "Savyb�s"
 
-#: 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� s�ra�as"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 #, fuzzy
 msgid "Ponce"
 msgstr "Joks"
 
-#: 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 "Kontaktai"
 
-#: 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 "Lenkija"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Port Alexander"
 msgstr "Spausdinti kalendori�"
 
-#: 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 "Spausdinti vok�"
 
-#: 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 "Per�i�ra"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Port Hardy"
 msgstr "Spausdinti kortel�"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hedland"
 msgstr "Lenkija"
 
-#: 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 "Lenkija"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Porto"
 msgstr "_Prievadas:"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "Pa�anga"
 
-#: 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 "Sta�ias lapas"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Porto Santo"
 msgstr "Sta�ias lapas"
 
-#: 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 "Sta�ias lapas"
 
-#: 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 "Lenkija"
 
-#: 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 "Lenkija"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Praha"
 msgstr "Paragvajus"
 
-#: 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 "Spaudinio per�i�ra"
 
-#: 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 "Gruzija"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Preveza"
 msgstr "Praeitas"
 
-#: 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 "Tradicinis"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Providence"
 msgstr "_Valstija/Provincija:"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Provincetown"
 msgstr "Per�i�ra"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provo"
 msgstr "Prof"
 
-#: 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 "Vie�as"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Pueblo"
 msgstr "Vie�as"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 #, fuzzy
 msgid "Puerto Barrios"
 msgstr "Puerto Rikas"
 
-#: 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 "Puerto Rikas"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 #, fuzzy
 msgid "Puerto Lempira"
 msgstr "Puerto Rikas"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "Puerto Rikas"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 #, fuzzy
 msgid "Puerto Montt"
 msgstr "Puerto Rikas"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 #, fuzzy
 msgid "Puerto Plata"
 msgstr "Puerto Rikas"
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "Spausdinti ap�valg�"
 
-#: 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 "Lenkija"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pullman"
 msgstr "Lenkija"
 
-#: 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 "Spausdinti kalendori�"
 
-#: 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 "Klausimas"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quebec"
 msgstr "Tema"
 
-#: 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 "Atsakytas"
 
-#: 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 "Lietus"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 msgid "Reading"
 msgstr "Antra�t�s"
 
-#: 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 "Gautas"
 
-#: 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 "Antra�t�s"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redig"
 msgstr "Skaitytas"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redmond"
 msgstr "U�uomina"
 
-#: 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 "Regionai"
 
-#: 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 "U�uominos"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Reno"
 msgstr "Pa�alinti"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Renton"
 msgstr "Regionai"
 
-#: 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 "Taisykl�s"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reyes"
 msgstr "met�"
 
-#: 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 "I� naujo �kelti"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Rhinelander"
 msgstr "Suomija"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhode Island"
 msgstr "Norfolko sala"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 #, fuzzy
 msgid "Riberalta"
 msgstr "Gibraltaras"
 
-#: 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 "Pravard�"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rieti"
 msgstr "Haitis"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rifle"
 msgstr "Rol�"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rijeka"
 msgstr "Skaitytas"
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rimini"
 msgstr "Rumunija"
 
-#: 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 "Nikaragva"
 
-#: 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 "Kal�d� sala"
 
-#: 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 "Liberija"
 
-#: 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 "Skaitytas"
 
-#: 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 "Kroatija"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Robore"
 msgstr "prie�"
 
-#: 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 "Lenkija"
 
-#: 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 "Kambarys"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rogers"
 msgstr "Aplankai"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1907
 #, fuzzy
 msgid "Roma/Ciampino"
 msgstr "Rumunija"
 
-#: 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 "Komorai"
 
-#: 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 "Rol�"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Rost"
 msgstr "Hostas"
 
-#: 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 "Pasikartojimas"
 
-#: 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 "Austrija"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1929
 #, fuzzy
 msgid "Rutland"
 msgstr "Butanas"
 
-#: 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 "Departamentas"
 
-#: 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 "Ispanija"
 
-#: 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 Marinas"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1943
 #, fuzzy
 msgid "Saint Mawgan"
 msgstr "San Marinas"
 
-#: 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 "Ispanija"
 
-#: 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 "I�saugoti"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salida"
 msgstr "Somalis"
 
-#: 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 "Somalis"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salinas"
 msgstr "Somalis"
 
-#: 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 "�_e�"
 
-#: 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 "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 "_Sek"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Sana'A"
 msgstr "Sm�lis"
 
-#: 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 Marinas"
 
-#: 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 Marinas"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "Sandane"
 msgstr "Sm�lis"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandberg"
 msgstr "Siunt�jas"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sanderson"
 msgstr "Siunt�jas"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1977
 #, fuzzy
 msgid "San Diego"
 msgstr "San Marinas"
 
-#: 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 Marinas"
 
-#: 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 "Sm�lis"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1987
 #, fuzzy
 msgid "San Francisco"
 msgstr "San Marinas"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1988
 #, fuzzy
 msgid "Sangju"
 msgstr "Pustoniai"
 
-#: 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 Marinas"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1991
 #, fuzzy
 msgid "San Jose"
 msgstr "I�saugoti ir u�daryti"
 
-#: 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 Marinas"
 
-#: 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 "Somalis"
 
-#: 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 Marinas"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2001
 #, fuzzy
 msgid "San Nicholas Island"
 msgstr "Norfolko sala"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2002
 msgid "San Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2003
 #, fuzzy
 msgid "San Sebastian"
 msgstr "San Marinas"
 
-#: 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
 #, fuzzy
 msgid "Santa Maria"
 msgstr "San Marinas"
 
-#: 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 "Siunt�jas"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santarem"
 msgstr "Sm�lio audra"
 
-#: 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
 #, fuzzy
 msgid "Santorini"
 msgstr "Sm�lio audra"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2019
 #, fuzzy
 msgid "Santos"
 msgstr "B�sena"
 
-#: 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 "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 "_Sek"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Scatsta"
 msgstr "B�sena"
 
-#: 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 "Organizacija"
 
-#: 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 "Nuostatos"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Sedalia"
 msgstr "Somalis"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Seeb"
 msgstr "Matytas"
 
-#: 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 "Pradedama importuoti"
 
-#: 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 "Paie�ka"
 
-#: 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 "Pustoniai"
 
-#: 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 "Paie�ka"
 
-#: 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 "�e�tadienis"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Shawbury"
 msgstr "�e�tadienis"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shearwater"
 msgstr "Prad�ios data"
 
-#: 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 "�vedija"
 
-#: 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 "Pasirinkimas:"
 
-#: 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 "Sudanas"
 
-#: 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 "Dydis"
 
-#: 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 "�vertis"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Show Low"
 msgstr "Rodyti vien� savait�"
 
-#: 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 "Saugumas"
 
-#: 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 "Dydis"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skopje"
 msgstr "Stop"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skwentna"
 msgstr "Si�sti lai�kai"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Slana"
 msgstr "Albanija"
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2102
 #, fuzzy
 msgid "Smithers"
 msgstr "minu�i�"
 
-#: 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 "Piet�"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Socorro"
 msgstr "�vertis"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Socotra"
 msgstr "�vertis"
 
-#: 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 "Somalis"
 
-#: 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 "Slov�nija"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2112
 #, fuzzy
 msgid "Somerset"
 msgstr "�vertis"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Sonderborg"
 msgstr "Siunt�jas"
 
-#: 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 "Pietry�i�"
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "South Bend"
 msgstr "Piet�"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Carolina"
 msgstr "Piet� Afrikos respublika"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
 #, fuzzy
 msgid "South Dakota"
 msgstr "Pietry�i�"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "Southend"
 msgstr "Piet�"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "South Marsh Island"
 msgstr "Mar�alo salos"
 
-#: 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 "Siunt�jas"
 
-#: 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�ra�as"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Spokane"
 msgstr "Ispanija"
 
-#: 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 "Supaprastintas"
 
-#: 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 "U�baigimo data:"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "Stauning"
 msgstr "Nuostatos"
 
-#: 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 "Nuostatos"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Stavropol"
 msgstr "Stop"
 
-#: 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 "Sei�eliai"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2143
 #, fuzzy
 msgid "St. George"
 msgstr "Saugykla"
 
-#: 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 "Stop"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Louis"
 msgstr "Sustabdyti �k�lim�"
 
-#: 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 "Saugykla"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Stornoway"
 msgstr "Norvegija"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "St Paul"
 msgstr "B�sena"
 
-#: 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 "Saugykla"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2162
 #, fuzzy
 msgid "St Simon's Island"
 msgstr "Kal�d� sala"
 
-#: 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 "�e�tadienis"
 
-#: 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 "�vertis"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sumburgh"
 msgstr "Liuksemburgas"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2168
 #, fuzzy
 msgid "Sumter"
 msgstr "Ap�valga"
 
-#: 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 "_Sek"
 
-#: 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 "Tradicinis"
 
-#: 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 "U�duotis"
 
-#: 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 "Gana"
 
-#: 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 "Tada"
 
-#: 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 "Taivanas"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Tainan"
 msgstr "Taivanas"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2203
 #, fuzzy
 msgid "Taiyuan"
 msgstr "Taivanas"
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiz"
 msgstr "Taivanas"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Tajima"
 msgstr "Taivanas"
 
-#: 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 "Taivanas"
 
-#: 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 "Japonija"
 
-#: 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 "Popierius"
 
-#: 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 "Laosas"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taoyuan"
 msgstr "Taivanas"
 
-#: 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 "Siuntimas"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Tarbes"
 msgstr "U�duotis"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarija"
 msgstr "Taivanas"
 
-#: 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 "Tradicinis"
 
-#: 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 "Teleksas"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Temple"
 msgstr "Teleksas"
 
-#: 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 "U�duotis"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2243
 #, fuzzy
 msgid "The Dalles"
 msgstr "Sei�eliai"
 
-#: 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 "Titulas"
 
-#: 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 "Ketvirtadienis"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Tianjin"
 msgstr "Taivanas"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2251
 #, fuzzy
 msgid "Tijuana"
 msgstr "Lietuva"
 
-#: 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 "Taivanas"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2255
 #, fuzzy
 msgid "Tiree"
 msgstr "Laisvas"
 
-#: 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 "Titulas"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Tivat"
 msgstr "Asmeni�kas"
 
-#: 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 "Kal�d� sala"
 
-#: 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 "Perjungti"
 
-#: 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 "Tonga"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Topeka"
 msgstr "Vir�uje:"
 
-#: 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 "Vir�uje:"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torrance"
 msgstr "Pranc�zija"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torreon"
 msgstr "Kor�jie�i�"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "Pradedama importuoti"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Toulouse"
 msgstr "U�daryti"
 
-#: 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 "Gabonas"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2289
 #, fuzzy
 msgid "Trapani"
 msgstr "Japonija"
 
-#: 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 "Teleksas"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trenton"
 msgstr "Orientacija"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trevico"
 msgstr "Praeitas"
 
-#: 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 "Bandyti"
 
-#: 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 "Turkija"
 
-#: 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 "Antradienis"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulsa"
 msgstr "Tunisas"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tupelo"
 msgstr "_Ant"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Turaif"
 msgstr "Turk�"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turin"
 msgstr "Turk�"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2319
 #, fuzzy
 msgid "Turku"
 msgstr "Turkija"
 
-#: 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 "Negalutinis"
 
-#: 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 "Tipas"
 
-#: 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 "_Ant"
 
-#: 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 "Jungtiniai Arab� Emyratai"
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2341
 #, fuzzy
 msgid "Unst"
 msgstr "Nematytas"
 
-#: 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 "Japonija"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2344
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "Urugvajus"
 
-#: 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 "Kintamos krypties"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vagar"
 msgstr "Ie�kas"
 
-#: 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 "Slov�nija"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2359
 #, fuzzy
 msgid "Valentine"
 msgstr "�i�r�ti viduje"
 
-#: 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 "Vad"
 
-#: 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 "Nutraukti"
 
-#: 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 "Kintamos krypties"
 
-#: 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 "po"
 
-#: 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 "Venesuela"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2378
 #, fuzzy
 msgid "Venice"
 msgstr "Unikodas"
 
-#: 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�nesis"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2382
 #, fuzzy
 msgid "Vernal"
 msgstr "Esm�"
 
-#: 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 "Venesuela"
 
-#: 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 "Bylos vardas:"
 
-#: 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 "Australija"
 
-#: 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 "Suomija"
 
-#: 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 "Rol�"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volk Field"
 msgstr "_Nuo laukas"
 
-#: 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 "Monakas"
 
-#: 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 "Folklendo salos"
 
-#: 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 "�sp�jimas"
 
-#: 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 "Orai"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterloo"
 msgstr "Orai"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Watertown"
 msgstr "Orai"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Waterville"
 msgstr "Kategorijos"
 
-#: 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 "Tinklapis"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2437
 #, fuzzy
 msgid "Wejh"
 msgstr "Tr"
 
-#: 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 "Orai"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wendover"
 msgstr "Siunt�jas"
 
-#: 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 "Vakar� Europos"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "Westerland"
 msgstr "Olandija"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westfield"
 msgstr "Vakar�"
 
-#: 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 "Dienotvark�"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2451
 #, fuzzy
 msgid "Whidbey Island"
 msgstr "Kal�d� sala"
 
-#: 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 "Prav"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wien"
 msgstr "Tr"
 
-#: 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 "s�ra�as"
 
-#: 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 "Lichten�teinas"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2471
 #, fuzzy
 msgid "Windsor"
 msgstr "Sm�lio audra"
 
-#: 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 "dabar"
 
-#: 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 "�vesk slapta�od�"
 
-#: 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 "Mikronezija"
 
-#: 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 "Tr"
 
-#: 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 "Honkongas"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Wooster"
 msgstr "Pora�t�:"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Worcester"
 msgstr "am�inai"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worland"
 msgstr "Lenkija"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worthington"
 msgstr "Dirbama"
 
-#: 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 "Dirbama"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Xiamen"
 msgstr "Vardas"
 
-#: 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 "Neimportuoti"
 
-#: 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 "Jemenas"
 
-#: 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 "Kalendorius"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zagreb"
 msgstr "Puslapis"
 
-#: 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 "Nutraukta"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2532
 #, fuzzy
 msgid "Zaragoza"
 msgstr "Paragvajus"
 
-#: 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 "Turk�"
 
-#: my-evolution/component-factory.c:51
+#: my-evolution/component-factory.c:56
 msgid "Folder containing the Evolution Summary"
 msgstr "Aplankas, kuriame yra Evolution ap�valga"
 
-#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
+#: my-evolution/e-summary-calendar.c:380
 msgid "Appointments"
 msgstr "�vykiai"
 
-#: my-evolution/e-summary-calendar.c:382
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
 msgstr "N�ra �vyki�"
 
-#: 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 "apra�ymas"
 
-#: my-evolution/e-summary-mail.c:153
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "Pa�to ap�valga"
 
-#: 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 "Ypatingi aplankai"
 
-#. 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 "Dictionary.com Dienos �odis"
 
-#: my-evolution/e-summary-preferences.c:602
+#: my-evolution/e-summary-preferences.c:374
 msgid "Quotes of the Day"
 msgstr "Dienos citatos"
 
-#: my-evolution/e-summary-preferences.c:840
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr "Prid�ti naujien� �altin�"
 
-#: 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 "�vesk URL naujien� �altinio, kur� nori prid�ti"
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr "Klaida parsiun�iant RDF"
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr "Naujien� �altinis"
 
-#: my-evolution/e-summary-shown.c:519
+#: my-evolution/e-summary-shown.c:518
 msgid "All"
 msgstr "Visi"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:531
+#: my-evolution/e-summary-shown.c:530
 #, fuzzy
 msgid "Add"
 msgstr "Pri_d�ti"
 
-#: 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 "Sniegas"
 
-#: my-evolution/e-summary-tasks.c:328
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "N�ra u�duo�i�"
 
-#: my-evolution/e-summary-tasks.c:372
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(N�ra apra�ymo)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:73
 msgid "My Weather"
 msgstr "Mano orai"
 
-#: my-evolution/e-summary-weather.c:268
+#: my-evolution/e-summary-weather.c:262
 #, fuzzy
 msgid "There was an error downloading data for"
 msgstr "�vyko klaida parsiun�iant naujien� �altin�"
 
-#: my-evolution/e-summary-weather.c:489
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr "Orai"
 
-#: 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 "%A, %Y m. %B %e"
 
-#: my-evolution/e-summary.c:504
+#: my-evolution/e-summary.c:523
 #, fuzzy
 msgid "Please wait..."
 msgstr "Pra�ome palaukti"
 
-#: 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 "Spausdinti ap�valg�"
 
-#: my-evolution/e-summary.c:640
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Nepavyko atspausdinti ap�valgos"
 
-#: my-evolution/main.c:68
-#, fuzzy
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
-
-#: 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 ", "
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 #, fuzzy
 msgid "knots"
 msgstr "mazgai"
 
-#: 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 "mylios"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "kilometers"
 msgstr "kilometrai"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Clear sky"
 msgstr "Giedras dangus"
 
-#: 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 "Ma�ai debesuota"
 
-#: 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 "Kintamos krypties"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North"
 msgstr "�iaur�s"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North - NorthEast"
 msgstr "�iaur�s - �iaur�s ryt�"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Northeast"
 msgstr "�iaur�s ryt�"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - NorthEast"
 msgstr "Ryt� - �iaur�s ryt�"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East"
 msgstr "Ryt�"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East - Southeast"
 msgstr "Ryt� - Pietry�i�"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southeast"
 msgstr "Pietry�i�"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southeast"
 msgstr "Piet� - Pietry�i�"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South"
 msgstr "Piet�"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South - Southwest"
 msgstr "Piet� - Pietvakari�"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Southwest"
 msgstr "Pietvakari�"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Southwest"
 msgstr "Vakar� - Pietvakari�"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West"
 msgstr "Vakar�"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West - Northwest"
 msgstr "Vakar� - �iaur�s vakar�"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "Northwest"
 msgstr "�iaur�s vakar�"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "North - Northwest"
 msgstr "�iaur�s - �iaur�s vakar�"
 
 #. 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 "Perk�nija"
 
-#: 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 "Lietus"
 
-#: 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 "Sniegas"
 
-#: 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 "P�ga"
 
-#: 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 "Kru�a"
 
-#: 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 "Migla"
 
-#: 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 "R�kas"
 
-#: 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 "R�kas su lietumi"
 
-#: 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
 #, fuzzy
 msgid "Thunderous smoke"
 msgstr "Dulki� audra su perk�nija"
 
-#: 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
 #, fuzzy
 msgid "Thunderous volcanic ash"
 msgstr "Tornado su perk�nija"
 
-#: 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 "Sm�lis"
 
-#: 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 "Dulk�s"
 
-#: 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 "Sm�lio audra"
 
-#: 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 "Sm�lio audra su perk�nija"
 
-#: 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 "Dulki� audra"
 
-#: 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 "Dulki� audra su perk�nija"
 
-#: 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 "Tornado"
 
-#: 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 "Tornado su perk�nija"
 
-#: 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 ""
 
@@ -26172,33 +26501,34 @@ msgstr "_Dienotvark�"
 msgid "_Weather"
 msgstr "_Orai"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for Evolution folder settings."
-msgstr "Evolution pa�to komponento gamykla."
-
-#: 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 apvalkalas."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Testinio komponento gamykla."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
 #, fuzzy
 msgid "Folder Settings"
 msgstr "Nuostatos"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "The Evolution shell."
-msgstr "Evolution apvalkalas."
-
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr "Rodyti detales"
 
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
 msgid "Cancel Operation"
 msgstr "Nutraukti veiksm�"
 
-#: shell/e-folder-dnd-bridge.c:53
+#: shell/e-folder-dnd-bridge.c:55
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -26207,57 +26537,40 @@ msgstr ""
 "Negal�jau i�trinti aplanko:\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 "Atidaryti su %s..."
 
-#: shell/e-folder-list.c:312
+#: shell/e-folder-list.c:338
 #, fuzzy
 msgid "Add a Folder"
 msgstr "Prid�ti vAplanko taisykl�"
 
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
 #, fuzzy
 msgid "Drafts"
 msgstr "Juodra�tis"
 
-#: 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 "Gauti lai�kai"
 
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:181
 msgid "Outbox"
 msgstr "Siun�iami lai�kai"
 
-#: shell/e-local-storage.c:181
+#: shell/e-local-storage.c:182
 #, fuzzy
 msgid "Sent"
 msgstr "Matytas"
 
-#: shell/e-setup.c:126
-msgid "Evolution installation"
-msgstr "Evolution �diegimas"
-
-#: shell/e-setup.c:130
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"�iai naujai Evolution versijai reikia �diegti papildom� byl�\n"
-"� tavo asmenin� Evolution katalog�"
-
-#: shell/e-setup.c:131
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Pra�au, paspausk �Gerai�, kad �diegtum bylas, arba �At�aukti�, kad i�eitum."
-
-#: shell/e-setup.c:171
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "Negal�jau tvarkingai atnaujinti byl�"
 
-#: shell/e-setup.c:194
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -26268,7 +26581,7 @@ msgstr ""
 "%s\n"
 "Klaida: %s"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -26277,33 +26590,7 @@ msgstr ""
 "�vyko klaida kopijuojant bylas �\n"
 "'%s'."
 
-#: shell/e-setup.c:282
-#, fuzzy, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Negal�jau sukurti katalogo %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"
@@ -26314,16 +26601,7 @@ msgstr ""
 "Pra�au, perkelk j�, kad gal��iau �diegti\n"
 "Evolution vartotojo bylas."
 
-#: 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"
@@ -26338,27 +26616,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 "U�baigimo data"
 
-#: shell/e-shell-config-default-folders.c:133
+#: shell/e-shell-config-default-folders.c:149
 #, fuzzy
 msgid "Select Default Folder"
 msgstr "Ypatingi aplankai"
 
-#: shell/e-shell-config-folder-settings.c:71
+#: shell/e-shell-config-folder-settings.c:70
 #, fuzzy
 msgid "Default Folders"
 msgstr "Ypatingi aplankai"
 
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
 #, fuzzy
 msgid "Offline Folders"
 msgstr "Ypatingi aplankai"
 
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 #, fuzzy
 msgid "Autocompletion Folders"
 msgstr "U�baigimo data"
@@ -26368,44 +26646,44 @@ msgstr "U�baigimo data"
 msgid "Cannot copy folder: %s"
 msgstr "Negal�jau patikrinti aplanko: %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 ""
 "Negal�jau pervadinti aplanko:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr "Negalima aplanko perkelti � j� pat�."
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr "Negalima aplanko kopijuoti � j� pat�."
 
-#: 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 "Negalima perkelti aplanko � vien� i� jo palikuoni�."
 
-#: 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 "Nurodyk aplank�, � kur� kopijuoti aplank� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:325
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr "Kopijuoti aplank�"
 
-#: 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 "Nurodyk aplank�, � kur� perkelti aplank� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:369
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "Perkelti aplank�"
 
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -26414,17 +26692,17 @@ msgstr ""
 "Negal�jau i�trinti aplanko:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:406
-#, c-format
-msgid "Delete \"%s\""
-msgstr "I�trinti \"%s\""
-
-#: shell/e-shell-folder-commands.c:407
+#: shell/e-shell-folder-commands.c:405
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "I�trinti aplank� '%s'"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:412
+#, c-format
+msgid "Delete \"%s\""
+msgstr "I�trinti \"%s\""
+
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -26433,26 +26711,26 @@ msgstr ""
 "Negal�jau pervadinti aplanko:\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 "Pervadinti aplank� �%s� �:"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr "Pervadinti aplank�"
 
-#: 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 "Nurodytas aplanko vardas yra negalimas: %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"
@@ -26461,7 +26739,7 @@ msgstr ""
 "Negal�jau pervadinti aplanko:\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"
@@ -26470,25 +26748,21 @@ msgstr ""
 "Negaliu sukurti nurodyto aplanko:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:308
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Sukurti _nauj� aplank�..."
 
-#: shell/e-shell-folder-selection-dialog.c:393
-msgid "New..."
-msgstr "Naujas..."
-
-#: 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 "(Bevardis)"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 #, fuzzy
 msgid "Choose the type of importer to run:"
 msgstr "Pasirink, kur� importer� paleisti"
 
-#: 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"
@@ -26502,12 +26776,12 @@ msgstr ""
 "Gali pasirinkti �Automati�kas� jei tu ne�inai, ir Evolution bandys "
 "susigaudyti pati."
 
-#: 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
 #, fuzzy
 msgid "Please select the information that you would like to import:"
 msgstr "Pra�om pasirinkti informacij�, kuri� nor�tum importuoti"
 
-#: 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"
@@ -26516,23 +26790,23 @@ msgstr ""
 "Importuojama %s\n"
 "Importuojamas elementas %d."
 
-#: shell/e-shell-importer.c:355
+#: shell/e-shell-importer.c:351
 #, fuzzy
 msgid "Select importer"
 msgstr "Pasirink aplank�"
 
-#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "N�ra tokios bylos %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
 #, 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"
@@ -26541,11 +26815,11 @@ msgstr ""
 "N�ra importerio, kuris gal�t� suprasti\n"
 "%s"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "Importuojama"
 
-#: shell/e-shell-importer.c:522
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -26554,17 +26828,17 @@ msgstr ""
 "Importuojama %s.\n"
 "Pradedama %s"
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "Klaida pradedant %s"
 
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Klaida �keliant %s"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26573,31 +26847,31 @@ msgstr ""
 "Importuojama %s\n"
 "Importuojamas elementas 1."
 
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "Automati�kas"
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Bylos vardas:"
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Pasirink byl�"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Bylos tipas:"
 
-#: shell/e-shell-importer.c:716
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "Importuoti duomenis ir nuostatas i� kit� program�"
 
-#: shell/e-shell-importer.c:720
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "Importuoti vien� byl�"
 
-#: 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"
@@ -26605,192 +26879,194 @@ msgstr ""
 "Pra�ome palaukti...\n"
 "Ie�koma esam� nustatym�"
 
-#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Paleid�iami inteligenti�ki importeriai"
 
-#: 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 "Nuo %s:"
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Pasirink aplank�"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Pasirink aplank�, � kur� importuoti �iuos duomenis"
 
-#: 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 "Importuoti"
 
-#: shell/e-shell-offline-handler.c:582
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "U�daromos jungtys..."
 
-#: shell/e-shell-offline-sync.c:161
+#: shell/e-shell-offline-sync.c:163
 #, fuzzy, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
 "%s"
 msgstr "Sinchronizuojamas '%s'"
 
-#: shell/e-shell-offline-sync.c:239
+#: shell/e-shell-offline-sync.c:232
 #, fuzzy
 msgid "Syncing Folder"
 msgstr "Sinchronizuojamas aplankas"
 
 #. 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 "Sinchronizuojamas '%s'"
 
-#: 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 "Pra�om pasirinkti server�."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Atidaromas aplankas %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 "Atidaromas aplankas %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 "Atidaryti su %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 "Negal�jau pervadinti aplanko: %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 ""
 "Negaliu sukurti nurodyto aplanko:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:159
-#, fuzzy, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr "Negal�jau inicializuoti Evolution apvalkalo."
-
-#: shell/e-shell-startup-wizard.c:169
-#, fuzzy
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "Negal�jau inicializuoti Evolution apvalkalo."
-
-#: 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 "Nauja"
 
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Nenurodytas aplanko vardas."
 
-#: shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr "Aplanko varde negali b�ti Return simbolio."
 
-#: shell/e-shell-utils.c:127
+#: shell/e-shell-utils.c:129
 #, fuzzy
-msgid "Folder name cannot contain slashes."
-msgstr "�iame aplanke negali b�ti lai�k�."
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "Aplanko varde negali b�ti Return simbolio."
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "Aplanko varde negali b�ti Return simbolio."
+
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ir '..' yra rezervuoti katalog� vardai."
 
-#: 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 "Atrodo, kad GNOME Pilot �rankiai n�ra �diegti � �i� sistem�"
 
-#: shell/e-shell-view-menu.c:102
+#: shell/e-shell-view-menu.c:97
 #, c-format
 msgid "Error executing %s."
 msgstr "Klaida vykdant %s."
 
-#: shell/e-shell-view-menu.c:196
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug buddy nerastas tavo kelyje ($PATH)."
+#: shell/e-shell-view-menu.c:193
+#, fuzzy
+msgid "Bug buddy is not installed."
+msgstr "Bug buddy negal�jo b�ti paleistas."
 
-#: shell/e-shell-view-menu.c:204
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy negal�jo b�ti paleistas."
 
-#: shell/e-shell-view-menu.c:248
+#: shell/e-shell-view-menu.c:247
 msgid "About Ximian Evolution"
 msgstr "Apie Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:503
+#: shell/e-shell-view-menu.c:502
 msgid "Go to folder..."
 msgstr "Eiti � aplank�..."
 
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:503
 msgid "Select the folder that you want to open"
 msgstr "Pasirink aplank�, kur� nor�tum atidaryti"
 
-#: shell/e-shell-view-menu.c:625
+#: shell/e-shell-view-menu.c:617
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Sukurti nauj� trump�"
 
-#: 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 "Pasirink aplank� � kur� nor�tum, kad trump� rodyt�:"
 
-#: shell/e-shell-view-menu.c:788
+#: shell/e-shell-view-menu.c:769
 #, fuzzy
 msgid "_Work Online"
 msgstr "Dirbti atsijungus"
 
-#: 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 "_Dirbti atsijungus"
 
-#: 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 "Dirbti atsijungus"
 
-#: shell/e-shell-view.c:226
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "(Joks aplankas nerodomas)"
 
-#: 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 "(Jokio)"
 
-#: 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 dabar yra prisijungusi.  Paspausk �� mygtuk�, kad dirbtum "
 "atsijungus."
 
-#: 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 dabar yra atsijungimo procese."
 
-#: 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 ""
@@ -26809,12 +27085,12 @@ msgstr ""
 "Klaida i� aktyvavimo sistemos yra:\n"
 "%s"
 
-#: 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"
@@ -26822,151 +27098,145 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2178
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Blogi argumentai"
 
-#: shell/e-shell.c:2180
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "Negaliu u�siregistruoti OAF"
 
-#: shell/e-shell.c:2182
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "Konfig�racijos duombaz� nerasta"
 
-#: shell/e-shell.c:2184 shell/e-storage.c:571
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Bendroji klaida"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:80
 msgid "Create new shortcut group"
 msgstr "Sukurti nauj� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:77
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
 msgstr "Grup�s pavadinimas:"
 
-#: 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 ""
 "Ar tu tikrai nori pa�alinti grup�\n"
 "�%s� i� trumpi� juostos?"
 
-#: shell/e-shortcuts-view.c:178
-msgid "Don't remove"
-msgstr "Nepa�alinti"
-
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr "Pervadinti trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr "Pervadinti pasirinkt� trumpi� grup� �:"
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "_Ma�os ikonos"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr "Rodyti trumpes kaip ma�as ikonas"
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr "_Didel�s ikonos"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr "Rodyti trumpes kaip dideles ikonas"
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr "_Nauja grup�..."
 
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr "Sukurti nauj� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
 msgstr "_Pa�alinti �i� grup�..."
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr "Pa�alinti �i� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
 msgstr "_Pervadinti �i� grup�..."
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr "Pervadinti �i� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr "_Pasl�pti trumpi� juost�"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr "Pasl�pti trumpi� juost�"
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:281
 #, fuzzy
 msgid "Create _Default Shortcuts"
 msgstr "Sukurti nauj� trump�"
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:282
 #, fuzzy
 msgid "Create Default Shortcuts"
 msgstr "Sukurti nauj� trump�"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr "Pervadinti trump�"
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr "Pervadinti pasirinkt� trump� �:"
 
-#: shell/e-shortcuts-view.c:408
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr "Atidaryti aplank�, susiet� su �ia trumpe"
 
-#: 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 "Atidaryti naujame _lange"
 
-#: 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 "Atidaryti esam� lai�k� naujame lange"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr "Pe_rvadinti"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr "Pervadinti �i� trump�"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Re_move"
 msgstr "I�_trinti"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Pa�alinti �i� trump� i� trumpi� juostos"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr "Klaida i�saugant trumpes."
 
-#: shell/e-shortcuts.c:1080
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr "Trump�s"
 
@@ -26974,73 +27244,73 @@ msgstr "Trump�s"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:569
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "N�ra klaid�"
 
-#: shell/e-storage.c:573
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr "Jau yra aplankas su tokiu pat pavadinimu"
 
-#: shell/e-storage.c:575
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr "Nurodytas aplanko tipas yra blogas"
 
-#: shell/e-storage.c:577
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "I/O klaida"
 
-#: shell/e-storage.c:579
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr "Neu�tenka vietos aplankui sukurti"
 
-#: shell/e-storage.c:581
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr "Aplankas n�ra tu��ias"
 
-#: shell/e-storage.c:583
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr "Nurodytas aplankas nerastas"
 
-#: shell/e-storage.c:585
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ne�gyvendinta �ioje saugykloje"
 
-#: shell/e-storage.c:589
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr "Veiksmas nepalaikomas"
 
-#: shell/e-storage.c:591
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: shell/e-storage.c:593
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr "Nurodytas aplankas negali b�ti pakeistas ar i�trintas"
 
-#: shell/e-storage.c:595
+#: shell/e-storage.c:596
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Negalima padaryti aplanko vaiku vienu i� savo palikuoni�"
 
-#: shell/e-storage.c:597
+#: shell/e-storage.c:598
 msgid "Cannot create a folder with that name"
 msgstr "Negaliu sukurti aplanko su tokiu vardu"
 
-#: 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%% u�baigta)"
 
-#: shell/evolution-folder-selector-button.c:94
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<spausk �ia, kad pasirinktum aplank�>"
 
@@ -27081,85 +27351,82 @@ msgstr ""
 "Klaida i� aktyvavimo sistemos yra:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1145
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "CORBA klaida"
 
-#: shell/evolution-shell-component.c:1147
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Pertraukta"
 
-#: shell/evolution-shell-component.c:1149
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Blogas argumentas"
 
-#: shell/evolution-shell-component.c:1151
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "Jau turi savinink�"
 
-#: shell/evolution-shell-component.c:1153
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "N�ra savininko"
 
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Nerastas"
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Nepalaikomas tipas"
 
-#: shell/evolution-shell-component.c:1159
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Nepalaikoma schema"
 
-#: shell/evolution-shell-component.c:1161
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Nepalaikomas veiksmas"
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Vidin� klaida"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Egzistuoja"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "Blogas URI"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1210
 #, fuzzy
 msgid "Has subfolders"
 msgstr "N�ra tokio aplanko %s"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Nebeliko vietos"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "Senesnysis savininkas numir�"
 
-#: shell/evolution-test-component.c:49
+#: shell/evolution-test-component.c:63
 #, fuzzy
 msgid "Test type"
 msgstr "Bylos tipas:"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr "Aktyvios jungtys"
+#: shell/evolution-test-component.c:703
+#, fuzzy
+msgid "Evolution Test Component"
+msgstr "Evolution pa�to ra�ykl�."
 
-#: 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 "Paspausk Gerai, kad u�darytum �ias jungtis ir atsijungtum"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "Hostas"
-
-#: 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 "�emiau nurodytos jungtys �iuo metu yra aktyvios:"
 
@@ -27183,15 +27450,15 @@ msgstr "_Pa�tas"
 msgid "_Tasks:"
 msgstr "U�duotys"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder name:"
 msgstr "Aplanko pavadinimas:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder type:"
 msgstr "Aplanko tipas:"
 
-#: 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 "Nurodyk, kur sukurti aplank�:"
 
@@ -27215,39 +27482,39 @@ msgstr "Aplanko pavadinimas:"
 msgid "_User:"
 msgstr "_Vartotojo vardas:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Evolution Setup Assistant"
 msgstr "Evolution importavimo pad�j�jas"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 #, fuzzy
 msgid "Importing Files"
 msgstr "Importuojama"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Laiko juosta"
 
-#: 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
@@ -27284,41 +27551,42 @@ msgstr ""
 "Sveikas atvyk�s � Evolution importavimo priemon�.\n"
 "�is meistras pad�s tau importuojant i�orines bylas � Evolution."
 
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
 msgid "Importers"
 msgstr "Importeriai"
 
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Neimportuoti"
 
-#: shell/importer/intelligent.c:198
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Kit� kart� nebeklausti"
 
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution gali importuoti duomenis i� �emiau nurodyt� byl�:"
 
-#: 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 baigia darb�..."
 
-#: 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"
@@ -27345,7 +27613,7 @@ msgstr ""
 "Mes tikim�s, kad tau patiks m�s� sunkaus darbo vaisiai, ir\n"
 "laukiame tavo prisid�jimo!\n"
 
-#: shell/main.c:250
+#: shell/main.c:290
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -27353,77 +27621,111 @@ msgstr ""
 "A�i�\n"
 "Ximian Evolution komanda\n"
 
-#: shell/main.c:259
+#: shell/main.c:298
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Kit� kart� nebeklausti"
 
-#: shell/main.c:394
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Negal�jau prieiti prie Ximian Evolution apvalkalo."
 
-#: shell/main.c:403
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Negal�jau inicializuoti Ximian Evolution apvalkalo: %s"
 
-#: shell/main.c:485
+#: shell/main.c:528
 #, fuzzy
 msgid "Disable splash screen"
 msgstr "U�drausti "
 
-#: shell/main.c:487
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Pradedama importuoti"
 
-#: shell/main.c:489
+#: shell/main.c:532
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Paleid�iami inteligenti�ki importeriai"
 
-#: 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 "Si�sti vis� komponent� derinimo i�vest� � byl�."
 
-#: 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 "Negaliu inicializuoti Bonobo komponent� sistemos."
-
-#: 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 "Klaida �keliant byl�: %s"
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 #, fuzzy
 msgid "Input File"
 msgstr "�terpti byl�"
 
-#: tools/evolution-addressbook-export.c:46
-#, fuzzy
-msgid "Output File"
-msgstr "Atidaryti byl�"
-
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 #, fuzzy
 msgid "No filename provided."
 msgstr "Nenurodytas aplanko vardas."
 
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "Prisegti pried�..."
+
+#: 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 "Apra�ymas turi savyje"
+
+#: 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 "I�trinti �� lai�k�"
+
+#. 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 "Negal�jau pervadinti aplanko: %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..."
@@ -27515,7 +27817,7 @@ msgstr "esamas laikas"
 #: 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 "_Veiksmai"
 
@@ -27635,7 +27937,7 @@ msgid "Print this item"
 msgstr "Spausdinti �� 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 "I�saugoti"
 
@@ -27662,7 +27964,7 @@ msgstr "I�saugoti �� element� � 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 "_Byla"
 
@@ -27918,7 +28220,7 @@ msgstr "Gijomis suskirstytas lai�k� s�ra�as"
 msgid "_Expunge"
 msgstr "I�_valyti"
 
-#: 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 "_Aplankas"
 
@@ -28183,7 +28485,7 @@ msgstr "Atsakyti"
 
 #: 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 "Patikrinti, ar yra nauj� lai�k� visuose aplankuose"
 
 #: ui/evolution-mail-message.xml.h:64
@@ -28348,7 +28650,7 @@ msgstr "Cituojant"
 msgid "_Resend..."
 msgstr "Pe_rvadinti..."
 
-#: 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 "�ran_kiai"
 
@@ -28363,12 +28665,12 @@ msgstr "U�daryti �� lang�"
 #: 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 "_U�daryti"
 
 #: 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 "_Rodyti"
 
@@ -28376,6 +28678,10 @@ msgstr "_Rodyti"
 msgid "Attach"
 msgstr "Prisegti"
 
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Prisegti byl�"
+
 #: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "U�daryti esam� byl�"
@@ -28548,7 +28854,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "I�saugoti element� ir u�daryti dialogo lang�"
 
-#: 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 "_Pagalba"
 
@@ -28735,128 +29041,118 @@ msgstr "_Pilot nuostatos..."
 
 #: ui/evolution.xml.h:27
 #, fuzzy
-msgid "Pilot Con_duit Settings..."
-msgstr "_Pilot nuostatos..."
-
-#: ui/evolution.xml.h:28
-#, fuzzy
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "Sukurti _nauj� aplank�..."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "Si�sti / Gauti"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "I�si�sti laukiant� pa�t� ir parsi�sti nauj� pa�t�"
 
-#: ui/evolution.xml.h:31
-#, fuzzy
-msgid "Set up Pilot conduit configuration"
-msgstr "Pa�to nustatymas"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Pa�to nustatymas"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr "Rodyti informacij� apie Ximian Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "I�si�sti klaidos prane�im�"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "I�_si�sti klaidos prane�im�"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Prane�ti apie klaid�, naudojant Bug Buddy"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "Perjungti"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "Perjungti, ar rodyti aplank� juost�"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Perjungti, ar rodyti trumpi� juost�"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr "Perjungti, ar dirbama atsijungus."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "Rodyti parinkt� aplank�"
 
-#: 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 "_Apie Ximian Evolution..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "_Kopijuoti..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Aplank� juosta"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Aplankas"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "_Eiti � aplank�..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr "_Importuoti..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "_Perkelti..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "_Naujas"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "_Naujas aplankas"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Remove Other User's Folder"
 msgstr "Sukurti _nauj� aplank�..."
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "Pe_rvadinti..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "_Si�sti / Gauti"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "_Trumpi� juosta"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Trump�"
@@ -28943,9 +29239,8 @@ msgstr "Su kategorija"
 msgid "_Tasks"
 msgstr "_U�duotis"
 
-#. 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 ""
 
@@ -28968,22 +29263,22 @@ 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 "_Esamas vaizdas"
 
 #. 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 "Prisitaikyti"
 
-#: widgets/menus/gal-view-menus.c:366
+#: widgets/menus/gal-view-menus.c:359
 #, fuzzy
 msgid "Save Custom View"
 msgstr "Prisitaikyti"
 
-#: widgets/menus/gal-view-menus.c:379
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr "Apibr��ti vaizdus"
 
@@ -28994,19 +29289,19 @@ msgid "MTWTFSS"
 msgstr "PATKP�S"
 
 #. 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 "Dabar"
 
-#: 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 "Dabar"
 
-#: 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 "Data turi b�ti �vesta formatu: %s"
@@ -29015,81 +29310,81 @@ msgstr "Data turi b�ti �vesta formatu: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentin� reik�m� turi b�ti tarp 0 ir 100 imtinai"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "Balt�"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "Centrin�s Europos"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "Kin�"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "Kirilica"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr "Graik�"
 
-#: 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 "Japon�"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "Kor�jie�i�"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "Turk�"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr "Unikodas"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
 msgstr "Vakar� Europos"
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "Tradicinis"
 
-#: 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 "Supaprastintas"
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "Ukrainie�i�"
 
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:97
 #, fuzzy
 msgid "Visual"
 msgstr "I�jungti"
 
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Ne�inoma koduot�: %s"
 
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr "�vesk, koki� koduot� naudoti"
 
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "Kita..."
 
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr "Koduot�"
 
@@ -29097,11 +29392,12 @@ msgstr "Koduot�"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:189
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr "Paie�kos redaktorius"
 
-#: widgets/misc/e-filter-bar.c:211
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "I�saugoti paie�k�"
 
@@ -29120,66 +29416,522 @@ msgstr "Prid�ti prie i�saugot� paie�k�"
 msgid "_Advanced..."
 msgstr "I�sami..."
 
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
 msgid "Information"
 msgstr "Informacija"
 
-#: widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:168
 msgid "Error"
 msgstr "Klaida"
 
-#: widgets/misc/e-messagebox.c:173
+#: widgets/misc/e-messagebox.c:175
 msgid "Question"
 msgstr "Klausimas"
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
 msgid "Message"
 msgstr "�inut�"
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
-msgstr "Kit� kart� neberodyti �ios �inut�s."
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "_Ie�koti"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:537
 #, fuzzy
 msgid "_Find Now"
 msgstr "Ie�koti"
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 #, fuzzy
 msgid "_Clear"
 msgstr "I�valyti"
 
-#: 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 "Bandyti"
+
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "I�valyti"
 
-#: widgets/misc/e-search-bar.c:897
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Ie�koti"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Asmeninis Adres� knygel�s serveris"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Evolution adres� knygel�s ma�� korteli� vaizduokl�"
 
-#: 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 pa�to komponento."
 
-#: wombat/wombat.c:199
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): negal�jau inicializuoti GNOME-VFS"
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Evolution adres� knygel�s ma�� korteli� vaizduokl�"
+
+#, fuzzy
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Gamykla importuoti VCard byloms � Evolution."
+
+#, fuzzy
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Importuoja VCard bylas � Evolution."
 
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): negal�jau inicializuoti GNOME"
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Gamykla importuoti VCard byloms � Evolution."
 
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Importuoja VCard bylas � Evolution."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr "Evolution adres� knygel�s komponento gamykla."
+
+#, fuzzy
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Evolution adres� knygel�s konduito konfig�ravimo �rankis\n"
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Evolution kontakt� tvarkymo komponentas."
+
+#~ msgid "Factory for the Addressbook's address displayer"
+#~ msgstr "Adres� knygel�s adreso vaizduokl�s gamykla"
+
+#, fuzzy
+#~ msgid ""
+#~ "Factory for the configuration controls for the Evolution Addressbook."
+#~ msgstr "Evolution adres� knygel�s komponento gamykla."
+
+#, fuzzy
+#~ msgid "380"
+#~ msgstr "389"
+
+#, fuzzy
+#~ msgid "<- _Remove"
+#~ msgstr " _Pa�alinti"
+
+#, fuzzy
+#~ msgid "<< Fewer Options"
+#~ msgstr "Parinktys"
+
+#, fuzzy
+#~ msgid "DN Customization"
+#~ msgstr "Prisitaikyti"
+
+#, fuzzy
+#~ msgid "Evolution Attribute"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "LDAP Attribute"
+#~ msgstr "LDAP autentikacija"
+
+#, fuzzy
+#~ msgid "Mappings"
+#~ msgstr "Para�t�s"
+
+#, fuzzy
+#~ msgid "Select"
+#~ msgstr "Pa�ym�ti visus"
+
+#, fuzzy
+#~ msgid "_Add ->"
+#~ msgstr "Prid�ti"
+
+#, fuzzy
+#~ msgid "_Add Mapping"
+#~ msgstr "Prid�ti veiksm�"
+
+#, fuzzy
+#~ msgid "_Add to DN"
+#~ msgstr "Prid�ti veiksm�"
+
+#, fuzzy
+#~ msgid "_Always"
+#~ msgstr "Persp�jimai"
+
+#, fuzzy
+#~ msgid "_Delete Mapping"
+#~ msgstr "_I�trinti visk�"
+
+#, fuzzy
+#~ msgid "_Edit Mapping"
+#~ msgstr "K_eisti �vyk�"
+
+#, fuzzy
+#~ msgid "_Evolution attribute:"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "_More Options >>"
+#~ msgstr "_Parinktys"
+
+#, fuzzy
+#~ msgid "account-druid"
+#~ msgstr "S�skaita"
+
+#, fuzzy
+#~ msgid "account-editor"
+#~ msgstr "contact-list-editor"
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr "Adres� knygel�s vard� pasirinkimo s�sajos gamykla"
+
+#~ msgid "Edit Contact List"
+#~ msgstr "Taisyti kontakt� s�ra��"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Bevardis kontakt� s�ra�as"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d nerodom�)"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "K_ontaktai..."
+
+#~ msgid "Phone Types"
+#~ msgstr "Telefon� tipai"
+
+#~ msgid "Delete Contact?"
+#~ msgstr "I�trinti kontakt�?"
+
+#, fuzzy
+#~ msgid "Display Cards?"
+#~ msgstr "Vaizdavimas"
+
+#, fuzzy
+#~ msgid "Display Cards"
+#~ msgstr "Vaizdavimas"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Evolution pa�to komponento gamykla."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Evolution komponentas tvarkyti kalendoriui."
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Tasks control"
+#~ msgstr "Testinio komponento gamykla."
+
+#, fuzzy
+#~ msgid "Factory to create a component editor factory"
+#~ msgstr "Evolution kalendoriaus komponento gamykla."
+
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "Negal�jau inicializuoti GNOME"
+
+#, fuzzy
+#~ msgid "st"
+#~ msgstr "1-a"
+
+#, fuzzy
+#~ msgid "nd"
+#~ msgstr "2-a"
+
+#, fuzzy
+#~ msgid "rd"
+#~ msgstr "3-a"
+
+#~ msgid "th"
+#~ msgstr "-�"
+
+#, fuzzy
+#~ msgid "Could not activate Bonobo"
+#~ msgstr "Negal�jau inicializuoti Bonobo"
+
+#, fuzzy
+#~ msgid "Could not create the component editor factory"
+#~ msgstr "Negal�jau sukurti laikino katalogo: %s"
+
+#~ msgid "Print Calendar"
+#~ msgstr "Spausdinti kalendori�"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create the tasks view.  Please check your ORBit and OAF setup."
+#~ msgstr ""
+#~ "Negal�jau sukurti kalendoriaus rodinio. Patikrink, ar gerai �diegti ORBit "
+#~ "ir OAF."
+
+#~ msgid ""
+#~ "Evolution has taken the tasks that were in your calendar folder and "
+#~ "automatically migrated them to the new tasks folder."
+#~ msgstr ""
+#~ "Evolution pa�m� u�duotis, kurios buvo tavo kalendoriaus aplanke ir "
+#~ "automati�kai perk�l� jas � nauj� u�duo�i� aplank�."
+
+#~ 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 band� paimti u�duotis, kurios buvo tavo kalendoriaus aplanke ir "
+#~ "perkelti jas � nauj� u�duo�i� aplank�.\n"
+#~ "Kai kurios u�duotys negal�jo b�ti perkeltos, taigi �� proces� gali b�ti "
+#~ "bandoma pakartoti ateityje."
+
+#, fuzzy
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Gamykla importuoti VCard byloms � Evolution."
+
+#, fuzzy
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Importuoja VCard bylas � Evolution."
+
+#, fuzzy
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Importuoja VCard bylas � Evolution."
+
+#, fuzzy
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr ""
+#~ "Negaliu gauti lai�ko: %s i� aplanko %s\n"
+#~ "  %s"
+
+#, fuzzy
+#~ msgid "Can't call getFolderAtPath on storage: %s"
+#~ msgstr "Negal�jau prisijungti prie serverio: %s"
+
+#~ msgid "Warning!"
+#~ msgstr "�sp�jimas!"
+
+#~ msgid ""
+#~ "Could not create composer window, because you have not yet\n"
+#~ "configured any identities in the mail component."
+#~ msgstr ""
+#~ "Negal�jau sukurti ra�ykl�s lango, nes tu dar nenurodei\n"
+#~ "jokios asmenyb�s pa�to komponente."
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "Negal�jau inicializuoti Evolution ra�ykl�s."
+
+#~ msgid "minute"
+#~ msgstr "minut�"
+
+#~ msgid "hour"
+#~ msgstr "valanda"
+
+#~ msgid "week"
+#~ msgstr "savait�"
+
+#~ msgid "year"
+#~ msgstr "metai"
+
+#~ msgid "Add action"
+#~ msgstr "Prid�ti veiksm�"
+
+#~ msgid "Add criterion"
+#~ msgstr "Prid�ti s�lyg�"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Evolution pa�to komponento gamykla."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Evolution pa�to komponento gamykla."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Evolution pa�to komponento gamykla."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Evolution ra�ykl�s komponento gamykla."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Evolution komponentas pa�tui tvarkyti."
+
+#~ msgid "Evolution mail folder factory component."
+#~ msgstr "Evolution pa�to aplanko gamyklos komponentas."
+
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr "Evolution ra�ykl�s komponento gamykla."
+
+#~ msgid "Factory for the Mail Summary component."
+#~ msgstr "Pa�to ap�valgos komponento gamykla."
+
+#, fuzzy
+#~ msgid "Warning: Unsent Messages"
+#~ msgstr "�sp�jimas: Pakeistas lai�kas"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "Negaliu inicializuoti Evolution pa�to komponento."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "Negaliu inicializuoti Evolution pa�to komponento."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Negaliu inicializuoti Evolution pa�to komponento."
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Gamykla importuoti mbox byloms � Evolution"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importuoja mbox bylas � Evolution"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "Gamykla importuoti Outlook Express 4 byloms � Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importuoja Outlook Express 4 bylas � Evolution"
+
+#~ msgid "Really delete account?"
+#~ msgstr "Ar tikrai i�trinti s�skait�?"
+
+#, fuzzy
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "Parodyti kit� neskaityt� lai�k�"
+
+#, fuzzy
+#~ msgid "Add Signature"
+#~ msgstr "I�saugoti para��"
+
+#, fuzzy
+#~ msgid "Account %d"
+#~ msgstr "S�skaita"
+
+#, fuzzy
+#~ msgid "_Variable-width:"
+#~ msgstr "Kintamos krypties"
+
+#~ msgid "All folders"
+#~ msgstr "Visi aplankai"
+
+#, fuzzy
+#~ msgid "Apri file"
+#~ msgstr "Balandis"
+
+#, fuzzy
+#~ msgid "Display Options"
+#~ msgstr "Vaizdavimo parinktys"
+
+#~ msgid "Folders whose names begin with:"
+#~ msgstr "Aplankai, kuri� vardai prasideda su:"
+
+#, fuzzy
+#~ msgid "Salve file"
+#~ msgstr "Pasirink byl�"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Aplankas, kuriame yra Evolution ap�valga"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Summary component."
+#~ msgstr "Evolution pa�to komponento gamykla."
+
+#, fuzzy
+#~ msgid "Marquette"
+#~ msgstr "Martinika"
+
+#, fuzzy
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
+
+#, fuzzy
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Evolution pa�to komponento gamykla."
+
+#~ msgid "Evolution installation"
+#~ msgstr "Evolution �diegimas"
+
+#~ msgid ""
+#~ "This new version of Evolution needs to install additional files\n"
+#~ "into your personal Evolution directory"
+#~ msgstr ""
+#~ "�iai naujai Evolution versijai reikia �diegti papildom� byl�\n"
+#~ "� tavo asmenin� Evolution katalog�"
+
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr ""
+#~ "Pra�au, paspausk �Gerai�, kad �diegtum bylas, arba �At�aukti�, kad "
+#~ "i�eitum."
+
+#, fuzzy
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Negal�jau sukurti katalogo %s:\n"
+#~ "%s"
+
+#~ msgid "New..."
+#~ msgstr "Naujas..."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr "Negal�jau inicializuoti Evolution apvalkalo."
+
+#, fuzzy
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr "Negal�jau inicializuoti Evolution apvalkalo."
+
+#, fuzzy
+#~ msgid "Folder name cannot contain slashes."
+#~ msgstr "�iame aplanke negali b�ti lai�k�."
+
+#~ msgid "Bug buddy was not found in your $PATH."
+#~ msgstr "Bug buddy nerastas tavo kelyje ($PATH)."
+
+#~ msgid "Don't remove"
+#~ msgstr "Nepa�alinti"
+
+#~ msgid "Active connections"
+#~ msgstr "Aktyvios jungtys"
+
+#~ msgid "Host"
+#~ msgstr "Hostas"
+
+#~ msgid "Cannot initialize the Bonobo component system."
+#~ msgstr "Negaliu inicializuoti Bonobo komponent� sistemos."
+
+#, fuzzy
+#~ msgid "Output File"
+#~ msgstr "Atidaryti byl�"
+
+#, fuzzy
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "_Pilot nuostatos..."
+
+#, fuzzy
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "Pa�to nustatymas"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Asmeninis Adres� knygel�s serveris"
+
+#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
+#~ msgstr "setup_vfs(): negal�jau inicializuoti GNOME-VFS"
+
+#~ msgid "init_corba(): could not initialize GNOME"
+#~ msgstr "init_corba(): negal�jau inicializuoti GNOME"
+
+#~ msgid "init_bonobo(): could not initialize Bonobo"
+#~ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 
 #, fuzzy
 #~ msgid "_Configure..."
@@ -29265,9 +30017,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ "Importeris nepasiruo��s.\n"
 #~ "Laukiu 5 sekundes kol bandysiu v�l."
 
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Evolution importavimo pad�j�jas"
-
 #, fuzzy
 #~ msgid "_Preferences..."
 #~ msgstr "Kalendoriaus nuostatos..."
@@ -29387,9 +30136,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ "Lai�ko data bus palyginta su esamu laiku, kai\n"
 #~ "paleid�iamas filtras ar atidaromas vAplankas."
 
-#~ msgid "Evolution News Editor"
-#~ msgstr "Evolution naujien� tvarkykl�"
-
 #~ msgid "Are you sure you want to delete this news account?"
 #~ msgstr "Ar tu tikrai nori i�trinti �i� naujien� s�skait�?"
 
@@ -29403,9 +30149,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "News Servers"
 #~ msgstr "Serveriai"
 
-#~ msgid "Source"
-#~ msgstr "�altinis"
-
 #~ msgid "Source Information"
 #~ msgstr "�altinio informacija"
 
@@ -29470,10 +30213,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ "Klaida, �keliant filtro informacij�:\n"
 #~ "%s"
 
-#, fuzzy
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr "Evolution pa�to komponento."
-
 #~ msgid "Factory for the Calendar Summary component."
 #~ msgstr "Kalendoriaus ap�valgos komponento gamykla."
 
@@ -29555,10 +30294,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgstr "Keisti"
 
 #, fuzzy
-#~ msgid " New "
-#~ msgstr "Nauja"
-
-#, fuzzy
 #~ msgid "Advanced Options"
 #~ msgstr "Nutraukti veiksm�"
 
@@ -29812,9 +30547,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "New Contact _List"
 #~ msgstr "Naujas kontakt� _s�ra�as"
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "Redaguoti adres� knygel�"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Prid�ti adres� knygel�"
 
@@ -30059,9 +30791,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "�C"
 #~ msgstr "�C"
 
-#~ msgid "Al_l stations:"
-#~ msgstr "_Visos stotys:"
-
 #~ msgid "All _folders:"
 #~ msgstr "Visi _aplankai:"
 
@@ -30352,9 +31081,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Find..."
 #~ msgstr "Rasti..."
 
-#~ msgid "Save calendar"
-#~ msgstr "I�saugoti kalendori�"
-
 #~ msgid "Alarms timeout after"
 #~ msgstr "Persp�jimai baigiasi po"
 
@@ -30478,9 +31204,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Print the selected message"
 #~ msgstr "Spausdinti parinkt� lai�k�"
 
-#~ msgid "Delete this message"
-#~ msgstr "I�trinti �� lai�k�"
-
 #~ msgid "Evolution files successfully installed."
 #~ msgstr "Evolution bylos s�kmingai �diegtos."
 
@@ -30632,9 +31355,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Unspecified"
 #~ msgstr "Nenurodyta"
 
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Evolution pa�to nustatymas"
-
 #~ msgid "Include this account when receiving mail"
 #~ msgstr "�traukti �i� s�skait� parsiun�iant pa�t�"
 
@@ -30656,9 +31376,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "_Message Hiding"
 #~ msgstr "_Lai�k� sl�pimas"
 
-#~ msgid "The time is invalid"
-#~ msgstr "Laikas netaisyklingas"
-
 #~ msgid "Disabled"
 #~ msgstr "I�jungtas"
 
@@ -30683,9 +31400,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Outgoing Mail Server"
 #~ msgstr "Siun�iamo pa�to serveris"
 
-#~ msgid "_Addressbook Configuration..."
-#~ msgstr "_Adres� knygel�s konfig�ravimas..."
-
 #~ msgid "_Print Contacts..."
 #~ msgstr "S_pausdinti kontaktus..."
 
diff --git a/po/lv.po b/po/lv.po
index 1341b90c9d..ff6bf21466 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution for latvian\n"
-"POT-Creation-Date: 2003-02-04 12:25-0500\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-02-03 23:02+0200\n"
 "Last-Translator: Pēteris Krišjānis <peteris.krisjanis@os.lv>\n"
 "Language-Team: Latvian <lv@li.org>\n"
@@ -14,40 +14,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 "Ražotne LDIF failu importēšanai Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evoluion importēšanas asistents"
+
+#: 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 "Importē LDIF failus Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution pasta sacerētājs."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Ražotne VKaršu (VCard) failu importēšanai Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution pasta sacerētājs."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importē VKartes (VCard) failus 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 "Saglabāt kā"
 
 #: 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:76 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 "Nosaukums"
 
 #: 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 "Epasts"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "Primārais"
 
@@ -57,16 +69,17 @@ msgstr "Prim"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: 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 "Asistents"
 
 #: 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:1745
-#: addressbook/gui/contact-editor/e-contact-editor.c:1812
+#: 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 "Darījumi"
 
@@ -76,12 +89,12 @@ msgid "Bus"
 msgstr "Kopne"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr "Atzvanīšana"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "Kompānija"
 
@@ -92,12 +105,13 @@ msgstr "Komp"
 #: 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:1751
-#: addressbook/gui/contact-editor/e-contact-editor.c:1813
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr "Mājas"
 
 #: 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 "Organizācija"
@@ -108,18 +122,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:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "Mobīlais tel."
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: 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:1747
+#: 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 "Fakss darījumiem"
@@ -129,13 +143,13 @@ msgid "Bus Fax"
 msgstr "Fakss Dar."
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Mājas fakss"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "Darījumiem 2"
 
@@ -144,43 +158,43 @@ msgid "Bus 2"
 msgstr "Biz. 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "Mājas 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: 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:1756
-#: addressbook/gui/contact-editor/e-contact-editor.c:1814
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "Citi"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Cits fakss"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Peidžers"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: 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:1761
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telekss"
@@ -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:1787
+#: 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 "Epasts 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:1788
+#: 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 "Epasts 3"
@@ -223,6 +237,7 @@ msgid "Dep"
 msgstr "Dep."
 
 #: 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 "Birojs"
@@ -232,6 +247,7 @@ msgid "Off"
 msgstr "Bir."
 
 #: 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 "Amats"
@@ -246,6 +262,7 @@ msgid "Prof"
 msgstr "Prof."
 
 #: 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 "Menedžeris"
@@ -259,6 +276,7 @@ msgid "Ass"
 msgstr "Ass."
 
 #: 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 "Iesauka"
@@ -268,16 +286,19 @@ msgid "Nick"
 msgstr "Iesauka"
 
 #: 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 "Dzīvesbiedrs"
 
 #: 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 "Piezīme"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr "Kalendāra URI"
 
@@ -295,288 +316,377 @@ msgid "FBUrl"
 msgstr "BAUrl"
 
 #: 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 "Kalendārs"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
 msgid "Anniversary"
 msgstr "Ikgadējs"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Ikgad."
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "Dzimšanas datums"
 
-#: 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 "Kategorijas"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Uzvārds"
 
-#: 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
 msgid "Unnamed List"
 msgstr "Nenosaukts saraksts"
 
-#: addressbook/backend/ebook/e-card.c:2683
-msgid "Multiple VCards"
-msgstr "Vairākas VKartes"
+#: 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 "Pilns vārds"
 
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
-msgstr "%s VKarte"
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "_Adrese:"
+
+#: addressbook/backend/ebook/e-card.c:1328
+#, fuzzy
+msgid "Address Label"
+msgstr "_Adrešu kartes"
+
+#: addressbook/backend/ebook/e-card.c:1335
+#, fuzzy
+msgid "Phone"
+msgstr "Ponkē"
+
+#: addressbook/backend/ebook/e-card.c:1349
+#, fuzzy
+msgid "Birth date"
+msgstr "Dzimšanas datums"
+
+#: 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 "Organizācija"
+
+#: 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 "Loma"
+
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
+msgid "Mailer"
+msgstr "Pastnieks"
+
+#: addressbook/backend/ebook/e-card.c:1445
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "Brīvs/Aizņemts URL:"
+
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Kalendārs"
+
+#: addressbook/backend/ebook/e-card.c:1466
+#, fuzzy
+msgid "Related Contacts"
+msgstr "Izvēlētie kontakti:"
+
+#: addressbook/backend/ebook/e-card.c:1480
+#, fuzzy
+msgid "Category List"
+msgstr "Kategorija ir"
+
+#: addressbook/backend/ebook/e-card.c:1487
+msgid "Wants HTML"
+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
-#: tools/evolution-launch-composer.c:344
+#: 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 "Cita adrese"
+
+#: 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 "Ievietot"
+
+#: addressbook/backend/ebook/e-card.c:1540
+#, fuzzy
+msgid "Use Score"
+msgstr "Rezultāts"
+
+#: 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 "Nevarēju inicializēt Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:364
-#: addressbook/backend/pas/pas-backend-ldap.c:3021
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 msgid "Searching..."
 msgstr "Meklēju..."
 
-#: addressbook/backend/pas/pas-backend-file.c:366
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr "Ielādēju..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:730
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+#, fuzzy
+msgid "Using Distinguished Name (DN)"
+msgstr "Izmantoju atšķirīgo vārdu (DN)"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "Izmantoju epasta adresi"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 msgid "Reconnecting to LDAP server..."
 msgstr "Pārvienojos ar LDAP serveri..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1273
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr "Pievienoju karti LDAP serverim..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1379
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr "Izņemu karti no LDAP servera..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1615
-#: addressbook/backend/pas/pas-backend-ldap.c:1618
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr "Mainu karti no LDAP servera..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2932
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "Saņemu LDAP meklēšanas rezultātus..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:3041
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 msgid "Error performing search"
 msgstr "Kļūda izpildot meklēšanu"
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Noklusētā sinhr. adrese:"
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Kursors nevarēja tikt ieladēts\n"
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EGrāmata (EBook) nav ielādēta\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 "Nevarēju sāknēt wombat serveri"
 
-#: 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 "Nevarēju sāknēt 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 "Nevarēju nolasīt Pilot adrešu aplikācijas bloku"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Bonobo kontrole adrešu uzniršanai."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Bonobo kontrole adrešu parādīšanai."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Vienkārša Bonobo kontrole, kas parāda adrešu grāmatu."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr "Evolution adrešu grāmatu glabātuvju konfigurācijas kontrole."
-
-#: 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 "Šeit konfigurējiet pieeju LDAP direktoriju serveriem"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Kontrole, kas parāda Evolution adrešu grāmatas minikarti."
-
-#: 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 "Direktoriju serveri"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Rediģēt adrešu grāmatau"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Evolution komponente kontaktu pārvaldīšanai."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Evolution adrešu grāmatas vārda izvēles saskarne."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Ražotne Adrešu grāmatas minikaršu kontrolei"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Ražotne adrešu grāmatas adrešu izniršanai"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Ražotne adrešu grāmatas adrešu rādītājam"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
-msgid "Factory for the Addressbook's address popup"
-msgstr "Ražotne adrešu grāmatas adrešu izniršanai"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
-msgid "Factory for the configuration controls for the Evolution Addressbook."
-msgstr "Konfigurācijas kontroļu ražotne Evolution adrešu grāmatai."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "Factory for the sample Addressbook control"
-msgstr "Ražotne vienkāršai adrešu grāmatas kontrolei"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
 
-#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:630
-#: 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:1063
+#: 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 "Kontakti"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:76
 msgid "Folder containing contact information"
 msgstr "Mape, kas satur informāciju par kontaktiem"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP Server"
 msgstr "LDAP serveris"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP server containing contact information"
 msgstr "LDAP serveris, kas satur informāciju par kontaktiem"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 msgid "Public Contacts"
 msgstr "Publiskie kontakti"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 msgid "Public folder containing contact information"
 msgstr "Publiskā mape, kas satur informāciju par kontaktiem"
 
-#: addressbook/gui/component/addressbook-component.c:586
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Jauns kontakts"
 
-#: addressbook/gui/component/addressbook-component.c:586
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_Kontakts"
 
-#: addressbook/gui/component/addressbook-component.c:587
-#: ui/evolution-addressbook.h:15
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Create a new contact"
 msgstr "Izveidot jaunu kontaktu"
 
-#: addressbook/gui/component/addressbook-component.c:590
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Jauns kontaktu saraksts"
 
-#: addressbook/gui/component/addressbook-component.c:590
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "Kontaktu _saraksts"
 
-#: addressbook/gui/component/addressbook-component.c:591
+#: addressbook/gui/component/addressbook-component.c:569
 msgid "Create a new contact list"
 msgstr "Izveidot jaunu kontaktu sarakstu"
 
-#: addressbook/gui/component/addressbook-config.c:197
+#: addressbook/gui/component/addressbook-config.c:206
 msgid "Failed to connect to LDAP server"
 msgstr "Nespēju savienoties ar LDAP serveri"
 
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 msgid "Failed to authenticate with LDAP server"
 msgstr "Nespēju autentificēties ar LDAP serveri"
 
-#: addressbook/gui/component/addressbook-config.c:239
+#: addressbook/gui/component/addressbook-config.c:259
 msgid "Could not perform query on Root DSE"
 msgstr "Nevarēju izpildīt pieprasījumu uz saknes DSE"
 
-#: addressbook/gui/component/addressbook-config.c:648
+#: addressbook/gui/component/addressbook-config.c:682
 msgid "The server responded with no supported search bases"
 msgstr "Serveris atbildeja ar neatbalstītām meklēšanas bāzēm"
 
-#: addressbook/gui/component/addressbook-config.c:1154
+#: addressbook/gui/component/addressbook-config.c:1193
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Šis serveris neatbalsta LDAPv3 shēmas informāciju"
 
-#: addressbook/gui/component/addressbook-config.c:1176
+#: addressbook/gui/component/addressbook-config.c:1215
 msgid "Error retrieving schema information"
 msgstr "Kļūda saņemot shēmas informāciju"
 
-#: addressbook/gui/component/addressbook-config.c:1184
+#: addressbook/gui/component/addressbook-config.c:1223
 msgid "Server did not respond with valid schema information"
 msgstr "Serveris atbildēja ar nepareizu shēmas informāciju"
 
-#: addressbook/gui/component/addressbook-config.c:1630
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP nav ticis aktivizēts šajā Evolution būvējumā"
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr "Konta nosaukums"
 
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr "Servera nosaukums"
 
-#: 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 "Nespēju inicializēt gnome-vfs"
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "LDAP nav ticis aktivizēts šajā Evolution būvējumā"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
 msgid "Other Contacts"
 msgstr "Citi kontakti"
 
-#: addressbook/gui/component/addressbook.c:474
-msgid "Unable to open addressbook"
-msgstr "Nevaru atvērt adrešu gramatu"
-
-#: 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."
@@ -584,7 +694,7 @@ msgstr ""
 "Mēs nespējām atvērt šo adrešu grāmatu. Lūdzu pārbaudiet\n"
 "vai šis ceļš eksistē un vai jums ir pieejas atļauja ceļa mērķim."
 
-#: 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"
@@ -594,7 +704,7 @@ msgstr ""
 "ka esat ievadijuši nepareizu URI, vai arī LDAP serveris\n"
 "ir nesasniedzams."
 
-#: 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"
@@ -606,7 +716,7 @@ msgstr ""
 "jums ir jākompilē programma no CVS avota pēc OpenLDAP\n"
 "programmatūras iegūšanas no saites zemāk.\n"
 
-#: 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"
@@ -616,45 +726,48 @@ msgstr ""
 "ka esat ievadijuši nepareizu URI, vai arī serveris\n"
 "ir nesasniedzams."
 
-#. 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 "Nevaru atvērt adrešu gramatu"
+
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr "Izmantoju LDAP serveri anonīmi"
 
-#: addressbook/gui/component/addressbook.c:625
+#: addressbook/gui/component/addressbook.c:667
 msgid "Failed to authenticate.\n"
 msgstr "Neizdevās autentificēties.\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
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sIevadiet %s paroli (lietotājs %s)"
 
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:813
 msgid "Name begins with"
 msgstr "Vārds sākas ar"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:814
 msgid "Email begins with"
 msgstr "Epasts sākas ar"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorija ir"
 
 #. 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 "Jebkuršs lauks satur"
 
-#: addressbook/gui/component/addressbook.c:786
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "Paplašināti..."
 
-#: 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"
@@ -666,7 +779,7 @@ msgstr ""
 "Lūdzu padariet jūsu meklējumu precīzāku vai arī paliliniet rezultāta limitu\n"
 "direktorijas servera preferencēs šai adrešu grāmatai."
 
-#: 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"
@@ -678,25 +791,25 @@ msgstr ""
 "vai arī palieliniet laika limitu direktorijas servera preferencēs\n"
 "šajai adrešu grāmatai."
 
-#: 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 "Šīs adrešu grāmatas aizmugure nespēja parsēt šo pieprasījumu."
 
-#: addressbook/gui/component/addressbook.c:971
+#: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Šīs adrešu grāmatas aizmugure negribēja izpildīt pieprasījumu."
 
-#: addressbook/gui/component/addressbook.c:975
+#: addressbook/gui/component/addressbook.c:1006
 msgid "This query did not complete successfully."
 msgstr "Šis pieprasījums netika izpildīts veiksmīgi."
 
 #. 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 "Jebkura kategorija"
 
-#: addressbook/gui/component/addressbook.c:1132
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ko mapju aplūks attēlos"
 
@@ -705,55 +818,54 @@ msgstr "URI, ko mapju aplūks attēlos"
 #. * 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 "(nekas)"
 
-#: 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:1786
+#: 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 "Primārais epasts"
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Izvēlieties darbību"
 
-#: 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 "Izveidojiet jaunu \"%s\" kontaktu"
 
-#: 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 "Pievienot adresi eksistējošajam \"%s\" kontaktam"
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Meklēju adrešu grāmatā..."
 
-#: 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 "Rediģēt kontakta informāciju"
 
-#: 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 "Pievienot kontaktiem"
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Apvienot e-pasta adreses"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Deaktivizēt vaicājumus"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Aktivizēt vaicājumus (Bīstami!)"
 
@@ -768,8 +880,16 @@ msgid "  S_how Supported Bases "
 msgstr "  Pa_rādīt atbalstītās bāzes"
 
 #: 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"
@@ -784,59 +904,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 "<- _Izņemt"
-
-#: addressbook/gui/component/ldap-config.glade.h:14
-msgid "<< Fewer Options"
-msgstr "<< Mazāk opcijas"
-
-#: addressbook/gui/component/ldap-config.glade.h:15
-msgid "Add (or Edit) Attribute Mappings"
-msgstr "Pievienot (vai rediģēt) atribūtu atbilstības"
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "Add LDAP Server"
+msgstr "LDAP serveris"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
 msgstr "Adrešu grāmatas resursi"
 
-#: addressbook/gui/component/ldap-config.glade.h:17 mail/mail-account-gui.c:58
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
 #: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Vienmēr"
 
-#: addressbook/gui/component/ldap-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Anonymously"
 msgstr "Anonīmi"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
-msgid "Associated LDAP Attribute"
-msgstr "Asociētais LDAP atribūts"
-
-#: addressbook/gui/component/ldap-config.glade.h:20
-msgid "Attribute"
-msgstr "Atribūts"
-
-#: 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"
@@ -850,70 +947,55 @@ msgstr ""
 "Lūdzu klikšķiniet uz \"Beigt\" pogas, lai saglabātu jūsu tikko ievadītos "
 "uzstādījumus."
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
 msgstr "Savienojos"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
-msgid "Corresponding Evolution Attribute"
-msgstr "Ziņoju Evolution atribūtu"
-
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "DN Customization"
-msgstr "DN pārveide"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "D_zēst"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "Atšķiramais _vārds:"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid "Edit LDAP Server"
+msgstr "LDAP serveris"
+
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Email Address:"
 msgstr "Epasta adrese:"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-msgid "Evolution Attribute"
-msgstr "Evolution atribūts"
-
-#: 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 lietos šo DN, lai autentificētu jūs ar serveri"
 
-#: 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 lietos šo epasta adresi,lai autentificētu jūs ar serveri"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Finished"
 msgstr "Beigt"
 
-#: 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 "Galvenais"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "LDAP Attribute"
-msgstr "LDAP atribūts"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "LDAP Configuration Assistant"
 msgstr "LDAP konfigurācijas asistents"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
-msgid "Mappings"
-msgstr "Atbilstības"
-
-#: addressbook/gui/component/ldap-config.glade.h:39 mail/mail-account-gui.c:60
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
 #: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr "Nekad"
 
-#: 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"
@@ -929,58 +1011,26 @@ msgstr ""
 "jūsu savienojumu. Paprasiet savam sistēmu administrātoram, vai jūsu LDAP "
 "serveris lieto tos protokolus."
 
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid "Objectclasses"
-msgstr "Objektklases"
-
-#: addressbook/gui/component/ldap-config.glade.h:44
-msgid "Objectclasses Used in Evolution:"
-msgstr "Evolution izmantotās objektklases:"
-
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid "Objectclasses Used on Server:"
-msgstr "Servera izmantotās objektklases:"
-
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Viens"
 
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid ""
-"Please select an Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-"Lūdzu izvēlieties Evolution atribūtu un\n"
-"LDAP atribūtu, ar kuru to asociēt."
-
-#: addressbook/gui/component/ldap-config.glade.h:49
-msgid "R_estore Defaults"
-msgstr "At_jaunot noklusējumus"
-
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Re_store Defaults"
-msgstr "At_jaunot noklusējumus"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "M_eklēšanas mērogs:"
 
 #. 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 "Meklēšana"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
-msgid "Select"
-msgstr "Izvēlēties"
-
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Izvēlētais:"
 
-#: 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"
@@ -989,7 +1039,7 @@ msgstr ""
 "Izvēloties šo opciju, Evolution savienosies ar jūsu LDAP serveri tikai tad,\n"
 "ja jūsu LDAP serveris atbalsta SSL vai TLS."
 
-#: 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"
@@ -1006,7 +1056,7 @@ msgstr ""
 "savienojums jau\n"
 "ir drošs."
 
-#: 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"
@@ -1020,7 +1070,7 @@ msgstr ""
 "drošības\n"
 "kļūdu izmantojumiem."
 
-#: 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"
@@ -1030,7 +1080,7 @@ msgstr ""
 "uzstādījumus LDAP\n"
 "meklējumiem, un konaktu izveidošanai un rediģēšanai."
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
@@ -1038,31 +1088,31 @@ msgstr ""
 "Parādāmā nosaukuma norādīšana ir pēdējais pieprasītais solis LDAP servera "
 "konfigurēšanā."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 1: Server Information"
 msgstr "Solis 1: Servera informācija"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Step 2: Connecting to Server"
 msgstr "Solis 2: Savienojamies ar serveri"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr "Solis 3: Meklēšana direktorijā"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr "Solis 4: Parādīt vārdu"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr "Apakš"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Supported Search Bases"
 msgstr "Atbalstītās meklēšanas bāzes"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: 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"
@@ -1074,7 +1124,7 @@ msgstr ""
 "informāciju. Lūdzu vaicājiet jūsu sistēmu administrātoram ja jūs nēsat "
 "pārliecināti par jūsu informāciju."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1087,7 +1137,7 @@ msgstr ""
 "sistēmu\n"
 "administrātoram, vai jums ir vajadzība mainīt šīs opcijas."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: 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"
@@ -1098,7 +1148,7 @@ msgstr ""
 "tiks uzsākti. \n"
 "Ja jūs atstāsiet šo tukšu, meklējumi sāksies no direktorijas koka saknes."
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: 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"
@@ -1113,7 +1163,7 @@ msgstr ""
 "Meklēšanas mērogs \"one\" iekļaus ierakstus tikai vienu līmeni zemāk par "
 "jūsu bāzi.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: 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"
@@ -1129,14 +1179,14 @@ msgstr ""
 "par serveri. Lūdzu sazinieties ar jūsu sistēmu administrātoru ja jums \n"
 "ir nepieciešama palīdzība, meklējot šo informāciju."
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Šis ir pilnais LDAP servera nosaukums. Piemēram, \"ldap.manakompanija.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -1146,7 +1196,7 @@ msgstr ""
 "pārlieku \n"
 "lielu, tiks bremzēta jūsu adrešu grāmatas darbība."
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: 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 "
@@ -1156,7 +1206,7 @@ msgstr ""
 "ka uzstādot to uz \"Epasta adrese\", tai ir nepieciešama anonīma pieeja jūsu "
 "LDAP serverī."
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: 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"
@@ -1165,7 +1215,7 @@ msgstr ""
 "Šis ir servera nosaukums, kas parādīsies jūsu Evolution mapju sarakstā.\n"
 "Tas ir tikai attēlošanas pēc."
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: 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"
@@ -1176,251 +1226,155 @@ msgstr ""
 "piedāvāts standarta portu saraksts. Prasiet jūsu sistēmu administrātoram,\n"
 "kādu portu jums vajadzētu norādīt."
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "This option controls how long a search will be run."
 msgstr "Šī opcija kontrolē, cik ilgi notiks meklēšana."
 
-#: addressbook/gui/component/ldap-config.glade.h:100
-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 ""
-"Lai pievienotu atribūtu DN, izvēlieties to no saraksta un klikšķiniet "
-"\"Pievienot atribūtu\" pogu.\n"
-"Jebkuras vērtības, kuras jūs pievienosiet DN kļūs par pieprasītām vērŧībām "
-"priekš jebkuriem jauniem\n"
-"kontaktiem kurus jūs pievienosiet LDAP serverim."
-
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr "Izman_tot SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr "Izmantoju atšķirīgo vārdu (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using email address"
 msgstr "Izmantoju epasta adresi"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Kad iespējams"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
-#: 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
-#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
+#: 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 "_Pievienot"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
-msgid "_Add ->"
-msgstr "_Pievienot ->"
-
-#: addressbook/gui/component/ldap-config.glade.h:109
-msgid "_Add Mapping"
-msgstr "_Pievienot atbilstību"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-msgid "_Add to DN"
-msgstr "_Pievienot DN"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-msgid "_Always"
-msgstr "_Vienmēr"
-
-#: addressbook/gui/component/ldap-config.glade.h:112
-msgid "_Delete Mapping"
-msgstr "_Dzēst atbilstību"
-
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Display name:"
 msgstr "_Attēlošanas nosaukums:"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
-msgid "_Distinguished Name (DN):"
-msgstr "_Atšķiramais vārds (DN):"
-
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_Don't use SSL/TLS"
-msgstr "_Neizmantot SSL/TLS"
-
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr "_Lejupielādes limits:"
 
-#: addressbook/gui/component/ldap-config.glade.h:117 filter/filter.glade.h:16
-#: mail/mail-config.glade.h:152 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.h:40
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "R_ediģēt"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
-msgid "_Edit Mapping"
-msgstr "_Rediģēt atbilstību"
-
-#: addressbook/gui/component/ldap-config.glade.h:119
-msgid "_Evolution attribute:"
-msgstr "_Evolution atribūts:"
-
-#: addressbook/gui/component/ldap-config.glade.h:120
-msgid "_If necessary "
-msgstr "_Ja nepieciešams"
-
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_LDAP attribute:"
-msgstr "_LDAP atribūts:"
-
-#: addressbook/gui/component/ldap-config.glade.h:122
-msgid "_LDAP attributes:"
-msgstr "_LDAP atribūti:"
-
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr "_Pieteikšanās metode:"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
-msgid "_More Options >>"
-msgstr "_Vairāk opcijas >>"
-
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Port number:"
 msgstr "_Porta numurs:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
-msgid "_Restore Defaults"
-msgstr "_Atjaunot noklusējumus"
-
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Search base:"
 msgstr "_Meklēšanas bāze:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "_Servera nosaukums:"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Timeout (minutes):"
 msgstr "_Taimouts (minūtes):"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
-msgid "account-druid"
-msgstr "account-druid"
-
-#: addressbook/gui/component/ldap-config.glade.h:131
-msgid "account-editor"
-msgstr "account-editor"
-
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "cards"
 msgstr "kartes"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
-msgid "dn-customization-tab"
-msgstr "dn-customization-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:135
-msgid "edit_server_window_simple"
-msgstr "edit_server_window_simple"
-
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:137
-msgid "mappings-tab"
-msgstr "mappings-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:138
-msgid "objectclasses-tab"
-msgstr "objectclasses-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:139
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "searching-tab"
 msgstr "searching-tab"
 
-#: 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 adrešu grāmatas vārda izvēles saskarne."
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Ražotne Adrešu grāmatas vārda izvēles saskarnei"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Izņemt visu"
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:707
-#: 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 "Izņemt"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
-msgid "Remove All"
-msgstr "Izņemt visu"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+msgstr "Jauns kontaktu saraksts"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact Info"
+msgstr "Rediģēt kontakta informāciju"
 
-#: 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 "Sūtīt HTML pastu?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:405
-msgid "Edit Contact List"
-msgstr "Rediģēt kontaktu sarakstu"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:423
-msgid "Unnamed Contact List"
-msgstr "Nenosaukts kontaktu saraksts"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:440
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d nav parādīts)"
-
-#: 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 "Nenosaukts kontakts"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
+#: 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 "Avots"
+
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr "Izvēlieties kontaktus no adrešu grāmatas"
 
-#: addressbook/gui/component/select-names/e-select-names.c:572
+#: addressbook/gui/component/select-names/e-select-names.c:648
 msgid "Find contact in"
 msgstr "Meklēt kontaktus"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-#: ui/evolution-addressbook.h:16
+#: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Sameklēt"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "Izvēleties Vārdu"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "Selected Contacts:"
 msgstr "Izvēlētie kontakti:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:5
 msgid "Show Contacts"
 msgstr "Parādīt kontaktus"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: 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:"
@@ -1428,36 +1382,32 @@ msgstr ""
 "Ievadiet vārdu, vai arī izvēlieties\n"
 "vienu no saraksta zemāk:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Category:"
 msgstr "_Kategorija:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr "M_ape:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "A_ssistant's name:"
 msgstr "A_sistenta vārds:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Add_ress..."
 msgstr "Ad_rese..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr "Ikga_dējs:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Birthda_y:"
 msgstr "_Dzimšanas diena:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
-msgstr "K_ontakti..."
-
 #: 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_tegorijas..."
@@ -1468,7 +1418,7 @@ msgstr "Kolabrācija"
 
 #. 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 redaktors"
 
@@ -1477,7 +1427,7 @@ msgid "D_epartment:"
 msgstr "D_epartaments:"
 
 #: 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 "Detaļas"
 
@@ -1519,1139 +1469,1188 @@ msgstr "Orani_zācija:"
 msgid "P_rofession:"
 msgstr "P_rofesija:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr "Telefona tipi"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "S_pouse:"
 msgstr "_Dzīvesbiedrs:"
 
-#: 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 "Šī ir pas_ta adrese"
 
-#: 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 "Grib saņemt _HTML pastu"
 
-#: 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:150
-#: 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 "_Dzēst"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "_Darba nosaukums:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr "_Menedžera vārds:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "_Iesauka:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_Birojs:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Public Calendar URL:"
 msgstr "_Publiskā kalendāra 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 lapaspuses adrese:"
 
-#: 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 "Aktivizēt"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr "Amerikas Savienotās Valstis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Afghanistan"
 msgstr "Afganistāna"
 
-#: 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 "Albānija"
 
-#: 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 "Aldžīrija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "American Samoa"
 msgstr "Amerikāņu Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Andorra"
 msgstr "Andora"
 
-#: 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 "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 "Antikua un 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 "Argentīna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Armenia"
 msgstr "Armēnija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Aruba"
 msgstr "Aurba"
 
-#: 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 "Austrālija"
 
-#: 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 "Austrija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Azerbaijan"
 msgstr "Azerbaidžāna"
 
-#: 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 "Bahrēna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bangladesh"
 msgstr "Bangladeša"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Barbados"
 msgstr "Barbadosa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Belarus"
 msgstr "Baltkrievija"
 
-#: 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ģija"
 
-#: 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 "Benina"
 
-#: 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 "Butāna"
 
-#: 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 "Bolīvija"
 
-#: 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 "Bosnija-Hercogovina"
 
-#: 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 "Bouveta Sala"
 
-#: 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 "Brazīlija"
 
-#: 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 "Britu Indijas Okeāna Teritorija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brunei Darussalam"
 msgstr "Brunejas Karaliste"
 
-#: 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 "Būlgārija"
 
-#: 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 "Burundī"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cambodia"
 msgstr "Kambodžija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cameroon"
 msgstr "Kamerūna"
 
-#: 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 "Kanāda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cape Verde"
 msgstr "Kapoverde"
 
-#: 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 "Kaimanu Salas"
 
-#: 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 "Centrālāfrikas Republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Chad"
 msgstr "Čada"
 
-#: 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 "Čīle"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "China"
 msgstr "Ķīna"
 
-#: 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 "Ziemassvētku Sala"
 
-#: 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 "Kokosu (Kīlinga) Salas"
 
-#: 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 "Kolumbija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Comoros"
 msgstr "Komoros salas"
 
-#: 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 "Kuka Salas"
 
-#: 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 "Kostarika"
 
-#: 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 "Cote d'Ivoire"
 
-#: 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 "Horvātija"
 
-#: 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 "Kipra"
 
-#: 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 "Čehija"
 
-#: 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 "Dānija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Djibouti"
 msgstr "Džibutī"
 
-#: 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 "Dominikāņu Republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr "Austrumtimora"
 
-#: 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 "Ekvadora"
 
-#: 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 "Ēģipte"
 
-#: 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 "Elsalvadora"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "Ekvatoriālā Gvineja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Eriteja"
 
-#: 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 "Igaunija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Etiopija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "Faiklandes Salas"
 
-#: 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 Salas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "Fidžī"
 
-#: 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 "Somija"
 
-#: 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 "Francija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "Franču Gviāna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "Franču Polinēzija"
 
-#: 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 "Franču Dienvidu Teritorijas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "Gabona"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Gambija"
 
-#: 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 "Armēnija"
 
-#: 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 "Vācija"
 
-#: 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 "Gibraltārs"
 
-#: 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 "Grieķija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Grinlande"
 
-#: 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 "Gvadelupa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Guama"
 
-#: 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 "Gvineja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea-bissau"
 msgstr "Gvineja-bisau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guyana"
 msgstr "Gajāna"
 
-#: 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 "Hērdas un Makdonalda Salas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr "Vatikāns"
 
-#: 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 "Hondura"
 
-#: 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 "Honkonga"
 
-#: 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 "Ungārija"
 
-#: 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 "Islande"
 
-#: 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 "Indija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Indonesia"
 msgstr "Indonēzija"
 
-#: 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 "Īrija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Izarēla"
 
-#: 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 "Itālija"
 
-#: 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 "Japāna"
 
-#: 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 "Jordāna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kazahstāna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Keinja"
 
-#: 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 "Korejas Republika"
 
-#: 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 "Kuvēta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kyrgyzstan"
 msgstr "Kirgiztāna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Laos"
 msgstr "Laosa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Latvia"
 msgstr "Latvija"
 
-#: 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 "Lebanona"
 
-#: 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 "Libērija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liechtenstein"
 msgstr "Lihenšteina"
 
-#: 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 "Lietuva"
 
-#: 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 "Luksemburga"
 
-#: 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 "Maķedonija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Madagascar"
 msgstr "Madagaskāra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Malawi"
 msgstr "Malavī"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Malaysia"
 msgstr "Malaizija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Maldives"
 msgstr "Maldivu salas"
 
-#: 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šala Salas"
 
-#: 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 "Mauritānija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Mauritius"
 msgstr "Mauritānija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mayotte"
 msgstr "Majota"
 
-#: 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 "Mikronēzija"
 
-#: 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 "Moldovas Republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Monaco"
 msgstr "Monāko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mongolia"
 msgstr "Mongolija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Montserrat"
 msgstr "Montserata"
 
-#: 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 "Moroko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mozambique"
 msgstr "Mozambika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Myanmar"
 msgstr "Mjanma"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Namibia"
 msgstr "Namībija"
 
-#: 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 "Nepāla"
 
-#: 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 "Nīderlande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Netherlands Antilles"
 msgstr "Nīderlandes Antilas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "New Caledonia"
 msgstr "Jaunkaledonija"
 
-#: 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 "Jaunzēlande"
 
-#: 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 "Nikaragva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Niger"
 msgstr "Nigērija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nigeria"
 msgstr "Nigērija"
 
-#: 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 "Norfolkas salas"
 
-#: 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 "Ziemeļmarina"
 
-#: 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 "Norvēģija"
 
-#: 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āna"
 
-#: 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 "Pakistāna"
 
-#: 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 "Palestīniešu Teritorija"
 
-#: 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-Jaungvineja"
 
-#: 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 "Paragvaja"
 
-#: 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 "Filipīnas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pitcairn"
 msgstr "Pitkērna"
 
-#: 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 "Polija"
 
-#: 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 "Portugāle"
 
-#: 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 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 "Katara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Reunion"
 msgstr "Reinjona"
 
-#: 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 "Rumānija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Russian Federation"
 msgstr "Krievijas Federācija"
 
-#: 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 "Santkikta un Nevisa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Saint Lucia"
 msgstr "Sentlūsija"
 
-#: 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 "Sanvincenta Un Grenadaina"
 
-#: 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 Marīno"
 
-#: 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 Un Principa"
 
-#: 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 Arābija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Senegal"
 msgstr "Senegāla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Seychelles"
 msgstr "Seišelas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Sierra Leone"
 msgstr "Sjerra 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 "Singapūra"
 
-#: 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 "Slovākija"
 
-#: 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 "Slovēnija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Solomon Islands"
 msgstr "Slomona Salas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Somalia"
 msgstr "Somālija"
 
-#: 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 "Dienvidāfrika"
 
-#: 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 "Armēnija"
 
-#: 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 "Spānija"
 
-#: 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 "St. 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 "Santpijerra Un Mikuelona"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sudan"
 msgstr "Sudāna"
 
-#: 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 "Surinama"
 
-#: 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 "Svalbarda Un Jana Majena Salas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Swaziland"
 msgstr "Šveice"
 
-#: 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 "Zviedrija"
 
-#: 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 "Šveice"
 
-#: 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 "Taivāna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tajikistan"
 msgstr "Tadžikistāna"
 
-#: 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 "Tanzānijas Apvienotā Republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Thailand"
 msgstr "Taizeme"
 
-#: 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 "Trinidada Un Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tunisia"
 msgstr "Tunisija"
 
-#: 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 "Turcija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Turkmenistan"
 msgstr "Turkmenistāna"
 
-#: 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ērksas un Kaikosas salas"
 
-#: 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 "Apvienotie Arābu Erimāti"
 
-#: 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 "Apvienotā Karaliste"
 
-#: 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 "Amerikas Savienoto Valstu mazās pieguļošās salas"
 
-#: 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 "Urugvaja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uzbekistan"
 msgstr "Uzbekistāna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Vanuatu"
 msgstr "Vanatu"
 
-#: 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 "Venēcija"
 
-#: 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 "Vjetnama"
 
-#: 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 "Britu Virdžinu Salas"
 
-#: 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 "ASV Virdžinu Salas"
 
-#: 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 "Volisa un Futuna salas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Western Sahara"
 msgstr "Rietumu Sahāra"
 
-#: 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 "Jemena"
 
-#: 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 "Dienvidslāvija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Zambia"
 msgstr "Zambija"
 
-#: 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
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Vai jūs tiešām vēlaties\n"
-"dzēst šo kontaktu?"
+#: 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 "Dzēst Kontaktu?"
+#: 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 " Jauns "
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:826
+#: 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 "Čada"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr "Kategoriju redaktors nav pieejams."
 
-#: 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 "Šis kontakts pieder šādām kategorijām:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1047
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr "Saglabāt konaktu kā VKarti"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1762
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Vai jūs tiešām vēlaties\n"
+"dzēst šo kontaktu?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Vai jūs tiešām vēlaties\n"
+"dzēst šo kontaktu?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2455
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nevar atrast logdaļu laukam: `%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 "Kontakta ātrā pievienošana"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr "Rediģēt pilnīgi"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Pilns vārds"
-
-#: 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-pasts"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, fuzzy, c-format
+msgid "Error saving %s: %s"
+msgstr "Kļūda saglabājot failu: %s"
+
 #. This is a filename. Translators take note.
 #: 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:179
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 msgid "list"
 msgstr "saraksts"
 
-#: 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"
@@ -2660,149 +2659,146 @@ msgstr ""
 "%s jau eksistē\n"
 "Vai tu vēlies to pārrakstīt?"
 
-#: addressbook/gui/contact-editor/file-exists.glade.h:1
-msgid "Confirm Overwrite"
-msgstr "Apstiprināt pārrakstīšanu"
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:2
-msgid "Don't bother translating this string.  It's not used."
-msgstr "Don't bother translating this string.  It's not used."
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:3
+#: addressbook/gui/contact-editor/e-contact-save-as.c:210
 msgid "Overwrite"
 msgstr "Pārrakstīt"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adrese _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Pārbaudīt adresi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Va_lsts:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Adrese:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr "_Pilsēta:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Pasta Kastīte:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Rajons/štats/province:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_Pasta kods:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Check Full Name"
 msgstr "Pārbaudīt pilnu vārdu"
 
-#: 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 "Esk."
 
-#: 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 "_Vārds:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Uzvārds:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Vidusvārds:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Prievārds:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Amats/tituls:"
 
-#: 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 "Saraksta vā_rds:"
 
-#: 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 "Locekļi"
 
-#: 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 "Ievadiet epasta adresi vai arī iemetiet kontaktu apakšējajā sarakstā:"
 
-#: 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 "_Slēpt adreses, kad sūtam šo uz sarakstu"
 
-#: 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 "_Izņemt"
 
-#: 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 "contact-list-editor"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+#, fuzzy
+msgid "Is New List"
+msgstr "Jauns saraksts"
+
 #. 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 saraksta redaktors"
 
-#: 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 "Saglabāt Sarakstu kā VKarti"
 
@@ -2855,141 +2851,148 @@ msgstr ""
 "Izmainītā epasta adrese vai vārds šim kontaktam jau\n"
 "eksistē šajā mapē. Vai jūs to vēlaties pievienot jebkurā gadījumā?"
 
-#: 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 "Paplašinātā meklēšana"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr "Meklēšana"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr "Nav karšu"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr "1 karte"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:152
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr "%d kartes"
 
-#: 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
 msgid "Error getting book view"
 msgstr "Kļūda izmantojot grāmatas skatu"
 
+#: 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 "Kļūda mainot karti"
 
-#: 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 "Veiksmīgi"
 
-#: 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 "Nezināma kļūda"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Repozitorijs nesaistes režīmā"
 
-#: 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 "Atļauja liegta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Karte nav atrasta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Kartes ID jau eksistē"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protokols nav atbalstīts"
 
-#: 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 "Atsaukts"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr "Autentifikācija neizdevusies"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr "Pieprasīta autentifikācija"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr "TLS nav pieejams"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr "Adrešu grāmata neeksistē"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Cita kļūda"
 
-#: 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 "Vai jūs vēlaties saglabāt izmaiņas?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:77
+#, fuzzy
+msgid "_Discard"
+msgstr "Dinarda"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Kļūda pievienojot sarakstu"
 
-#: 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 "Kļūda pievienojot karti"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:91
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Kļūda mainot sarakstu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Kļūda izņemot sarakstu"
 
-#: 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 "Kļūda izņemot karti"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
-msgid "Display Cards?"
-msgstr "Attēlot kartes?"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-msgid "Display Cards"
-msgstr "Attēlot kartes"
-
-#: 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"
@@ -2998,116 +3001,132 @@ msgstr ""
 "%d karšu atvēršana atvērs %d jaunus logus.\n"
 "Vai jūs tiešām vēlaties attēlot visas no šim kartēm?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:348
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr "Pārvietot karti uz"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Kopēt karti uz"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:353
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Pārvietot kartes uz"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:355
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Kopēt kartes uz"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "Vairākas VKartes"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "%s VKarte"
+
+#: 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 "Tips"
+
+#: 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 "Adrešu grāmata"
 
-#: 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 "Saglabāt kā VKarti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "New Contact..."
 msgstr "Jauns kontakts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "New Contact List..."
 msgstr "Jauns kontaktu saraksts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Go to Folder..."
 msgstr "Iet uz mapi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Import..."
 msgstr "Importēt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Search for Contacts..."
 msgstr "Meklēt kontaktus..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Addressbook Sources..."
 msgstr "Adrešu grāmatas avoti..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Pilot Settings..."
 msgstr "Pilot uzstādījumi..."
 
-#: 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 "Pārsūtīt kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:815
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr "Sūtīt vēstuli kontaktam"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:816
-#: ui/evolution-addressbook.h:18 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
+#: 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 "Drukāt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr "Drukāt aploksni"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Copy to folder..."
 msgstr "Kopēt uz mapi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Move to folder..."
 msgstr "Pārvietot uz mapi..."
 
-#: 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 "Izgriezt"
 
-#: 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 "Kopēt"
 
-#: 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 "Ievietot"
 
-#: 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.h:20 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 "Dzēst"
 
-#: 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 "Pašreizējais skats"
 
@@ -3115,7 +3134,7 @@ msgstr "Pašreizējais skats"
 #. 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"
 
@@ -3123,11 +3142,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"
@@ -3199,20 +3218,61 @@ msgstr "Cits telefons"
 msgid "Primary Phone"
 msgstr "Primārais telefons"
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
 msgstr "un %d citas kartes."
 
-#: addressbook/gui/widgets/e-minicard-control.c:187
+#: addressbook/gui/widgets/e-minicard-control.c:206
 msgid "and one other card."
 msgstr "un vēl viena karte."
 
-#: addressbook/gui/widgets/e-minicard-control.c:316
+#: addressbook/gui/widgets/e-minicard-control.c:318
 msgid "Save in addressbook"
 msgstr "Saglabāt adrešu grāmatā"
 
-#: 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 "Platums:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+#, fuzzy
+msgid "Height"
+msgstr "Augstums:"
+
+#: 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 "Fairfielda"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+#, fuzzy
+msgid "Field Name"
+msgstr "Uzvārds"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+#, fuzzy
+msgid "Text Model"
+msgstr "Teksta _izmērs"
+
+#: 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 "Kolumbija"
+
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -3226,7 +3286,7 @@ msgstr ""
 "\n"
 "Dubultklikšķiniet šeit, lai izveidotu jaunu kontaktu."
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 msgid ""
 "\n"
 "\n"
@@ -3236,21 +3296,41 @@ msgstr ""
 "\n"
 "Šeit nav priekšmetu, ko rādīt šajā skatā."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#: addressbook/gui/widgets/e-minicard-view.c:452
+#, fuzzy
+msgid "Adapter"
+msgstr "Adrara"
+
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "Izvēlētais:"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Uzdevumu kārtošana"
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Karšu skats"
 
-#: 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 "Nedēļas skats"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr "Drukāt aploksni"
 
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1130
 msgid "Print cards"
 msgstr "Drukāt kartes"
 
-#: 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 "Drukāt karti"
 
@@ -3323,7 +3403,6 @@ msgid "Include:"
 msgstr "Iekļaut:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Ainavveida"
 
@@ -3343,17 +3422,16 @@ msgstr "Robežas"
 msgid "Number of columns:"
 msgstr "Kolonu skaits:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr "Opcijas"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Orientācija"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "Lapa"
 
@@ -3369,9 +3447,7 @@ msgstr "Papīrs"
 msgid "Paper source:"
 msgstr "Papīra avots:"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Vertikāli"
 
@@ -3431,43 +3507,167 @@ msgstr "_Fonts..."
 msgid "Untitled appointment"
 msgstr "Nenosaukta tikšanās"
 
-#: 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 "Augsts"
 
-#: 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 "Normāls"
 
-#: 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 "Zems"
 
 #. 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 "Nedefinēts"
 
-#: calendar/conduits/calendar/calendar-conduit.c:205
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr "Sadalīt vairāku dienu notikumus:"
 
-#: 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 "Kļūda savienojoties ar kalendāra serveri"
 
-#: 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 "Nevarēju nolasīt Pilot kalendāra aplikācijas bloku"
 
@@ -3475,84 +3675,76 @@ msgstr "Nevarēju nolasīt Pilot kalendāra aplikācijas bloku"
 msgid "Default Priority:"
 msgstr "Noklusētā prioritāte:"
 
-#: 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 "Nevar nolasīt Pilota ToDo aplikācijas bloku"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "Bonobo kontrole, kas parāda uzdevumu sarakstu."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Vienkārša Bonobo kontrole, kura attēlo kalendāru."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 msgid "Calendar and Tasks"
 msgstr "Kalendārs un uzdevumi"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Evolution kalendāra konfigurācijas kontrole."
-
-#: 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 "Šeit konfigurējiet jūsu laika zonu, kalendāru un uzdevumu sarakstu"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution kalendāra iTip/iMip skatītājs"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution komponente kalendāra vadīšanai."
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalendārs un uzdevumi"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Evolution Tasks control"
-msgstr "Ražotne Evolution Uzdevumu kontrolei"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution kalendāra kopsavilkuma komponente."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the calendar iTip view control"
-msgstr "Ražotne kalendāra iTip skata kontrolei"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-msgid "Factory for the sample Calendar control"
-msgstr "Ražotne vienkāršai kalendāra kontrolei."
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution kalendāra iTip/iMip skatītājs"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Ražotne kalendāra komponentes redaktora dialogu centralizēšanai"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution kalendāra iTip/iMip skatītājs"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
-msgid "Factory to create a component editor factory"
-msgstr "Ražotne komponenšu redaktora ražotnes radīšanai"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution ziņu redaktors"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "Trauksmes notifikācijas serviss"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution ziņu redaktors"
 
-#: 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 "Ražotne trauksmes notifikācijas servisam"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Starting:"
 msgstr "Sākums:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Ending:"
 msgstr "Beigas:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
 msgid "invalid time"
 msgstr "nepareizs laiks"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:274
 msgid "Evolution Alarm"
 msgstr "Evolution trauksme"
 
-#: 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 "Trauksme %s"
@@ -3574,11 +3766,17 @@ msgstr "Snaust kādu laiku (minūtes)"
 msgid "_Edit appointment"
 msgstr "R_ediģēt tikšanos"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:681
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "Apraksts nav pieejams."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:742
+#: 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 "Brīdinājums"
+
+#: 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"
@@ -3590,13 +3788,7 @@ msgstr ""
 "nokonfigurēta nosūtīt epastu. Evolution tā vietā attēlos\n"
 "normālu atgādinātāja dialoga logu."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:760
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2924
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Brīdinājums"
-
-#: calendar/gui/alarm-notify/alarm-queue.c:765
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3613,15 +3805,15 @@ msgstr ""
 "\n"
 "Vai jūs patiešām vēlaties laist šo programmu?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:779
+#: calendar/gui/alarm-notify/alarm-queue.c:889
 msgid "Do not ask me about this program again."
 msgstr "Neprasīt vairāk man par šo programmu."
 
-#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
-msgid "Could not initialize GNOME"
-msgstr "Nevarēju inicializēt GNOME"
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize gnome-vfs"
+msgstr "Nespēju inicializēt 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 "Nevarēju izveidot trauksmes notifikācijas servisa ražotni"
 
@@ -3637,36 +3829,36 @@ msgstr "Apraksts satur"
 msgid "Comment contains"
 msgstr "Komentāri satur"
 
-#: 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 "Neatbilstoši"
 
-#: 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"
 
@@ -3677,67 +3869,155 @@ msgstr ""
 "Nevarēju izveidot kalendāra skatu. Lūdzu pārbaudiet jūsu ORBit un OAF "
 "uzstādījumus."
 
-#: 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 "Kalendārs"
+
+#: calendar/gui/calendar-component.c:71
+msgid "Folder containing appointments and events"
+msgstr "Mape, kas satur tikšanos un notikumu ierakstus"
+
+#: calendar/gui/calendar-component.c:75
+msgid "Public Calendar"
+msgstr "Publiskais kalendārs"
+
+#: calendar/gui/calendar-component.c:76
+msgid "Public folder containing appointments and events"
+msgstr "Publiska mape, kas satur tikšanos un notikumu ierakstus"
+
+#: 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 "Uzdevumi"
+
+#: calendar/gui/calendar-component.c:81
+msgid "Folder containing to-do items"
+msgstr "Uzdevumu mape"
+
+#: calendar/gui/calendar-component.c:85
+msgid "Public Tasks"
+msgstr "Publiskie uzdevumi"
+
+#: calendar/gui/calendar-component.c:86
+msgid "Public folder containing to-do items"
+msgstr "Publiskā mape, kas satur uzdevumu priekšmetus"
+
+#: calendar/gui/calendar-component.c:730
+msgid "New appointment"
+msgstr "Jauna tikšanās"
+
+#: calendar/gui/calendar-component.c:730
+msgid "_Appointment"
+msgstr "_Tikšanās"
+
+#: calendar/gui/calendar-component.c:731
+msgid "Create a new appointment"
+msgstr "Ievietot jaunu ierakstu par tikšanos"
+
+#: calendar/gui/calendar-component.c:735
+msgid "New meeting"
+msgstr "Jauna sanāksme"
+
+#: calendar/gui/calendar-component.c:735
+msgid "_Meeting"
+msgstr "_Sanāksme"
+
+#: calendar/gui/calendar-component.c:736
+msgid "Create a new meeting request"
+msgstr "Izveidot jaunu sanāksmes pieprasījumu"
+
+#: calendar/gui/calendar-component.c:740
+msgid "New task"
+msgstr "Jauns uzdevums"
+
+#: calendar/gui/calendar-component.c:740
+msgid "_Task"
+msgstr "_Uzdevums"
+
+#: calendar/gui/calendar-component.c:741
+msgid "Create a new task"
+msgstr "Ievietot jaunu uzdevumu"
+
+#: calendar/gui/calendar-component.c:745
+msgid "New All Day Appointment"
+msgstr "Jauna tikšanās visu dienu"
+
+#: calendar/gui/calendar-component.c:745
+msgid "All _Day Appointment"
+msgstr "Visas _dienas tikšanās"
+
+#: calendar/gui/calendar-component.c:746
+msgid "Create a new all-day appointment"
+msgstr "Izveidot ierakstu par jaunu visas dienas tikšanos"
+
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
+#: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "Privāts"
 
-#: 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 "Konfidenciāls"
 
-#: 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 "Publisks"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "N"
 msgstr "Z"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "S"
 msgstr "D"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "E"
 msgstr "A"
 
-#: 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 "Brīvs"
 
-#: 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 "Aizņemts"
 
-#: 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 "Nav iesākts"
 
-#: 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 "Progresā"
 
-#: 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 "Pabeigts"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3748,331 +4028,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:468 mail/mail-config.glade.h:79
-#: 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 "Nekas"
 
-#: calendar/gui/calendar-model.c:1723
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Periodisks"
 
-#: calendar/gui/calendar-model.c:1725
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Asignēts"
 
-#: 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:569
-#: calendar/gui/e-meeting-model.c:863
+#: 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 "Jā"
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:864
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "Nē"
 
-#: calendar/gui/calendar-view-factory.c:148
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Dienas skats"
 
-#: calendar/gui/calendar-view-factory.c:151
+#: calendar/gui/calendar-view-factory.c:121
 msgid "Work Week View"
 msgstr "Darba nedēļas skats"
 
-#: calendar/gui/calendar-view-factory.c:154
+#: calendar/gui/calendar-view-factory.c:124
 msgid "Week View"
 msgstr "Nedēļas skats"
 
-#: calendar/gui/calendar-view-factory.c:157
+#: calendar/gui/calendar-view-factory.c:127
 msgid "Month View"
 msgstr "Mēneša skats"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1372
-#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1055
-msgid "Calendar"
-msgstr "Kalendārs"
-
-#: calendar/gui/component-factory.c:72
-msgid "Folder containing appointments and events"
-msgstr "Mape, kas satur tikšanos un notikumu ierakstus"
-
-#: calendar/gui/component-factory.c:76
-msgid "Public Calendar"
-msgstr "Publiskais kalendārs"
-
-#: calendar/gui/component-factory.c:77
-msgid "Public folder containing appointments and events"
-msgstr "Publiska mape, kas satur tikšanos un notikumu ierakstus"
-
-#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:738
-#: 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:1059
-msgid "Tasks"
-msgstr "Uzdevumi"
-
-#: calendar/gui/component-factory.c:82
-msgid "Folder containing to-do items"
-msgstr "Uzdevumu mape"
-
-#: calendar/gui/component-factory.c:86
-msgid "Public Tasks"
-msgstr "Publiskie uzdevumi"
-
-#: calendar/gui/component-factory.c:87
-msgid "Public folder containing to-do items"
-msgstr "Publiskā mape, kas satur uzdevumu priekšmetus"
-
-#: calendar/gui/component-factory.c:750
-msgid "New appointment"
-msgstr "Jauna tikšanās"
-
-#: calendar/gui/component-factory.c:750
-msgid "_Appointment"
-msgstr "_Tikšanās"
-
-#: calendar/gui/component-factory.c:751
-msgid "Create a new appointment"
-msgstr "Ievietot jaunu ierakstu par tikšanos"
-
-#: calendar/gui/component-factory.c:755
-msgid "New meeting"
-msgstr "Jauna sanāksme"
-
-#: calendar/gui/component-factory.c:755
-msgid "_Meeting"
-msgstr "_Sanāksme"
-
-#: calendar/gui/component-factory.c:756
-msgid "Create a new meeting request"
-msgstr "Izveidot jaunu sanāksmes pieprasījumu"
-
-#: calendar/gui/component-factory.c:760
-msgid "New task"
-msgstr "Jauns uzdevums"
-
-#: calendar/gui/component-factory.c:760
-msgid "_Task"
-msgstr "_Uzdevums"
-
-#: calendar/gui/component-factory.c:761
-msgid "Create a new task"
-msgstr "Ievietot jaunu uzdevumu"
-
-#: calendar/gui/component-factory.c:765
-msgid "New All Day Appointment"
-msgstr "Jauna tikšanās visu dienu"
+#: calendar/gui/comp-editor-factory.c:456
+#, fuzzy
+msgid "Error while opening the calendar"
+msgstr "Kļūda savienojoties ar kalendāra serveri"
 
-#: calendar/gui/component-factory.c:765
-msgid "All _Day Appointment"
-msgstr "Visas _dienas tikšanās"
+#: calendar/gui/comp-editor-factory.c:467
+msgid "Method not supported when opening the calendar"
+msgstr ""
 
-#: calendar/gui/component-factory.c:766
-msgid "Create a new all-day appointment"
-msgstr "Izveidot ierakstu par jaunu visas dienas tikšanos"
+#: calendar/gui/comp-editor-factory.c:473
+#, fuzzy
+msgid "Permission denied to open the calendar"
+msgstr "Atļauja liegta"
 
-#: calendar/gui/control-factory.c:123
+#: calendar/gui/control-factory.c:119
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Nevarēju atvērt mapi %s"
 
-#: calendar/gui/control-factory.c:167
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "URI, ko kalendārs parādīs"
 
-#: calendar/gui/control-factory.c:174
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr "Rādāmais skata tips"
 
-#: calendar/gui/dialogs/alarm-options.c:359
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Skaņas trauksmes opcijas"
 
-#: calendar/gui/dialogs/alarm-options.c:368
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Ziņas trauksmes opcijas"
 
-#: calendar/gui/dialogs/alarm-options.c:377
-msgid "Mail Alarm Options"
+#: calendar/gui/dialogs/alarm-options.c:438
+#, fuzzy
+msgid "Email Alarm Options"
 msgstr "Pasta trauksmes opcijas"
 
-#: calendar/gui/dialogs/alarm-options.c:386
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Programmas Trauksmes opcijas"
 
-#: calendar/gui/dialogs/alarm-options.c:395
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Nezināmas trauksmes opcijas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Alarm Repeat"
 msgstr "Atkārtot trauksmi"
 
-#: 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 vēl neatbalsta šāda veida atgādinājumus. Jums nebūs iespējams "
-"rediģēt opcijas šim atgādinājumam."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Ziņa, ko attēlot"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "Vēstules ķermenis"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "Spēlēt skaņu:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "Atkārtot trauksmi"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "Palaist programmu:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "Sūtīt"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr "Ar šiem argumentiem:"
 
-#: 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 "dienas"
 
-#: 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 "papildus laiks katras"
 
-#: 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 "stundas"
 
-#: 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 "minūtes"
 
-#: calendar/gui/dialogs/alarm-page.c:319
-#, c-format
-msgid "%d days"
-msgstr "%d dienas"
-
-#: calendar/gui/dialogs/alarm-page.c:322
-msgid "1 day"
-msgstr "1 diena"
-
-#: calendar/gui/dialogs/alarm-page.c:327
-#, c-format
-msgid "%d weeks"
-msgstr "%d nedēļas"
-
-#: calendar/gui/dialogs/alarm-page.c:330
-msgid "1 week"
-msgstr "1 nedēļa"
-
-#: calendar/gui/dialogs/alarm-page.c:335
-#, c-format
-msgid "%d hours"
-msgstr "%d stundas"
-
-#: calendar/gui/dialogs/alarm-page.c:338
-msgid "1 hour"
-msgstr "1 stunda"
-
-#: calendar/gui/dialogs/alarm-page.c:343
-#, c-format
-msgid "%d minutes"
-msgstr "%d minūtes"
-
-#: calendar/gui/dialogs/alarm-page.c:346
-msgid "1 minute"
-msgstr "1 minūte"
-
-#: calendar/gui/dialogs/alarm-page.c:351
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekundes"
-
-#: calendar/gui/dialogs/alarm-page.c:354
-msgid "1 second"
-msgstr "1 sekunde"
-
-#: calendar/gui/dialogs/alarm-page.c:383
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
-msgstr "Spēlēt skaņu"
-
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
-msgstr "Parādīt paziņojumu"
-
-#: calendar/gui/dialogs/alarm-page.c:391
-msgid "Send an email"
-msgstr "Sūtīt epastu"
-
-#: calendar/gui/dialogs/alarm-page.c:395
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
-msgstr "Sāknēt programmu"
-
-#: calendar/gui/dialogs/alarm-page.c:401
-msgid "Unknown action to be performed"
-msgstr "Nezināma darbība, kas tiks izpildīta"
-
-#: calendar/gui/dialogs/alarm-page.c:413
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "%s %s pirms tikšanās sākuma"
-
-#: calendar/gui/dialogs/alarm-page.c:416
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "%s %s pēc tikšanās sākuma"
-
-#: calendar/gui/dialogs/alarm-page.c:421
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr "%s tikšanās sākumā"
-
-#: calendar/gui/dialogs/alarm-page.c:430
-#, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "%s %s pirms tikšanās beigām"
-
-#: calendar/gui/dialogs/alarm-page.c:433
-#, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "%s %s pēc tikšanās beigām"
-
-#: calendar/gui/dialogs/alarm-page.c:438
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr "%s tikšanās beigās"
-
-#: calendar/gui/dialogs/alarm-page.c:462
-#, c-format
-msgid "%s at %s"
-msgstr "%s iekš %s"
-
-#: calendar/gui/dialogs/alarm-page.c:468
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr "%s nezināma palaidēja tipam"
-
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -4083,46 +4187,63 @@ msgstr "Pamati"
 msgid "Date/Time:"
 msgstr "Datums/laiks:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "Parādīt paziņojumu"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "Spēlēt skaņu"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Atgādinājumi"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "Sāknēt programmu"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "Sūtīt epastu"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1027 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 "Kopsavilkums:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_Opcijas:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "pēc"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "pirms"
 
-#: 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 "diena(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "tikšanās beigas"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "stunda(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
 msgid "minute(s)"
 msgstr "minūte(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "tikšanās sākums"
 
@@ -4171,8 +4292,8 @@ msgid "Days"
 msgstr "Dienas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1135
-#: calendar/gui/e-itip-control.c:655
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr "Piekdiena"
 
@@ -4185,8 +4306,8 @@ msgid "Minutes"
 msgstr "Minūtes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1131
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr "Pirmdiena"
 
@@ -4195,8 +4316,8 @@ msgid "S_un"
 msgstr "_Sv"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1136
-#: calendar/gui/e-itip-control.c:656
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr "Sesdiena"
 
@@ -4209,8 +4330,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Parādīt nedēļas _numurus datuma navigātorā"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1137
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
 msgid "Sunday"
 msgstr "Svēdiena"
 
@@ -4227,8 +4348,8 @@ msgid "Task List"
 msgstr "Uzdevumu saraksts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1134
-#: calendar/gui/e-itip-control.c:654
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr "Ceturdiena"
 
@@ -4245,8 +4366,8 @@ msgid "Time format:"
 msgstr "Laika formāts:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1132
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr "Otradiena"
 
@@ -4255,8 +4376,8 @@ msgid "W_eek starts:"
 msgstr "N_edēļa sākas:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1133
-#: calendar/gui/e-itip-control.c:653
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr "Trešdiena"
 
@@ -4298,7 +4419,7 @@ msgid "_Fri"
 msgstr "_Piek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "_Galvenais"
 
@@ -4338,7 +4459,7 @@ msgstr "_Tre"
 msgid "before every appointment"
 msgstr "pirms katras tikšanās"
 
-#: 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?"
@@ -4346,11 +4467,11 @@ msgstr ""
 "Notikums, kuru jūs vēlaties dzēst, ir sanāksme, vai jūs vēlaties izsūtīt "
 "atsaukumus?"
 
-#: 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 "Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo sanāksmi?"
 
-#: 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?"
@@ -4358,11 +4479,11 @@ msgstr ""
 "Uzdevums, ko jūs vēlaties dzēst, ir norīkots, vai jūs vēlaties izsūtīt "
 "atsaukumu?"
 
-#: 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 "Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo uzdevumu?"
 
-#: 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?"
@@ -4370,138 +4491,138 @@ msgstr ""
 "Žurnāla ieraksts, ko jūs vēlaties dzēst, ir publicēts, vai jūs vēlaties "
 "izsūtīt atsaukumu?"
 
-#: 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 ""
 "Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo žurnāla "
 "ierakstu?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Šis notikums ir izdzēsts."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Šis uzdevums ir izdzēsts."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Šis žurnāla ieraksts ir izdzēsts."
 
-#: 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  Jūs esat veicis izmaiņas. Aizmirst šīs izmaiņas un aizvērt redaktoru?"
 
-#: 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  Jūs neesat veicis nekādas izmaiņas, aizvērt redaktoru?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Notikums tika izmainīts."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Uzdevums tika izmainīts."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Žurnāla ieraksts tika izmainīts."
 
-#: 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  Jūs esat veicat izmaiņas. Aizmirst šīs izmaiņas un atjaunināt redaktoru?"
 
-#: 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  Jūs neesat veicis izmaiņas, atjaunināt redaktoru?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:414
+#: calendar/gui/dialogs/comp-editor-page.c:409
 #, c-format
 msgid "Validation error: %s"
 msgstr "Validācijas kļūda: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr " uz "
 
-#: 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 " (Izpildīts "
 
-#: 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 "Izpildīts"
 
-#: 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 " (Līdz "
 
-#: 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 "Līdz"
 
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:328
 msgid "Could not update invalid object"
 msgstr "Nevarēju atjaunināt nepareizu objektu"
 
-#: calendar/gui/dialogs/comp-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr "Objekts nav atrasts, nav atjaunināts"
 
-#: 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 "Jums nav atļauju, lai atjauninātu objektu"
 
-#: calendar/gui/dialogs/comp-editor.c:352
+#: calendar/gui/dialogs/comp-editor.c:337
 msgid "Could not update object"
 msgstr "Nevarēju atjaunināt objektu"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Rediģēt tikšanos"
 
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tikšanās - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "Uzdevums - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Žurnāla ieraksts - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "Nav kopsavilkuma"
 
-#: 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 "Saglabāt kā..."
 
-#: 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 ""
 "Izmaiņas, izdarītas šajā priekšmetā, varētu tikt atceltas, ja atjauninājums "
 "atnāk caur epastu"
 
-#: calendar/gui/dialogs/comp-editor.c:1397
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr "Nevar dabūt pašreizējo versiju!"
 
@@ -4563,103 +4684,98 @@ msgstr "Deleģēt Uz:"
 msgid "Enter Delegate"
 msgstr "Ievadīt delegātu"
 
-#: 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 "Tikšanās"
 
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Atgādinājums"
 
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Atkārtošanās"
 
-#: calendar/gui/dialogs/event-editor.c:232
-#: calendar/gui/dialogs/event-editor.c:299
-#: calendar/gui/dialogs/event-editor.c:435
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:434
 msgid "Scheduling"
 msgstr "Plānošana"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:302
-#: calendar/gui/dialogs/event-editor.c:438 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 "Sanāksme"
 
-#: calendar/gui/dialogs/event-page.c:662 calendar/gui/dialogs/task-page.c:567
+#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:554
 msgid "Start date is wrong"
 msgstr "Sākuma datums ir nepareizs"
 
-#: calendar/gui/dialogs/event-page.c:672
+#: calendar/gui/dialogs/event-page.c:610
 msgid "End date is wrong"
 msgstr "Beigu datums ir nepareizs"
 
-#: calendar/gui/dialogs/event-page.c:695
+#: calendar/gui/dialogs/event-page.c:633
 msgid "Start time is wrong"
 msgstr "Sākuma datums ir nepareizs"
 
-#: calendar/gui/dialogs/event-page.c:702
+#: calendar/gui/dialogs/event-page.c:640
 msgid "End time is wrong"
 msgstr "Beigu datums ir nepareizs"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
 msgstr "Visas _dienas notikums"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "Aizņe_mts"
 
-#: 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 "Klasifikācija"
 
-#: 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 "Konfidenciāli"
 
-#: 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 "Datums & laiks"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "Brīvs"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr "L_okācija: "
 
-#: 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āts"
 
-#: 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_blisks"
 
-#: 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 "Parādīt laiku kā"
 
-#: 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 "Kopsavilku_ms:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Kontakti..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "B_eigu laiks:"
@@ -4668,19 +4784,23 @@ msgstr "B_eigu laiks:"
 msgid "_Start time:"
 msgstr "_Sākuma laiks:"
 
-#: 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 "Nepieciešams organizētajs."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr "Tiek pieprasīts vismaz viens apmeklētājs."
 
-#: calendar/gui/dialogs/meeting-page.c:594
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr "Šī persona jau apmeklē sanāksmi!"
 
-#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr "_Deleģēt uz..."
 
@@ -4720,16 +4840,11 @@ msgid "Member"
 msgstr "Loceklis"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1151
+#: 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 "Loma"
-
 #: 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
@@ -4737,13 +4852,6 @@ msgstr "Loma"
 msgid "Status"
 msgstr "Status"
 
-#: 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 "Tips"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4754,114 +4862,83 @@ msgid "_Change Organizer"
 msgstr "_Mainīt organizētāju"
 
 #: 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 "_Ielūgt citus..."
 
-#: calendar/gui/dialogs/recurrence-page.c:126
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:156
-#: calendar/gui/e-itip-control.c:603 calendar/gui/e-itip-control.c:623
-#: calendar/gui/e-itip-control.c:633
-msgid "st"
-msgstr "."
-
-#: calendar/gui/dialogs/recurrence-page.c:127
-#: calendar/gui/dialogs/recurrence-page.c:147
-#: calendar/gui/e-itip-control.c:604 calendar/gui/e-itip-control.c:624
-msgid "nd"
-msgstr "."
-
-#: calendar/gui/dialogs/recurrence-page.c:128
-#: calendar/gui/dialogs/recurrence-page.c:148
-#: calendar/gui/e-itip-control.c:605 calendar/gui/e-itip-control.c:625
-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
-#: calendar/gui/e-itip-control.c:606 calendar/gui/e-itip-control.c:607
-#: calendar/gui/e-itip-control.c:608 calendar/gui/e-itip-control.c:609
-#: calendar/gui/e-itip-control.c:610 calendar/gui/e-itip-control.c:611
-#: calendar/gui/e-itip-control.c:612 calendar/gui/e-itip-control.c:613
-#: calendar/gui/e-itip-control.c:614 calendar/gui/e-itip-control.c:615
-#: calendar/gui/e-itip-control.c:616 calendar/gui/e-itip-control.c:617
-#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:619
-#: calendar/gui/e-itip-control.c:620 calendar/gui/e-itip-control.c:621
-#: calendar/gui/e-itip-control.c:622 calendar/gui/e-itip-control.c:626
-#: calendar/gui/e-itip-control.c:627 calendar/gui/e-itip-control.c:628
-#: calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:630
-#: calendar/gui/e-itip-control.c:631 calendar/gui/e-itip-control.c:632
-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
+#, fuzzy
+msgid "This and Future Instances"
+msgstr "Volisa un Futuna salas"
+
+#: calendar/gui/dialogs/recur-comp.c:77
+#, fuzzy
+msgid "All Instances"
+msgstr "Vi_sas stacijas:"
+
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Šī tikšanās satur atkārtošanās, ko Evolution nevar rediģēt."
 
-#: calendar/gui/dialogs/recurrence-page.c:898
-msgid "Recurrent date is wrong"
+#: calendar/gui/dialogs/recurrence-page.c:806
+#, fuzzy
+msgid "Recurrence date is invalid"
 msgstr "Atkārtošanas datums ir nepareizs."
 
-#: calendar/gui/dialogs/recurrence-page.c:1007
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr "uz"
 
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:977
 msgid "first"
 msgstr "pirmais"
 
-#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr "sekunde"
 
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "third"
 msgstr "trešais"
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "fourth"
 msgstr "ceturtais"
 
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "last"
 msgstr "pēdējais"
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1004
 msgid "Other Date"
 msgstr "Cits datums"
 
-#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "dienā"
 
-#: calendar/gui/dialogs/recurrence-page.c:1270
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr "uz"
 
-#: calendar/gui/dialogs/recurrence-page.c:1455
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr "reizes"
 
@@ -4925,23 +5002,23 @@ msgstr "nedēļa(s)"
 msgid "year(s)"
 msgstr "gads(i)"
 
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has been created. Send it?"
 msgstr "Informācija par sanāksmi ir izveidota. Nosūtīt to?"
 
-#: 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 "Informācija par sanāksmi ir izmainīta. Nosūtīt atjauninātu versiju?"
 
-#: 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 "Informācija par uzdevuma norīkojumu ir izveidota. Nosūtīt to?"
 
-#: 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 "Informācija par uzdevumu ir izmainīta. Nosūtīt atjauninātu versiju?"
 
-#: calendar/gui/dialogs/task-details-page.c:420
+#: calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr "Izpildīšanas datums ir nepareizs"
 
@@ -4955,44 +5032,38 @@ msgstr "% izpildīts"
 msgid "Date Completed:"
 msgstr "Izpildes datums:"
 
-#: 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:575 calendar/gui/e-meeting-model.c:876
-msgid "Needs Action"
-msgstr "Pieprasa darbību"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Progress"
 
-#: 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 "_Prioritāte:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Statuss:"
 
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "Pamata"
 
-#: 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 "Uzticējums"
 
-#: calendar/gui/dialogs/task-page.c:540
+#: calendar/gui/dialogs/task-page.c:527
 msgid "Due date is wrong"
 msgstr "Izpildes datums ir nepareizs"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1081
+#: 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:"
@@ -5002,135 +5073,232 @@ msgstr "Apraksts:"
 msgid "Sta_rt Date:"
 msgstr "Sākum_a datums:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Kontakti..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Datuma laikā:"
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d dienas"
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "1 diena"
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d nedēļas"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 nedēļa"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d stundas"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 stunda"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d minūtes"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 minūte"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekundes"
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "1 sekunde"
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "Sūtīt epastu"
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr "Nezināma darbība, kas tiks izpildīta"
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s pirms tikšanās sākuma"
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s pēc tikšanās sākuma"
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s tikšanās sākumā"
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s pirms tikšanās beigām"
+
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s pēc tikšanās beigām"
+
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s tikšanās beigās"
+
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr "%s iekš %s"
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s nezināma palaidēja tipam"
+
+#: 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 "80%"
 
-#: 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 "Dzēšu izvēlētos objektus"
 
-#: 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 "_Atvērt"
 
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:951
 msgid "_Save as..."
 msgstr "Saglabāt _kā..."
 
-#: 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 "_Drukāt..."
 
-#: 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 "_Izgriezt"
 
-#: 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 "_Kopēt"
 
-#: 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 "_Ievietot"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:962
 msgid "_Assign Task"
 msgstr "_Nozīmēt uzdevumu"
 
-#: calendar/gui/e-calendar-table.c:1000
+#: calendar/gui/e-calendar-table.c:963
 msgid "_Forward as iCalendar"
 msgstr "_Pārsūtīt kā iKalendāru"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "A_tzīmēt kā Izpildītus"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:965
 msgid "_Mark Selected Tasks as Complete"
 msgstr "A_tzīmēt izvēlētos uzdevumus kā izpildītus"
 
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "_Dzēst izvēlētos uzdevumus"
 
-#: calendar/gui/e-calendar-table.c:1278 calendar/gui/e-day-view.c:7586
-#: calendar/gui/e-week-view.c:4241
+#: 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 "Atjaunināt objektus"
 
-#: calendar/gui/e-calendar-table.c:1361
+#: calendar/gui/e-calendar-table.c:1327
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klikšķināt, lai pievienotu uzdevumu"
@@ -5139,8 +5307,8 @@ msgstr "Klikšķināt, lai pievienotu uzdevumu"
 msgid "Alarms"
 msgstr "Trauksmes"
 
-#: 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 "Izpildīts"
 
@@ -5169,8 +5337,8 @@ msgid "Start Date"
 msgstr "Sākuma datums"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:748
-#: shell/e-shortcuts.c:1047
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
+#: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Kopsavilkums"
 
@@ -5178,19 +5346,15 @@ msgstr "Kopsavilkums"
 msgid "Task sort"
 msgstr "Uzdevumu kārtošana"
 
-#: 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"
 
@@ -5205,205 +5369,205 @@ 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 minūšu sadaļas"
 
 #. 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 "Jauna _tikšanās"
 
-#: 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 "Jauns visas di_enas notikums"
 
-#: 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 "Jauna sanāksme"
 
-#: 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 "Jauns uzdevums"
 
-#: 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 "Drukāt..."
 
-#: 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 "Iet uz _dienu"
 
-#: 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 "_Iet uz datumu..."
 
-#: 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 "_Publicēt brīvs/aizņemts informāciju"
 
-#: 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 "_Uzstādījumi..."
 
-#: 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 "_Saglabāt kā..."
 
-#: 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 "Plānot _sanāksmi..."
 
-#: 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 "_Pārsūtīt kā iKalendāru..."
 
-#: 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:684
+#: calendar/gui/e-itip-control.c:704
 msgid "Yes. (Complex Recurrence)"
 msgstr "Jā. (Sarežģīta atkārtošanās)"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:716
 msgid "Every day"
 msgstr "Katru dienu"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:718
 #, c-format
 msgid "Every %d days"
 msgstr "Katras %d dienas"
 
-#: calendar/gui/e-itip-control.c:704
+#: calendar/gui/e-itip-control.c:724
 msgid "Every week"
 msgstr "Katru nedēļu"
 
-#: calendar/gui/e-itip-control.c:706
+#: calendar/gui/e-itip-control.c:726
 #, c-format
 msgid "Every %d weeks"
 msgstr "Katras %d nedēļas"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:729
 msgid "Every week on "
 msgstr "Katru nedēļu "
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:731
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Katras %d nedēļas "
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:739
 msgid " and "
 msgstr " un "
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:746
 #, c-format
 msgid "The %s day of "
 msgstr "%s. dienā, "
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:759
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s, "
 
-#: calendar/gui/e-itip-control.c:744
+#: calendar/gui/e-itip-control.c:764
 msgid "every month"
 msgstr "katru mēnesi"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:769
 #, c-format
 msgid "every %d months"
 msgstr "katrus %d mēnešus"
 
-#: calendar/gui/e-itip-control.c:755
+#: calendar/gui/e-itip-control.c:775
 msgid "Every year"
 msgstr "Katru gadu"
 
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every %d years"
 msgstr "Katrus %d gadus"
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:789
 #, c-format
 msgid " a total of %d times"
 msgstr " kopā %d reizes"
 
-#: calendar/gui/e-itip-control.c:777
+#: calendar/gui/e-itip-control.c:797
 msgid ", ending on "
 msgstr ", beidzoties "
 
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr "<b>Sākas:</b> "
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:831
 msgid "<b>Ends:</b> "
 msgstr "<b>Beidzas:</b>"
 
-#: calendar/gui/e-itip-control.c:831
+#: calendar/gui/e-itip-control.c:851
 msgid "<b>Completed:</b> "
 msgstr "<b>Izpildīts:</b>"
 
-#: calendar/gui/e-itip-control.c:841
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr "<b>Līdz:</b>"
 
-#: calendar/gui/e-itip-control.c:878 calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 msgid "iCalendar Information"
 msgstr "iKalendāra informācija"
 
 #. Title
-#: calendar/gui/e-itip-control.c:893
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr "iKalendāra kļūda"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/e-itip-control.c:975
-#: calendar/gui/e-itip-control.c:986 calendar/gui/e-itip-control.c:1003
+#: 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 "Nezināma persona"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1010
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5411,338 +5575,339 @@ msgstr ""
 "<br> Lūdzu apskatiet sekojošo informāciju un pēc tam izvēlieties darbību no "
 "izvēlnes zemāk."
 
-#: calendar/gui/e-itip-control.c:1025
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Nekas</i>"
 
-#: calendar/gui/e-itip-control.c:1035
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "Lokācija: "
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr "Statuss:"
 
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:877
-#: 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 "Apstiprināts"
 
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:493
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Pagaidām akceptēt"
 
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:878
-#: 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 "Noliegts"
 
-#: calendar/gui/e-itip-control.c:1066 calendar/gui/e-itip-control.c:1272
-#: 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:835
-#: calendar/gui/e-meeting-model.c:851 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:901 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 "Nezināms"
 
-#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
+#: 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 "Izvēlieties darbību:"
 
-#: calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Atjaunot"
 
-#: calendar/gui/e-itip-control.c:1121 calendar/gui/e-itip-control.c:1152
-#: calendar/gui/e-itip-control.c:1175 calendar/gui/e-itip-control.c:1188
+#: 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
-#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
+#: 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:1148
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr "Apstiprināt"
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Pagaidām akceptēt"
 
-#: calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Noliegt"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Nosūtīt brīvs/aizņemts informāciju"
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Atjaunināt respondenta statusu"
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Sūtīt pēdīgo informāciju"
 
-#: calendar/gui/e-itip-control.c:1213 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 "Atsaukt"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ir publicējis informāciju par sanāksmi."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Informācija par sanāksmi"
 
-#: calendar/gui/e-itip-control.c:1300
+#: 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> pieprasa %s klātbūtni sanāksmē."
 
-#: calendar/gui/e-itip-control.c:1302
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> pieprasa jūsu klātbūtni sanāksmē."
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Sanāksmes iemesls"
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> vēlas pievienot jau eksistējošai sanāksmei."
 
-#: calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Atjaunināta informācija par sanāksmi"
 
-#: calendar/gui/e-itip-control.c:1312
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> vēlas saņemt pēdīgo informāciju par sanāksmi."
 
-#: calendar/gui/e-itip-control.c:1313
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "Informācijas par sanāksmi atjaunināšanas pieprasīšana"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ir atbildējis uz sanāksmes pieprasījumu."
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Atbilde par sanāksmi"
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ir atsaucis sanāksmi."
 
-#: calendar/gui/e-itip-control.c:1329
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Sanāksmes atcelšana"
 
-#: calendar/gui/e-itip-control.c:1336 calendar/gui/e-itip-control.c:1403
-#: calendar/gui/e-itip-control.c:1438
+#: 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> ir nosūtijis nesaprotamu vēstuli."
 
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Nepareiza vēstule par sanāksmi"
 
-#: calendar/gui/e-itip-control.c:1361
+#: calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ir publicējis informāciju par uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Uzdevuma informācija"
 
-#: calendar/gui/e-itip-control.c:1367
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pieprasa %s izpildīt uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1369
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> pieprasa jums izpildīt uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Uzdevuma priekšlikums"
 
-#: calendar/gui/e-itip-control.c:1374
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> vēlas pievienot jau eksistējošam uzdevumam."
 
-#: calendar/gui/e-itip-control.c:1375
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Uzdevuma atjaunināšana"
 
-#: calendar/gui/e-itip-control.c:1379
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> vēlas saņemt pēdīgo informāciju par uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Uzdevuma atjaunināšanas pieprasījums"
 
-#: calendar/gui/e-itip-control.c:1387
+#: calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ir atbildējis uz uzdevuma nozīmēšanu."
 
-#: calendar/gui/e-itip-control.c:1388
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Uzdevuma atbilde"
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ir atcēlis uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1396
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Uzdevuma atsaukums"
 
-#: calendar/gui/e-itip-control.c:1404
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Slikts uzdevuma ziņojums"
 
-#: calendar/gui/e-itip-control.c:1423
+#: calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ir publicējis brīvs/aizņemts informāciju."
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Brīvs/aizņemts informācija"
 
-#: calendar/gui/e-itip-control.c:1428
+#: calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pieprasa tavu brīvs/aizņemts informāciju."
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Brīvs/aizņemts pieprasījums"
 
-#: calendar/gui/e-itip-control.c:1433
+#: calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ir atbildējis uz brīvs/aizņemts informāciju."
 
-#: calendar/gui/e-itip-control.c:1434
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Brīvs/aizņemts atbilde"
 
-#: calendar/gui/e-itip-control.c:1439
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Slikta Brīvs/aizņemts ziņa"
 
-#: calendar/gui/e-itip-control.c:1513
+#: calendar/gui/e-itip-control.c:1541
 msgid "The message does not appear to be properly formed"
 msgstr "Ziņa, izskatās, ir nepareizi noformēta"
 
-#: calendar/gui/e-itip-control.c:1575
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "Ziņa satur tikai neatbalstītus pieprasījumus."
 
-#: calendar/gui/e-itip-control.c:1603 calendar/gui/e-itip-control.c:1609
+#: 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 "Piesaistne nesatur atļautu kalendāra ziņu"
 
-#: calendar/gui/e-itip-control.c:1634
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "Piesaistnei nav skatāmu kalendāra priekšmetu"
 
-#: calendar/gui/e-itip-control.c:1856 calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1907 calendar/gui/e-itip-control.c:1999
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekts ir nepareizs un nevar tikt atjaunināts\n"
 
-#: calendar/gui/e-itip-control.c:1859 calendar/gui/e-itip-control.c:1951
+#: 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 "Ir kļūda CORBA sistēmā\n"
 
-#: calendar/gui/e-itip-control.c:1862 calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:2005
 msgid "Object could not be found\n"
 msgstr "Objektu nevarēja atrast\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1916
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Jums nav pareizo atļauju, lai atjauninātu kalendāru\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Atjaunināšana izpildīta\n"
 
-#: calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalendāra fails nevarēja tikt atjaunināts!\n"
 
-#: calendar/gui/e-itip-control.c:1900 calendar/gui/e-itip-control.c:1966
+#: 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 ""
 "Apmeklētāja statuss nevar tikt atjaunināts, tāpēc ka priekšmets vairāk "
 "neeksistē"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1972
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Šī atbilde nav no pašreizējā apmeklētāja. Pievienot kā apmeklētāju?"
 
-#: calendar/gui/e-itip-control.c:1933
+#: calendar/gui/e-itip-control.c:1984
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Apmeklētāja statuss nevar tikt atjaunināts sakarā ar nepareizo statusu!\n"
 
-#: calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:2008
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Jums nav pareizo atļauju, lai atjauninātu kalendāru\n"
 
-#: calendar/gui/e-itip-control.c:1960
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Apmeklētāja status atjaunināts\n"
 
-#: calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "Apmeklētāja status nevar tikt atjaunināts!\n"
 
-#: calendar/gui/e-itip-control.c:1998
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Izņemšana pabeigta"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2079 calendar/gui/e-itip-control.c:2129
 msgid "Item sent!\n"
 msgstr "Priekšmets nosūtīts!\n"
 
-#: calendar/gui/e-itip-control.c:2030 calendar/gui/e-itip-control.c:2082
+#: calendar/gui/e-itip-control.c:2081 calendar/gui/e-itip-control.c:2133
 msgid "The item could not be sent!\n"
 msgstr "Priekšmets nevar tikt nosūtīts!\n"
 
-#: calendar/gui/e-itip-control.c:2155
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr "Izvēlieties kalendāra mapi"
 
-#: calendar/gui/e-itip-control.c:2162
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr "Izvēlieties uzdevumu mapi"
 
@@ -5783,180 +5948,185 @@ msgstr "datums-sākums"
 msgid "date-start"
 msgstr "datums-beigas"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr "Vadošās personas"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1764
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
 msgid "Required Participants"
 msgstr "Pieprasītie dalībnieki"
 
-#: calendar/gui/e-meeting-model.c:86
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr "Iespējamie dalībnieki"
 
-#: calendar/gui/e-meeting-model.c:87
+#: calendar/gui/e-meeting-model.c:83
 msgid "Resources"
 msgstr "Resursi"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:565 calendar/gui/e-meeting-model.c:831
+#: 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 "Individuāli"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:832
+#: 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:833
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
+#: calendar/gui/e-meeting-model.c:808
 msgid "Resource"
 msgstr "Resurss"
 
-#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
+#: calendar/gui/e-meeting-model.c:809
 msgid "Room"
 msgstr "Istaba"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:847
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:822
 msgid "Chair"
 msgstr "Krēsls"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:567 calendar/gui/e-meeting-model.c:848
+#: 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 "Pieprasītais dalībnieks"
 
-#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:849
+#: 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 "Iespējamais dalībnieks"
 
-#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:850
+#: 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 "Nepiedalās"
 
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:879 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 "Pieprasa darbību"
+
+#: 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 "Pagaidu"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:880
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
+#: calendar/gui/e-meeting-model.c:855
 msgid "Delegated"
 msgstr "Deleģēts"
 
-#: 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 "Procesā"
 
 #. 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 "Neatrodas Birojā"
 
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Nav Informācijas"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Opcijas"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Parādīt Tikai _Darba Stundas"
 
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Parādīt Sama_zinātu"
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "_Atjaunināt Brīvs/Aizņemts Informāciju"
 
-#: 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 "_Autoizvēle"
 
-#: 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 "_Visi Cilvēki un Resursi"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Visi _Cilvēki un Viens Resurss"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "_Pieprasītie Cilvēki"
 
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Pieprasītie Cilvēki un _Viens Resurss"
 
-#: calendar/gui/e-meeting-time-sel.c:654
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Sanāksmes _sākuma laiks:"
 
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Sanāksmes _beigu laiks:"
 
-#: calendar/gui/e-tasks.c:358 calendar/gui/gnome-cal.c:2036
-#: calendar/gui/gnome-cal.c:2047
+#: 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 "Atvērt uzdevumus uz %s"
 
-#: calendar/gui/e-tasks.c:387 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 "Nevar ielādēt uzdevumus uz `%s'"
 
-#: calendar/gui/e-tasks.c:402
+#: calendar/gui/e-tasks.c:401
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metode lai ielādētu `%s' nav atbalstīta"
 
-#: calendar/gui/e-tasks.c:416 calendar/gui/gnome-cal.c:1561
+#: 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 "Jums nav atļaujas, lai atvērtu mapi iekš '%s'"
 
-#: calendar/gui/e-tasks.c:484 calendar/gui/gnome-cal.c:1765
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5965,11 +6135,11 @@ msgstr ""
 "Kļūda %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:556
+#: calendar/gui/e-tasks.c:554
 msgid "Completing tasks..."
 msgstr "Izpildam uzdevumus..."
 
-#: calendar/gui/e-tasks.c:579
+#: calendar/gui/e-tasks.c:577
 msgid "Deleting selected objects..."
 msgstr "Dzēšam izvēlētos objektus..."
 
@@ -5977,26 +6147,26 @@ msgstr "Dzēšam izvēlētos objektus..."
 msgid "Expunging"
 msgstr "Iztīru"
 
-#: calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Jauna _tikšanās...."
 
-#: calendar/gui/gnome-cal.c:1533
+#: calendar/gui/gnome-cal.c:1503
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nevar atvērt mapi uz `%s'"
 
-#: calendar/gui/gnome-cal.c:1547
+#: calendar/gui/gnome-cal.c:1517
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Pieprasītā metode, lai atvērtu `%s' nav atbalstīta"
 
-#: calendar/gui/gnome-cal.c:1593
+#: calendar/gui/gnome-cal.c:1563
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Pievienoju trauksmes priekš %s"
 
-#: calendar/gui/gnome-cal.c:1786
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6008,7 +6178,7 @@ msgstr ""
 " ir avarējusi. Jums būs jāparstartē Evolution, ja jūs vēlaties to atkal "
 "izmantot"
 
-#: calendar/gui/gnome-cal.c:1791
+#: calendar/gui/gnome-cal.c:1764
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6020,12 +6190,12 @@ msgstr ""
 " ir avarējusi. Jums būs jāparstartē Evolution, ja jūs vēlaties to atkal "
 "izmantot"
 
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/gnome-cal.c:1995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Atvērt kalendāru uz %s"
 
-#: calendar/gui/gnome-cal.c:2058
+#: calendar/gui/gnome-cal.c:2035
 msgid "Opening default tasks folder"
 msgstr "Atveru noklusēto uzdevumu mapi"
 
@@ -6085,315 +6255,173 @@ msgstr "Oktobris"
 msgid "September"
 msgstr "Septembris"
 
-#: 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 "Jābūt norādītam organizētājam."
 
-#: calendar/gui/itip-utils.c:383
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "Vismaz viens apmeklētajs ir vajadzīgs"
 
-#: 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 "Notikuma informācija"
 
-#: 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 "Uzdevuma Informācija"
 
-#: 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 "Žurnāla informācija"
 
-#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:595
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 msgid "Free/Busy information"
 msgstr "Brīvs/Aizņemts informācija"
 
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Kalendāra informācija"
 
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr "Atjaunināt"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr "Atsvaidzināt"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr "Pretpiedāvājums"
 
-#: calendar/gui/itip-utils.c:589
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Brīvs/Aizņemts informācija (%s uz %s)"
 
-#: calendar/gui/itip-utils.c:601
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "iKalendāra informācija"
 
-#: calendar/gui/itip-utils.c:759
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Jums jābūt notikuma apmeklētājam."
 
-#: calendar/gui/main.c:70
-msgid "Could not activate Bonobo"
-msgstr "Nevarēju aktivizēt Bonobo"
-
-#: calendar/gui/main.c:99
-msgid "Could not create the component editor factory"
-msgstr "Nevarēju izveidot komponentes redaktora ražotni"
-
-#: 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 "Sv"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "Pr"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "Ot"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "Tr"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "Ct"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "Pk"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "Sd"
 
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Izvēlēta diena (%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 "Izvēlētā nedēļa (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr "Izvēlētais mēnesis (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr "Izvēlētais gads (%Y)"
 
-#: calendar/gui/print.c:2249
+#: calendar/gui/print.c:2267
 msgid "Task"
 msgstr "Uzdevums"
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritāte: %s"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2358
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procenti Izpidildīti: %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 "Kategorijas: %s"
 
-#: calendar/gui/print.c:2375
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr "Kontakti:"
 
-#: calendar/gui/print.c:2430
-msgid "Print Calendar"
-msgstr "Drukāt Kalendāru"
-
-#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3216
-#: 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 "Drukāšanas Pirmsapskats"
 
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "Drukāt Priekšmetu"
 
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "Drukāšanas Uzstādijumi"
 
-#: calendar/gui/tasks-control-factory.c:75
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Nevar izveidot uzdevumu skatu. Lūdzu pārbaudiet jūsu ORBit un OAF "
-"uzstādījumu."
-
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr "Parādāmās uzdevumu mapes URI"
 
-#: 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"
@@ -6405,88 +6433,51 @@ msgstr ""
 "\n"
 "Tiešām izdzēst šos uzdevumus?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2696
-#: mail/mail-callbacks.c:2938
+#: calendar/gui/tasks-control.c:479
 msgid "Do not ask me again."
 msgstr "Neprasiet man vēlreiz."
 
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:615
 msgid "Print Tasks"
 msgstr "Drukāt uzdevumus"
 
-#: 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 automātiski pārvietoja uzdevumus, kas bija jūsu kalendāra mapē, uz "
-"jaunizveidoto uzdevumu mapi."
-
-#: 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 ir mēģinājusi pārvietot uzdevumus no jūsu kalendāra mapes uz jauno "
-"uzdevumu mapi.\n"
-"Daži no uzdevumu ierakstiem nevarēja tikt pārvietoti, tāpēc šis process var "
-"tikt vēlreiz mēģināts vēlāk."
-
-#: 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 ""
-"Nevar atvērt `%s'; priekšmeti no kalendāra mapes uz uzdevumu mapi netiks "
-"pārnesti."
-
-#: 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 ""
-"Metode, kas pieprasīta lai ielādētu '%s', nav atbalstīta; nekādi priekšmeti "
-"no kalendāra mapes netiks migrēti uz uzdevumu mapi."
-
-#: 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 "Ražotne, lai importētu iKalendāra failus Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Evolution kalendāra iTip/iMip skatītājs"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "Importē iKalendāra failus Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Evolution kalendāra iTip/iMip skatītājs"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "Importē vCalendar failus Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Evolution kalendāra iTip/iMip skatītājs"
 
-#: calendar/importers/icalendar-importer.c:168
-#, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr "Nevaru dabūt glabātuvju sarakstu no reģistra: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Kalendāra ziņojums"
 
-#: calendar/importers/icalendar-importer.c:180
-#, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "Nevaru izsaukt getFolderAtPath glabātuvē: %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 "Atgādinājums!!"
 
-#: calendar/importers/icalendar-importer.c:697
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "Kalendāra notikumi"
 
-#: 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?"
@@ -6494,10 +6485,14 @@ msgstr ""
 "Evolution ir atradis Gnome Kalendāra failus.\n"
 "Vai jūs vēlaties, lai tie tiktu importēti Evolution?"
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr "Gnome kalendārs"
 
+#: 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 pieprasa 0 argumentus"
@@ -8139,27 +8134,37 @@ msgstr "Klusais/Wallis"
 msgid "Pacific/Yap"
 msgstr "Klusais/Yap"
 
-#: camel/camel-cipher-context.c:170
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr "Šis šifrs neatbalsta parakstīšanu"
 
-#: camel/camel-cipher-context.c:210
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr "Šis šifrs neatbalsta pārbaudīšanu"
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr "Šis šifrs neatbalsta kodēšanu"
 
-#: camel/camel-cipher-context.c:296
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr "Šis šifrs neatbalsta dekodēšanu"
 
-#: camel/camel-data-cache.c:169
+#: camel/camel-cipher-context.c:342
+#, fuzzy
+msgid "You may not import keys with this cipher"
+msgstr "Šis šifrs neatbalsta dekodēšanu"
+
+#: camel/camel-cipher-context.c:374
+#, fuzzy
+msgid "You may not export keys with this cipher"
+msgstr "Šis šifrs neatbalsta dekodēšanu"
+
+#: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
 msgstr "Nevarēju izveidot keiša ceļu"
 
-#: camel/camel-data-cache.c:443
+#: camel/camel-data-cache.c:370
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nevarēju izdzēst keiša ierakstu: %s: %s"
@@ -8199,84 +8204,91 @@ msgstr "Sagatavojam mapi '%s' nesaistei"
 msgid "You must be working online to complete this operation"
 msgstr "Jums ir jāstrādā tiešsaistē lai izpildītu šo operāciju"
 
-#: 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
+#, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Neizdevās izveidot kanālu %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 "Neizdevās izveidot bērna procesu '%s': %s"
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "Nevarēju nolasīt sviecienu no %s: %s"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Sinhronizējam mapes"
 
-#: 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 "Kļūda parsējot filtru: %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 "Kļūda palaižot filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Nespēju atvērt spoles mapi"
 
-#: camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Nespēj procesēt spoles mapi"
 
-#: camel/camel-filter-driver.c:966
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Dabūjam vēstuli %d (%d%%)"
 
-#: camel/camel-filter-driver.c:970
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Nevar atvērt vēstuli"
 
-#: 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 "Problēma ar vēstuli %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 "SInhronizējam mapi"
 
-#: camel/camel-filter-driver.c:1058
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Dabūjam vēstuli %d no %d"
 
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Kļūda pie vēstules %d no %d"
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 msgid "Failed to retrieve message"
 msgstr "Neizdevās saņemt vēstuli"
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 msgid "Invalid arguments to (system-flag)"
 msgstr "Nepareizi argumenti uz (system-flag)"
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 msgid "Invalid arguments to (user-tag)"
 msgstr "Nepareizi argrumenti uz (user-flag)"
 
-#: camel/camel-filter-search.c:514
-#, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Neizdevās izveidot kanālu %s: %s"
-
-#: camel/camel-filter-search.c:550
-#, c-format
-msgid "Failed to create child process '%s': %s"
-msgstr "Neizdevās izveidot bērna procesu '%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 "Kļūda sāknējot filtra meklēšanu: %s: %s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8285,7 +8297,7 @@ msgstr ""
 "Nevaru parsēt meklēšanas izteiksmi: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8294,11 +8306,11 @@ msgstr ""
 "Kļūda sāknējot meklēšanas izteiksmi: %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) pieprasa vienu būla rezultātu"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Izpildu pieprasījumu uz nezināmas galvenes: %s"
@@ -8326,7 +8338,7 @@ msgstr "Pārvietojam vēstules"
 msgid "Copying messages"
 msgstr "Kopēju vēstules"
 
-#: camel/camel-gpg-context.c:697
+#: camel/camel-gpg-context.c:724
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8337,15 +8349,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:711
+#: camel/camel-gpg-context.c:738
 msgid "Failed to parse gpg userid hint."
 msgstr "Neizdevās noparsēt gpg userid padomu."
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:761
 msgid "Failed to parse gpg passphrase request."
 msgstr "Neizdevās noparsēt gpg paroļfrāzes pieprasījumu."
 
-#: 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"
@@ -8354,33 +8366,33 @@ msgstr ""
 "Jums nepieciešama atslēgfrāze, lai atslēgtu atslēgu\n"
 "lietotājam: \"%s\""
 
-#: 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 "Atsaukts."
 
-#: camel/camel-gpg-context.c:771
+#: camel/camel-gpg-context.c:798
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Neizdevās atslēgt slepeno atslēgu: dotas 3 sliktas paroļfrāzes"
 
-#: camel/camel-gpg-context.c:777
+#: camel/camel-gpg-context.c:804
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Negaidīta atbilde no GnuPG: %s"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:814
 msgid "No data provided"
 msgstr "Nav piegādāti dati"
 
-#: camel/camel-gpg-context.c:830
+#: camel/camel-gpg-context.c:857
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Neizdevās kodēt: Nav norādīti atļauti adresāti."
 
-#: 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 ""
@@ -8388,23 +8400,24 @@ msgstr ""
 "\n"
 "%.*s"
 
-#: camel/camel-gpg-context.c:1088
-#, c-format
-msgid "Failed to GPG %s message: %s\n"
+#: camel/camel-gpg-context.c:1131
+#, fuzzy, c-format
+msgid "Failed to GPG %s: %s\n"
 msgstr "Neizdevās GPG %s vēstuli: %s\n"
 
-#: camel/camel-gpg-context.c:1197
+#: 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 "Neizdevās palaist gpg: %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 "Neizdevās palaist gpg."
 
-#: 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 ""
@@ -8430,24 +8443,23 @@ msgstr "Nevarēju noslēgt '%s': protokola kļūda ar noslēgumpalīgu"
 msgid "Could not lock '%s'"
 msgstr "Nevarēju noslēgt '%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 "Nevarēju izveidot slēguma failu %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 ""
 "Iztecējis laiks, mēģinot dabūt slēguma failu %s. Mēģiniet vēlāk velreiz."
 
-#: camel/camel-lock.c:206
+#: camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Neizdevās dabūt slēgu lietojot fctl(2): %s"
 
-#: camel/camel-lock.c:268
+#: camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Neizdevās dabūt slēgu lietojot flock(2): %s"
@@ -8457,51 +8469,51 @@ msgstr "Neizdevās dabūt slēgu lietojot flock(2): %s"
 msgid "Could not check mail file %s: %s"
 msgstr "Nevarēja pārbaudiīt pasta failu %s: %s"
 
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nevar atvērt pasta failu %s: %s"
 
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nevar atvērt pagaidu pasta failu %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 "Neizdevās saglabāt pastu pagaidu failā %s: %s"
 
-#: camel/camel-movemail.c:188
+#: camel/camel-movemail.c:187
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nevar izveidot kanālu: %s"
 
-#: camel/camel-movemail.c:200
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nevar sazarot: %s"
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:237
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail programma izgāzusies: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 msgid "(Unknown error)"
 msgstr "(Nezināma kļūda)"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Kļūda lasot pasta failu: %s"
 
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Kļūda rakstot pasta pagaidu failu: %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 "Kļūda kopējot pasta pagaidu failu: %s"
@@ -8518,25 +8530,25 @@ msgstr "Neizdevās atkodēt MIME daļu: nepareiza struktūra"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Neizdevās atkodēt MIME daļu: parsēšanas kļūda"
 
-#: camel/camel-multipart-signed.c:625
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr "Šī ir digitāli parakstītā vēstules daļa"
 
-#: camel/camel-multipart-signed.c:679
+#: camel/camel-multipart-signed.c:682
 msgid "parse error"
 msgstr "parsēšanas kļūda"
 
-#: 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 "Nevarēju ielādet %s: Moduļu ielāde nav atbalstīta šajā sistēmā."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:141
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nevarēju ielādēt %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 "Nevar ielādēt %s: Nav initicializācijas koda modulī."
@@ -8592,11 +8604,11 @@ msgstr ""
 "Šī opcija ļaus savienoties ar serveri lietojot drošo CRAM-MD5 paroli, ja "
 "serveris atbalsta to."
 
-#: 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."
@@ -8604,40 +8616,116 @@ msgstr ""
 "Šī opcija ļaus jums savienoties ar serveri lietojot drošo DIGEST-MD5 paroli, "
 "ja serveris atbalsta to."
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Servera izaicinājums par garu (>2048 okteti)\n"
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr "Servera izaicinājums nepareizs\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 ""
 "Servera izaicinājums saturēja nepareizu \"Quality of Protection\" tokenu\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 "Servera atbilde nesaturēja autorizācijas datus\n"
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Servera atbilde saturēja nepilnīgus autorizācijas datus\n"
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr "Servera atbilde neatbilst\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 "Šī opcija savienos ar serveri lietojot Kerberos 4 autentifikāciju. "
+
+#: 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 "Slikta autentifikācijas atbilde no servera."
+
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "Neizdevās izveidot kanālu %s: %s"
+
+#: camel/camel-sasl-gssapi.c:299
+#, fuzzy
+msgid "Unsupported security layer."
+msgstr "Neatbalstīts tips"
+
+#: 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 "Šī opcija savienos ar serveri lietojot Kerberos 4 autentifikāciju. "
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -8646,11 +8734,6 @@ msgstr ""
 "Nevar dabūt Kerberos biļeti:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1059
-msgid "Bad authentication response from server."
-msgstr "Slikta autentifikācijas atbilde no servera."
-
 #: camel/camel-sasl-login.c:32
 msgid "Login"
 msgstr "Pieteikšanās"
@@ -8699,7 +8782,7 @@ msgstr "POP Pirms SMTP autorizācijas lietojot nezināmu transportu"
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP pirms SMTP autentifikācijas lietojot ne-pop avotu"
 
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Regulāras izteiksmes kompilācija neizdevusies: %s: %s"
@@ -8719,35 +8802,35 @@ msgstr "URL '%s' nepieciešams hosta komponents"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' nepieciešams ceļa komponents"
 
-#: camel/camel-service.c:743
+#: camel/camel-service.c:741
 #, c-format
 msgid "Resolving: %s"
 msgstr "Sameklējam: %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 "Nevar atrast nosaukumu: %s"
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Hosta meklēšana neizdevusies: %s: hosts nav atrasts"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Hosta meklēšana neizdevusies: %s: nezināms iemesls"
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 msgid "Resolving address"
 msgstr "Atrodu adresi"
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 msgid "Host lookup failed: host not found"
 msgstr "Hosta meklēšana neizdevusies: hosts nav atrasts"
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 msgid "Host lookup failed: unknown reason"
 msgstr "Hosta meklēšana neizdevusies: nezināms iemesls"
 
@@ -8759,12 +8842,12 @@ msgstr "Virtuālās mapes epasta piegādātājs"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pasta lasīšanai kā citas mapju kopas pieprasījumu"
 
-#: 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 "Nav pieejams piegādātajs protokolam '%s'"
 
-#: camel/camel-session.c:545
+#: camel/camel-session.c:548
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8773,168 +8856,168 @@ msgstr ""
 "Nevarēja izveidot direktoriju %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 "Lūdzu ievadiet jūsu paroli %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 "Lūdzu norādiet sertifikāta iesaukas vārdu, ar ko parakstīt."
 
-#: camel/camel-smime-context.c:209
+#: camel/camel-smime-context.c:207
 #, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr "Paraksta sertifikāts \"%s\" neeksistē."
 
-#: camel/camel-smime-context.c:249
+#: camel/camel-smime-context.c:247
 #, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "Kodēšanas sertifikāts \"%s\" neeksistē."
 
-#: 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 "Neizdevās atrast sertifikātu \"%s\"."
 
-#: camel/camel-smime-context.c:556
+#: camel/camel-smime-context.c:554
 msgid "Failed to find a common bulk algorithm."
 msgstr "Neizdevās atrast parasto bulk algoritmu."
 
-#: camel/camel-smime-context.c:810
+#: camel/camel-smime-context.c:808
 msgid "Failed to decode message."
 msgstr "Neizdevās atkodēt vēstuli."
 
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
 msgid "Failed to verify certificates."
 msgstr "Neizdevās pārbaudīt sertifikātus."
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nevaru dabūt mapi: Nepareiza operācija šajā glabātuvē"
 
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nevaru izveidot mapi: Nepareiza operācija šajā glabātuvē"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 msgid "Unable to get issuer's certificate"
 msgstr "Neizdodas dabūt izsniedzēja sertifikātu"
 
-#: 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 "Neizdodas atkodēt sertifikāta parakstu"
 
-#: 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 "Nespēju atkodēt isniedzēja publisko atslēgu"
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:581
 msgid "Certificate signature failure"
 msgstr "Sertifikāta paraksta neizdošanā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 "Sertifikāts vēl nav derīgs"
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr "Sertifikāts ir iztecējis"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr "CRL nav vēl derīgs"
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr "CRL ir iztecējis"
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 msgid "Error in CRL"
 msgstr "Kļūda CRL"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 msgid "Out of memory"
 msgstr "Nepietiek atmiņas"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr "Nulles dziļuma pašparakstīts sertifikāts"
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr "Ķēdē pašparakstīts sertifikāts"
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr "Neiespējami dabūt izsniedzēja sertifikātu lokāli"
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:606
 msgid "Unable to verify leaf signature"
 msgstr "Neizdodas pārbaudīt lapas parakstu"
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr "Sertifikātu ķēde par garu"
 
-#: 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 "Nepareiza sertifikāta autoritāte (SA)"
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr "Ceļa garums pārsniegts"
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
 msgid "Invalid purpose"
 msgstr "Nepareizs mērķis"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr "Neuzticams sertifikāts"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr "Sertifikāts noraidīts"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr "Subjekta/Izsniedzēja neatbilšana"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr "AKID/SKID neatbilšana"
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr "AKID/Izsniedzēja seriālā numura neatbilšana"
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr "Atslēgu lietojums neatbalsta sertifikāta parakstīšanu"
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr "Kļūda aplikāciju pārbaudē"
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:805
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8947,15 +9030,15 @@ msgstr ""
 "Parakstnospiedums:      %s\n"
 "Paraksts:               %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:811
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr "LABS"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:811
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr "SLIKTS"
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8975,7 +9058,7 @@ msgstr ""
 "Vai jūs vēlaties akceptēt jebkurā gadījumā?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:815
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8990,7 +9073,7 @@ msgstr ""
 "\n"
 "Vai jūs vēlaties akceptēt?"
 
-#: camel/camel-tcp-stream-ssl.c:859
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -8999,7 +9082,7 @@ msgstr ""
 "Sertifikāta problēma: %s\n"
 "Izsniedzējs: %s"
 
-#: camel/camel-tcp-stream-ssl.c:911
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9008,7 +9091,7 @@ msgstr ""
 "Slikts sertifikāta domēns: %s\n"
 "Izsniedzējs: %s"
 
-#: camel/camel-tcp-stream-ssl.c:929
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9017,14 +9100,14 @@ msgstr ""
 "Sertifikāta der. laiks iztecējis: %s\n"
 "Izsniedzējs: %s"
 
-#: camel/camel-tcp-stream-ssl.c:946
+#: 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 "Nevarēja noparsēt URL `%s'"
@@ -9039,39 +9122,39 @@ msgstr "Kļūda glabājot `%s': %s"
 msgid "No such message %s in %s"
 msgstr "Nav tādas vēstules %s iekš %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 "Nevar kopēt vai pārvietot vēstules virtuālajā mapē"
 
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
 
-#: camel/camel-vee-store.c:319
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nevar izdzēst mapi: %s: Nav tādas mapes"
 
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
 
-#: camel/camel-vee-store.c:340
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nevar pārsaukt mapi: %s: Nav tādas mapes"
 
 #: 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:2656
+#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr "Operācija atsaukta"
 
 #: 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 "Serveris negaidīti atvienojās: %s"
@@ -9096,52 +9179,52 @@ msgstr "Negaidīta atbilde no IMAP servera: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr "Servera atbilde beidzās pārāk ātri."
 
-#: 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 servera atbilde nesaturēja %s informāciju"
 
-#: 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 "Negaidīta OK atbilde no IMAP servera: %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 "Nevar izveidot direktoriju %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 "Nevar ielādēt %s kopsavilkumu"
 
-#: 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 "Mape tika iznīcināta un pārizveidota uz servera."
 
 #. 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 "Meklējam izmainītās vēstules"
 
-#: 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 "Nespēju saņemt vēstuli: %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"
@@ -9150,24 +9233,24 @@ msgstr ""
 "Nevar dabūt vēstuli: %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 "Nav tādas vēstules"
 
-#: 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 "Šī vēstule šobrīd nav pieejama"
 
-#: 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 "Saņemu kopsavilkuma informāciju par jaunām vēstulēm"
 
-#: 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 "Nevarēju atrast vēstules ķermeni FETCH atbildē."
 
@@ -9197,7 +9280,7 @@ msgstr "Pārbaudam jauno pastu"
 msgid "Check for new messages in all folders"
 msgstr "Pārbaudam jaunas vēstules visās mapēs"
 
-#: 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 "Mapes"
 
@@ -9227,7 +9310,7 @@ msgstr "Lai lasītu un glabātu pastu uz IMAP serveriem."
 
 #: 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:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr "Parole"
 
@@ -9245,58 +9328,57 @@ msgstr "IMAP serveris %s"
 msgid "IMAP service for %s on %s"
 msgstr "IMAP serviss priekš %s uz %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 "Konekcija pārtraukta"
 
-#: 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 "Nevarēja savienoties ar %s (ports %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 "Nevar savienoties ar IMAP serveri %s drošības režīmā: %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 paplašinājums nav atbalstīts."
 
-#: 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 sarunas neizdevušā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 "IMAP serveris %s neatbalsta pieprasīto autentifikācijas tipu %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 "Neatbalstīts autentifikācijas tips %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 "%sLūdzu ievadi IMAP paroli %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 "Jūs neievadījāt paroli."
 
-#: 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"
@@ -9307,24 +9389,24 @@ 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 "Nav tādas mapes %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 "Mapes nosaukums \"%s\" ir nepareizs, jo satur rakstzīmi \"%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 "Nezināma vecāku mape: %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 "Vecāku mapei nav atļauts saturēt apakšmapes"
 
@@ -9401,8 +9483,8 @@ msgstr ""
 "Var tikt arī izmantots, lai lasītu Elm, Pine vai Mutt stila mapju kokus."
 
 #: 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 "Glabātuves sakne %s nav absolūtais ceļš"
@@ -9414,36 +9496,36 @@ msgstr "Glabātuves sakne %s nav regulāra direktorija"
 
 #: 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 "Nevaru dabūt mapi: %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 "Lokālajām glabātuvēm nav iesūtnes"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokālā pasta fails %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 "Nevarēju pārsaukt mapi %s par %s: %s"
 
-#: camel/providers/local/camel-local-store.c:363
+#: camel/providers/local/camel-local-store.c:365
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nevarēju pārsaukt '%s': %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 "Nevarēju izdzēst mapes kopsavilkuma failu `%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 "Nevarēju izdzēst mapes indeksa failu `%s': %s"
@@ -9453,7 +9535,7 @@ msgstr "Nevarēju izdzēst mapes indeksa failu `%s': %s"
 msgid "Could not save summary: %s: %s"
 msgstr "Nevarēju saglabāt kopsavilkumu: %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 "Nevarēju pievienot vēstuli kopsavilkumam: nezināms iemesls"
 
@@ -9466,14 +9548,14 @@ msgstr "Maildir vēstules pievienošana atsaukta"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nevaru pievienot vēstuli maildir mapei: %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 "Nepareizs vēstules saturs"
 
 #: 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"
@@ -9485,14 +9567,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 "Mape '%s' neeksistē."
 
 #: 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"
@@ -9507,68 +9589,68 @@ msgid "`%s' is not a maildir directory."
 msgstr "`%s nav maildir direktorija."
 
 #: 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 "Nevarēju izdzēst mapi `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:169
 msgid "not a maildir directory"
 msgstr "nav maildir direktorija"
 
 #: 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 "Nevarēju skanēt mapi `%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 "Nevaru atvērt maildir direktorijas ceļu: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:539
+#: camel/providers/local/camel-maildir-summary.c:541
 msgid "Checking folder consistency"
 msgstr "Pārbaudu mapes nepretrunīgumu"
 
-#: camel/providers/local/camel-maildir-summary.c:640
+#: camel/providers/local/camel-maildir-summary.c:644
 msgid "Checking for new messages"
 msgstr "Meklēju jaunās vēstules"
 
-#: 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 "Glabāju mapi"
 
-#: 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 "Nevaru izveidot mapes slēgu uz %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 "Nevaru atvērt pastkasti: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr "Pasta pievienošana atsaukta"
 
-#: 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 "Nevar pievienot vēstuli mbox failam: %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"
@@ -9577,11 +9659,11 @@ msgstr ""
 "Nevar dabūt vēstuli: %s no mapes %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 "Šī mape izskatās, ka ir neatgriezeniski sabojāta."
 
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Vēstules konstrukcija neveiksmīga: Sabojāta pastkaste?"
 
@@ -9624,75 +9706,75 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mape `%s' nav tukša. Netika izdzēsta."
 
-#: 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 "Nevarēju atvērt mapi: %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 "Fatāla pasta parsera kļūda tuvu pozīcijai %ld mapē %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 "Nevarēju pārbaudīt mapi: %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 "Nevaru atvērt failu: %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 "Nevaru atvērt pagaidu pastkasti: %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 "Nevarēju aizvērt avota mapi %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 "Nevarēju aizvērt pagaidu mapi: %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 "Nevarēju pārsaukt mapi: %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 "Kopsavilkuma un mapes neatbilšana, pat pēc sinhronizācijas"
 
-#: 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 "Nezināma kļūda: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:883
+#: camel/providers/local/camel-mbox-summary.c:812
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Nevarēju noglabāt mapi: %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 "Kļūda rakstot pagaidu pastkastē: %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 "Rakstīšana uz pag. pastkasti neizdevusies: %s: %s"
@@ -9711,67 +9793,67 @@ msgstr "Nevar pievienot vēstuli mh mapei: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' nav direktorija."
 
-#: 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 "Nevar atvērt MH direktorijas ceļu: %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 "Spole '%s' nevar tikt atvērta: %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 "Spole '%s' nav regulārs fails vai direktorija"
 
-#: 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 "Mape `%s/%s' neekistē."
 
-#: 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 "`%s' nav pastkastes fails."
 
-#: camel/providers/local/camel-spool-store.c:193
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr "Glabātuve neatbalsta iesūtni (INBOX)"
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spoles pasta fails %s"
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Spoles mapes koks %s"
 
-#: camel/providers/local/camel-spool-store.c:213
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr "Spoles mapes nevar tikt pārsauktas"
 
-#: camel/providers/local/camel-spool-store.c:221
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr "Spoles mapes nevar tikt izdzēstas"
 
-#: 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 "Nevarēju sinh. pagaidu mapi %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 "Nevarēju sinh. spoles mapi %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 ""
@@ -9852,42 +9934,42 @@ msgid "Retrieving POP summary"
 msgstr "Saņemu POP kopsavilkumu"
 
 #: 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 "Lietotājs atsaukts"
 
-#: 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 "Nevaru dabūt POP kopsavilkumu: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:306
+#: camel/providers/pop3/camel-pop3-folder.c:308
 msgid "Expunging deleted messages"
 msgstr "Iztīru dzēstās vēstules"
 
-#: 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 "Nav vēstules ar 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 "Saņemu POP vēstuli %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
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Nevaru dabūt vēstuli: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
 msgid "Unknown reason"
 msgstr "Nezināms iemesls"
 
@@ -9904,7 +9986,7 @@ msgstr "Atstāt vēstules uz servera"
 msgid "Delete after %s day(s)"
 msgstr "Dzēst pēc %s dienas(ām)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr "POP"
 
@@ -9930,25 +10012,25 @@ msgstr ""
 "protokolu. Tas varētu nestrādāt visiem lietotājiem pat uz serveriem, kas "
 "apgalvo, ka atbalsta to."
 
-#: 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 "Nevarēju savienoties ar POP serveri %s (ports %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 "Neizdevās savienoties ar POP serveri %s drošības režīmā: %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 "Nevarēju savienoties ar POP serveri %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 "
@@ -9957,28 +10039,28 @@ msgstr ""
 "Nevarēju savienoties ar POP serveri %s: Pieprasītajam autentifikācijas "
 "mehānismam nav atbalsta."
 
-#: 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' pieteikšanās neizdevusies priekš POP servera %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 "Nevarēju pieteikties POP serverī %s: SASL protokola kļūda"
 
-#: 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 "Neizdevās autentificēties POP serverī %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 "%sLūdzu ievadiet POP paroli %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
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9987,13 +10069,13 @@ msgstr ""
 "Neizdevās savienoties ar POP serveri %s.\n"
 "Kļūda nosūtot paroli: %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 "Nav tādas mapes `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10003,49 +10085,49 @@ msgid ""
 "system."
 msgstr "Pasta nosūtīšanai, izmantojot \"sendmail\" programmu lokālajā sistēmā"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr "Nespēju parsēt adresātu sarakstu"
 
-#: 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 "Nevarēju izveidot kanālu uz sendmail: %s: pasts nav nosūtīts"
 
-#: 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 "Nevarēju sazarot sendmail: %s: pasts nav nosūtīts"
 
-#: 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 "Nevarēju nosūtit vēstuli: %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 izgāja ar signālu %s: pasts nav nosūtīts."
 
-#: 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 "Nevarēju palaist %s: pasts nav nosūtīts."
 
-#: 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 izgāja ar statusu %d: pasts nav nosūtīts."
 
-#: 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 "Pasta nosūtīšana ar sendmail programmu"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10054,137 +10136,137 @@ msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Pasta izsūtīšanai savienojoties uz attālinātu pasta hubu, izmantojot SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr "Sintakses kļūda, komanda neatpazīta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr "Sintakses kļūda parametros vai argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr "Komanda nav ievietota"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr "Komandas parametri nav ievietoti"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr "Sistēmas statuss, vai sistēmas palīdzības atbilde"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr "Palīdzības ziņojums"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr "Serviss kārtībā"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr "Serviss aizver pārraides kanālu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr "Serviss nav pieejams, aizveram pārraides kanālu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr "Pieprasītā pasta darbība atļauta, izpildīta"
 
-#: 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 "Lietotājs nav lokāls; tiks pārsūtīts uz <pārsūtītājceļš>"
 
-#: 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 "Pieprasītā pasta darbība nav veikta: pastkaste nepiejama"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Pieprasītā darbība nav notikusi: pastkaste nepieejama"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr "Pieprasītā darbība pārtraukta: kļūda izpildē"
 
-#: 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 "Lietotājs nav lokāls; lūdzu izmēģiniet <pārsūtītājceļš>"
 
-#: 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 "Pieprasītā darbība nav notikusi: nepietiekama vieta sistēmā"
 
-#: 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 ""
 "Pieprasītā pasta darbība pārtraukta: pārsniegta pieejamā glabātuves brīvā "
 "vieta"
 
-#: 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 "Pieprasītā darbība nav notikusi: pastkastes nosaukums nav atļauts"
 
-#: 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 "Sākt pasta ievadi; beigt ar <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr "Pāreja neizdevusies"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr "Nepieciešama paroles pāreja"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr "Autentifikācijas mehānisms ir par vāju"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Pieprasītajam autentifikācijas mehānismam pieprasīta kodēšana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr "Pagaidu autentifikācijas problēma"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "Pieprasīta autentifikācija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 msgid "Welcome response error"
 msgstr "Welcome atbildes kļūda"
 
-#: 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 "Neizdevās savienoties ar SMTP serveri %s drošības režīmā: %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 "serveris neatbalsta SSL protokolu"
 
-#: 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 pieprasījums iztecējis: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 msgid "STARTTLS response error"
 msgstr "STARTTLS atbildes kļūda"
 
-#: 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 serveris %s neatbalsta pieprasīto autentifikācijas tipu %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 "%sLūdzu ievadiet %s@%s SMTP paroli"
@@ -10214,7 +10296,7 @@ msgstr "SMTP pasta nosūtīšana caur  %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Nevar nosūtīt adresi: sūtītāja adrese nav pareiza."
 
-#: 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ūtam vēstuli"
 
@@ -10226,61 +10308,61 @@ msgstr "Nevaru nosūtīt vēstuli: nav norādīti adresāti."
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nevaru nosūtīt vēstuli: viens vai vairaki nepareizi adresāti"
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr "SMTP apsveikums (Greeting)"
 
-#: 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 pieprasījums iztecējis: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "HELO response error"
 msgstr "HELO atbildes kļūda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr "SMTP autentifikācija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr "Kļūda izveidojot SASL autentifikācijas objektu."
 
-#: 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 pieprasījums iztecējis: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr "AUTH pieprasījums neveiksmīgs."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr "Slikta autentifikācijas atbilde no servera.\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 pieprasījums iztecējis: %s: pasts nav nosūtīts"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM atbildes kļūda"
 
-#: 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 pieprasījums iztecējis: %s: pasts nav nosūtīts"
 
-#: 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) neizdevies"
 
-#: 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 pieprasījums iztecējis: %s: pasts nav nosūtīts"
@@ -10288,77 +10370,77 @@ msgstr "DATA pieprasījums iztecējis: %s: pasts nav nosūtīts"
 #. 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 atbildes kļūda"
 
-#: 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ūtijums iztecējis: vēstules pārtraukšana: %s: pasts nav nosūtīts"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 msgid "DATA termination response error"
 msgstr "DATA pārtraukuma atbildes kļūda"
 
-#: 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 pieprasījums iztecējis: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 msgid "RSET response error"
 msgstr "RSET atbildes kļūda"
 
-#: 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 pieprasījums iztecējis: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 msgid "QUIT response error"
 msgstr "QUIT atbildes kļūda"
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:102
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:113
+#: 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:371 mail/mail-display.c:227
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr "piesaistne"
 
-#: 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 "Izņemt izvēlētos priekšmetus no piesaistņu saraksta"
 
-#: composer/e-msg-composer-attachment-bar.c:551
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Pievienot piesaitni..."
 
-#: composer/e-msg-composer-attachment-bar.c:552
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "Piesaistīt failu vēstulei"
 
-#: 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 "Nevar piesaistīt failu %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 "Nevar piesaistīt failu %s: neregulārs fails"
@@ -10376,11 +10458,15 @@ msgid "MIME type:"
 msgstr "MIME tips:"
 
 #: 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 "Ieteikt automātisku piesaistnes attēlošanu"
 
-#: 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 "Uz adrešu grāmatu"
 
@@ -10391,45 +10477,45 @@ msgstr "Uz adrešu grāmatu"
 #. * 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 "Atbildēt Kam:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:411
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "No:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Subjekts:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:432
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Ievadiet vēstules adresātus"
 
-#: 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 "Ievadiet adreses kuras saņems vēstules kopiju"
 
-#: 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."
@@ -10440,24 +10526,25 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:447
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Publicēts uz:"
 
-#: composer/e-msg-composer-hdrs.c:449
+#: composer/e-msg-composer-hdrs.c:549
 msgid "Posting destination"
 msgstr "Publicējuma mērķis"
 
-#: composer/e-msg-composer-select-file.c:275
-#: ui/evolution-message-composer.h:26 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 "Piesaistīt failu"
 
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:533
 msgid "Could not create a PGP signature context"
 msgstr "Nevarēju izveidot PGP paraksta kontekstu"
 
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10466,34 +10553,30 @@ msgstr ""
 "Kļūda kāmēr lasot failu %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1160
-msgid "Warning!"
-msgstr "Brīdinājums!"
-
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Fails eksistē, pārrakstīt?"
 
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Kļūda saglabājot failu: %s"
 
-#: composer/e-msg-composer.c:1207
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Kļūda ielādējot failu: %s"
 
-#: composer/e-msg-composer.c:1240
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Kļūda atverot failu: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Nespēju saņemt vēstuli no redaktora"
 
-#: composer/e-msg-composer.c:1255
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10502,7 +10585,7 @@ msgstr ""
 "Nevar meklēt failā: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10511,7 +10594,16 @@ msgstr ""
 "Nevar samazināt failu: %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 ""
+"Nevar meklēt failā: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10520,7 +10612,7 @@ msgstr ""
 "Kļūda automātiski glabājot vēstuli: %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?"
@@ -10528,7 +10620,7 @@ msgstr ""
 "Ximian Evolution ir atradis nesaglabātus failus no iepriekšējās sesijas.\n"
 "Vai jūs gribētu tos atjaunot?"
 
-#: composer/e-msg-composer.c:1525
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10539,27 +10631,32 @@ msgstr ""
 "\n"
 "Vai jūs vēlaties saglabāt izmaiņas?"
 
-#: 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 "Brīdinājums: Mainīta vēstule"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Atvērt failu"
 
-#: composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:2015
 msgid "Signature:"
 msgstr "Paraksts:"
 
-#: 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 "Autoģenerēts"
 
-#: 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 "Uzrakstīt vēstuli"
 
-#: 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."
@@ -10567,7 +10664,7 @@ msgstr ""
 "Nevarēju izveidot sacerētāja logu:\n"
 "Neizdevās aktivizēt adrešu izvēlētāja kontroli."
 
-#: 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"
@@ -10579,7 +10676,7 @@ msgstr ""
 "Lūdzu pārliecinieties, ka jums ir uzstādītas gtkhtml\n"
 "un libgtkhtml pareizās versijas.\n"
 
-#: 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."
@@ -10587,25 +10684,13 @@ msgstr ""
 "Nevarēju izveidot sacerētāja logu:\n"
 "Nespēju aktivizēt HTML redaktora komponenti."
 
-#: composer/e-msg-composer.c:3860
+#: composer/e-msg-composer.c:4005
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 "<b>(Sacerētājs satur neteksta vēstules ķermeni, kas nevar tikt rediģēts.)<b>"
 
-#: composer/evolution-composer.c:394
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-"Nevarēju izveidot sacerētāja logu, tāpēc ka jūs neesat\n"
-"vēl konfigurējis nekādas identitātes pasta komponentē."
-
-#: composer/evolution-composer.c:413
-msgid "Cannot initialize the Evolution composer."
-msgstr "Nevaru inicializēt Evolution sacerētāju."
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Evolution programkopa"
@@ -10654,13 +10739,112 @@ msgstr "Subjekts satur"
 msgid "Subject does not contain"
 msgstr "Subjekts nesatur"
 
-#: e-util/e-component-listener.c:135
+#: 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 "Neatrodas Birojā"
+
+#: designs/OOA/ooa.glade.h:5
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Sākas:</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 "Neatrodas Birojā"
+
+#: designs/OOA/ooa.glade.h:13
+#, fuzzy
+msgid "Yes, Change Status"
+msgstr "Karodziņa statuss"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:2
+#, fuzzy
+msgid "<b>Receiving Email</b>"
+msgstr "Saņemu epastu"
+
+#: designs/read_receipts/read.glade.h:3
+#, fuzzy
+msgid "<b>Sending Email:</b>"
+msgstr "Sūtu epastu"
+
+#: 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 "Adresāti"
+
+#: 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 ""
 "ping_timeout_callback: nevarēju noteikt vai CORBA objekts ir nulle vai nav"
 
-#: e-util/e-dialog-utils.c:241 mail/mail-callbacks.c:2563
+#: e-util/e-dialog-utils.c:247
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10668,208 +10852,236 @@ msgstr ""
 "Fails ar šadu nosaukumu jau eksistē.\n"
 "Pārrakstīt to?"
 
-#: e-util/e-passwords.c:363
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "Pārrakstīt failu?"
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Atcerēties šo paroli"
 
-#: e-util/e-passwords.c:365
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Atcerēties šo paroli uz atlikušo sesiju"
 
-#: e-util/e-pilot-settings.c:96
+#: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
 msgstr "Sinh. privātos ierakstus:"
 
-#: e-util/e-pilot-settings.c:105
+#: e-util/e-pilot-settings.c:102
 msgid "Sync Categories:"
 msgstr "Sinh. kategorijas:"
 
 #. 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:183
-msgid "seconds"
-msgstr "sekundes"
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr "1 sekunde"
 
-#: filter/filter-datespec.c:71
-msgid "minute"
-msgstr "minūte"
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr "%d sekundes"
 
-#: filter/filter-datespec.c:72
-msgid "hour"
-msgstr "stunda"
+#: filter/filter-datespec.c:66
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 minūte"
 
-#: filter/filter-datespec.c:74
-msgid "week"
-msgstr "nedēļa"
+#: filter/filter-datespec.c:66
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "%d minūtes"
 
-#: filter/filter-datespec.c:74 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "nedēļas"
+#: filter/filter-datespec.c:67
+#, fuzzy
+msgid "1 hour ago"
+msgstr "1 stunda"
+
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d stundas"
+
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "1 day ago"
+msgstr "1 diena"
+
+#: filter/filter-datespec.c:68
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr "%d %s atpakaļ"
 
-#: filter/filter-datespec.c:75
-msgid "month"
+#: filter/filter-datespec.c:69
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 nedēļa"
+
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d nedēļas"
+
+#: filter/filter-datespec.c:70
+#, fuzzy
+msgid "1 month ago"
 msgstr "mēnesis"
 
-#: filter/filter-datespec.c:75 filter/filter.glade.h:23
-msgid "months"
-msgstr "mēneši"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr "%d %s atpakaļ"
 
-#: filter/filter-datespec.c:76
-msgid "year"
-msgstr "gads"
+#: filter/filter-datespec.c:71
+msgid "1 year ago"
+msgstr ""
 
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
-msgid "years"
-msgstr "gadi"
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr "%d %s atpakaļ"
 
-#: filter/filter-datespec.c:174
+#: filter/filter-datespec.c:176
 msgid "You must choose a date."
 msgstr "Jums jāizvēlās datumu."
 
-#: filter/filter-datespec.c:269
+#: filter/filter-datespec.c:275
 msgid "<click here to select a date>"
 msgstr "<klikšķini šeit, lai izvēlētos datumu>"
 
-#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
 msgid "now"
 msgstr "tagad"
 
 #. 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
 msgid "%d-%b-%Y"
 msgstr "%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 "%d %s atpakaļ"
-
-#: filter/filter-datespec.c:407
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Izvēlieties laiku ar ko salīdzināt"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Filtra noteikumi"
 
-#: filter/filter-file.c:178
-msgid "You must specify a file name"
+#: filter/filter-file.c:166
+#, fuzzy
+msgid "You must specify a file name."
 msgstr "Jums ir jānorāda faila vārds"
 
-#: 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 "Fails '%s' neeksistē vai arī nav regulārs fails."
 
-#: filter/filter-file.c:307
+#: filter/filter-file.c:298
 msgid "Choose a file"
 msgstr "Izvēlieties failu"
 
 #. and now for the action area
-#: filter/filter-filter.c:513
+#: filter/filter-filter.c:491
 msgid "Then"
 msgstr "Tad"
 
-#: filter/filter-filter.c:527
-msgid "Add action"
-msgstr "Pievienot darbību"
-
-#: filter/filter-folder.c:149
-msgid "You must specify a folder.\n"
+#: filter/filter-folder.c:155
+#, fuzzy
+msgid "You must specify a folder."
 msgstr "Jums ir jānorāda mape.\n"
 
-#: 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 "Izvēlēties mapi"
 
-#: filter/filter-input.c:200
+#: filter/filter-input.c:191
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10878,74 +11090,72 @@ msgstr ""
 "Kļūda neregulārajā izteiksmē '%s':\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
-#: mail/mail-config.glade.h:64
+#: 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 "Svarīgs"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:69
-#: mail/mail-config.glade.h:135
+#: 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 "Darbs"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:88
+#: 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 "Personīgi"
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:71
-#: mail/mail-config.glade.h:126
+#: 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 "Darāmais"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:68
+#: 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 "Vēlāk"
 
-#: 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 "Tests"
 
-#: filter/filter-rule.c:223
+#: filter/filter-rule.c:219
 msgid "You must name this filter."
 msgstr "Jums jānosauc šis filtrs."
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:751
 msgid "Rule name: "
 msgstr "Noteikuma nosaukums:"
 
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:755
 msgid "Untitled"
 msgstr "Nenosaukts"
 
-#: filter/filter-rule.c:785
+#: filter/filter-rule.c:772
 msgid "If"
 msgstr "Ja"
 
-#: filter/filter-rule.c:803
+#: filter/filter-rule.c:790
 msgid "Execute actions"
 msgstr "Aktivizēt darbības"
 
-#: filter/filter-rule.c:807
+#: filter/filter-rule.c:794
 msgid "if all criteria are met"
 msgstr "ja visi kritēriji sakrīt"
 
-#: filter/filter-rule.c:812
+#: filter/filter-rule.c:799
 msgid "if any criteria are met"
 msgstr "ja jebkuršs kritērijs sakrīt"
 
-#: filter/filter-rule.c:823
-msgid "Add criterion"
-msgstr "Pievienot kritēriju"
-
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "incoming"
 msgstr "ienākošais"
 
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "outgoing"
 msgstr "izejošais"
 
@@ -10993,7 +11203,7 @@ msgstr ""
 "Vēstules datums tiks salīdzināts ar\n"
 "pašreizējo laiku, kad notiks filtrēšana."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr "Virtuālās mapes"
 
@@ -11005,6 +11215,14 @@ msgstr "laiks, relatīvs attiecībā uz pašreizējo laiku"
 msgid "ago"
 msgstr "atpakaļ"
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "mēneši"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr "sekundes"
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "tikai specifiskas mapes"
@@ -11021,6 +11239,10 @@ msgstr "laiks, kuru jūs norādiet"
 msgid "vFolder Sources"
 msgstr "vMapes avoti"
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "nedēļas"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "ar visām akīvajām attālinātajām mapēm"
@@ -11033,6 +11255,10 @@ msgstr "ar visām lokālajām un aktīvajām attālinātajām mapēm"
 msgid "with all local folders"
 msgstr "ar visām lokālām mapēm"
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "gadi"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11158,7 +11384,7 @@ msgstr "nav"
 msgid "is not Flagged"
 msgstr "nav karogots"
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 msgid "Label"
 msgstr "Iezīme"
 
@@ -11186,7 +11412,7 @@ msgstr "Kanālot vēstuli uz čaulas komandu"
 msgid "Play Sound"
 msgstr "Spēlēt skaņu"
 
-#: 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 "Lasīt"
 
@@ -11214,12 +11440,12 @@ msgstr "atgriež lielāku kā"
 msgid "returns less than"
 msgstr "atgriež mazāk kā"
 
-#: 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 "Rezultāts"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1857
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "Sūtītajs"
 
@@ -11255,8 +11481,9 @@ msgstr "sākas ar"
 msgid "Stop Processing"
 msgstr "Apturēt procesēšanu"
 
-#: 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 "Subjekts"
 
@@ -11264,68 +11491,85 @@ msgstr "Subjekts"
 msgid "Unset Status"
 msgstr "Noņemt statusu"
 
-#: 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
+#, fuzzy, c-format
+msgid "Rule name '%s' is not unique, choose another."
+msgstr "Noteikuma nosaukums '%s' nav unikāls, izvēlieties citu"
+
+#: filter/rule-editor.c:170
 msgid "Rules"
 msgstr "Noteikumi"
 
-#: filter/rule-editor.c:239 filter/rule-editor.c:335
-#, c-format
-msgid "Rule name '%s' is not unique, choose another"
-msgstr "Noteikuma nosaukums '%s' nav unikāls, izvēlieties citu"
-
-#: filter/rule-editor.c:299
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Pievienot noteikumu"
 
-#: filter/rule-editor.c:388
+#: filter/rule-editor.c:372
 msgid "Edit Rule"
 msgstr "Rediģēt noteikumu"
 
-#: filter/score-editor.c:130
+#: filter/rule-editor.c:689
+#, fuzzy
+msgid "Rule name"
+msgstr "Noteikuma nosaukums:"
+
+#: filter/score-editor.c:114
 msgid "Score Rules"
 msgstr "Rezultāta noteikumi"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 msgid "You must name this vfolder."
 msgstr "Jums jānosauc šī vmape."
 
-#: filter/vfolder-rule.c:215
-msgid "You need to specify at least one folder as a source."
+#: filter/vfolder-rule.c:222
+#, fuzzy
+msgid "You need to to specify at least one folder as a source."
 msgstr "Jums jānorāda vismaz viena mape kā avots."
 
-#: importers/elm-importer.c:95
+#: filter/vfolder-rule.c:499
+#, fuzzy
+msgid "VFolder source"
+msgstr "vMapes avoti"
+
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importē jūsu veco Eim pastu"
 
 #: 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 "Importēju..."
 
 #: 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 "Lūdzu uzgaidiet"
 
 #: 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 "Importējam %s kā %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 "Skanējam %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 "Pasts"
 
-#: 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 +11577,7 @@ msgstr ""
 "Evolution ir atradis Elm pasta failus\n"
 "Vai jūs vēlaties, lai tie tiktu importēti Evolution?"
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Eim"
 
@@ -11345,12 +11589,12 @@ msgstr ""
 "Evolution ir atradusi GnomeCard failus.\n"
 "Vai jūs vēlaties, lai tie tiktu importēti Evolution? "
 
-#: importers/netscape-importer.c:70
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritātes filtrs \"%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"
@@ -11376,7 +11620,7 @@ msgstr ""
 "vietā. Pārbaudiet importētos filtrus, lai pārliecinātos,\n"
 "kas viss strādā kā plānots."
 
-#: 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"
@@ -11388,7 +11632,7 @@ msgstr ""
 "\"Watch Thread\" (Skatīt pavedienu)\n"
 "iespēju, kas netiek atbalstīta Evolution. Šie filtri tiks ignorēti."
 
-#: 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"
@@ -11402,37 +11646,39 @@ msgstr ""
 "tiks pārveidoti ar vienkāršu testu, kas pārbaudīs, vai virkne ir\n"
 "vai nav vēstules ķermenī."
 
-#: 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 importē jūsu vecos Netscape datus"
 
 #. 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 "Atkritummape"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Skanēju pasta filtrus"
 
 #: 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 "Skanējam direktoriju"
 
-#: 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 "Sākam importu"
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Uzstādījumi"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 msgid "Mail Filters"
 msgstr "Pasta filtri"
 
-#: 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?"
@@ -11440,11 +11686,11 @@ msgstr ""
 "Evolution ir atradis Netscape pasta failus.\n"
 "Vai jūs vēlaties, lai tie tiktu importēti 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 importē jūsu vecos Pine datus"
 
-#: 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?"
@@ -11452,126 +11698,123 @@ msgstr ""
 "Evolution ir atradis Pine pasta failus.\n"
 "Vai jūs vēlaties, lai tie tiktu importēti 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 "Sacerētāja preferences"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Konfigurācijas kontrole Evolution attēlošanas fontiem."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Konfigurācijas kontrole Evolution pasta kontiem."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Konfigurācijas kontrole Evolution pastniekam."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Konfigurācijas kontrole Evolution vēstuļu sacerētājam."
-
-#: 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 ""
 "Šeit konfigurējiet pasta preferences, ieskaitot drošību un vēstuļu attēlošanu"
 
-#: 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 ""
 "Šeit konfigurējiet pareizrakstības pārbaudi, parakstus un vēstuļu sacerētājam"
 
-#: 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 "Šeit konfigurējiet Evolution izmantotos fontus"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configure your email accounts here"
 msgstr "Šeit konfigurējiet jūsu epasta kontus"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Evolution komponente pasta parvāldīšanai."
+#: 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 "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
 
-#: 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 pasta sacerētājs."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Evolution pasta izpildkopsavilkuma komponente."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolution pasta sacerētājs."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Evolution pasta mapes attēlošanas komponents."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
-msgstr "Evolution pasta mapes ražotnes komponents."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Pasta konfigurēšanas saskarne"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
-msgstr "Evolution sacerētāja ražotne."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution pasta mapes attēlošanas komponents."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
-msgstr "Pasta kopsavilkuma komponentes ražotne."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution pasta izpildkopsavilkuma komponente."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 msgid "Font Preferences"
 msgstr "Fontu preferences"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
 msgid "Mail Accounts"
 msgstr "Pasta konti"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:71
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
 msgid "Mail Preferences"
 msgstr "Pasta Preferences"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-msgid "Mail configuration interface"
-msgstr "Pasta konfigurēšanas saskarne"
-
-#: mail/component-factory.c:102
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Mape, kura satur pastu"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "Publisks pasts"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "Publiska pastu saturoša mape"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Virtuālā Atkritummape"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Virtuālā atkritumu mape"
 
-#: mail/component-factory.c:132
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Šī mape nevar saturēt ziņojumus."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Rekvizīti..."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Izmainīt šīs mapes rekvizītus"
 
-#: mail/component-factory.c:811
+#: mail/component-factory.c:818
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11579,239 +11822,223 @@ msgstr ""
 "Kādi no pasta uzstādījumiem ir nepareizi, lūdzu pārbaudiet vai viss ir "
 "kārtībā."
 
-#: mail/component-factory.c:976
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "Jūs neesat uzstādījis pasta transporta metodi"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Jums ir nenosūtītas vēstules, vai jūs vēlaties iziet jebkurā gadījumā?"
 
-#: mail/component-factory.c:1004
-msgid "Warning: Unsent Messages"
-msgstr "Brīdinājums: nenosūtītas vēstules"
-
-#: mail/component-factory.c:1046
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Jauna pasta vēstule"
 
-#: mail/component-factory.c:1046
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "_Pasta vēstule"
 
-#: mail/component-factory.c:1047
+#: mail/component-factory.c:1061
 msgid "Compose a new mail message"
 msgstr "Sacerēt jaunu pasta vēstuli"
 
-#: mail/component-factory.c:1055
+#: mail/component-factory.c:1069
 msgid "New Message Post"
 msgstr "Jauna vēstules publicēšana"
 
-#: mail/component-factory.c:1055
+#: mail/component-factory.c:1069
 msgid "_Post Message"
 msgstr "_Publicēt vēstuli"
 
-#: mail/component-factory.c:1056
+#: mail/component-factory.c:1070
 msgid "Post a new mail message"
 msgstr "Publicēt jaunu pasta vēstuli"
 
-#: mail/component-factory.c:1084
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Nevaru inicializēt Evolution pasta komponenti."
-
-#: mail/component-factory.c:1093
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Nevar initializēt Evolution pasta konfigurācijas komponentu."
-
-#: mail/component-factory.c:1099
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Nevar initializēt Evolution mapes informatīvo komponentu."
-
-#: mail/component-factory.c:1344 mail/component-factory.c:1374
+#: mail/component-factory.c:1353
 msgid "Connecting..."
 msgstr "Savienojos..."
 
-#: mail/component-factory.c:1385
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Nevar reģistrēt glabātuvi ar čaulu"
 
-#: mail/folder-browser-ui.c:471
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr " \"%s\" Rekvizīti"
 
-#: mail/folder-browser-ui.c:473
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Rekvizīti"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:381 mail/mail-display.c:893
+#: 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 "Nevar izveidot pagaidu direktoriju: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr "%d jaunas"
 
-#: 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 slēptas"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:789
 #, c-format
 msgid "%d visible"
 msgstr "%d redzamas"
 
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:794
 #, c-format
 msgid "%d selected"
 msgstr "%d izvēlētas"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr "%d nenosūtītas"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d sent"
 msgstr "%d nosūtītas"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr "%d kopā"
 
-#: mail/folder-browser.c:1118
+#: mail/folder-browser.c:1182
 msgid "Create _Virtual Folder From Search..."
 msgstr "Izveidot _virtuālo mapi no meklējuma..."
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "VMape ar subjektu"
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "VMape ar sūtītāju"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "Vmape a_r adresātiem"
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "VMape ar adresātu sarakstu"
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "Filtrs uz subjektu"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "Filtrs uz sūtītāju"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "Filtrs uz saņēmējiem"
 
-#: 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 "Filtrs uz adresātu sarakstu"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "R_ediģēt kā jaunu ziņojumu..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "_Drukāt"
 
-#: 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 "_Atbildēt sūtītājam"
 
-#: 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 "Atbildēt uz _sarakstu"
 
-#: 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 "Atbildēt _visiem"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "_Pārsūtīt"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1770
 msgid "Follo_w Up..."
 msgstr "S_ekojums..."
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1771
 msgid "Fla_g Completed"
 msgstr "Ka_rodziņš pabeigts"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1772
 msgid "Cl_ear Flag"
 msgstr "Notīrī_t karodziņu"
 
 #. 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 "A_tzīmēt kā lasītu"
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1777
 msgid "Mark as _Unread"
 msgstr "Atzīmēt kā _nelasītu"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "Atzīmēt kā _svarīgu"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1779
 msgid "_Mark as Unimportant"
 msgstr "Atzīmēt kā ne_svarīgu"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1784
 msgid "U_ndelete"
 msgstr "_Atdzēst"
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1788
 msgid "Mo_ve to Folder..."
 msgstr "Pār_vietot uz mapi..."
 
-#: 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 "_Kopēt uz mapi..."
 
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1797
 msgid "Add Sender to Address_book"
 msgstr "Pievienot sūtītāju adrešu _grāmatai"
 
-#: mail/folder-browser.c:1774
+#: mail/folder-browser.c:1801
 msgid "Appl_y Filters"
 msgstr "A_ttiecināt filtrus"
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1805
 msgid "Crea_te Rule From Message"
 msgstr "_Izveidot noteikumu no vēstules"
 
-#: mail/folder-browser.c:2036
+#: mail/folder-browser.c:2064
 msgid "VFolder on M_ailing List"
 msgstr "VMape pasta _sarakstei"
 
-#: mail/folder-browser.c:2038
+#: mail/folder-browser.c:2066
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrs pasta _sarakstei (%s)"
 
-#: mail/folder-browser.c:2039
+#: mail/folder-browser.c:2067
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VMape p_asta sarakstei (%s)"
@@ -11820,25 +12047,41 @@ msgstr "VMape p_asta sarakstei (%s)"
 msgid "Default"
 msgstr "Noklusētais"
 
-#: mail/folder-info.c:71
+#: mail/folder-info.c:70
 msgid "Getting Folder Information"
 msgstr "Dabūju informāciju par mapi"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "Ražotne, lai importētu mbox Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Evolution pasta sacerētājs."
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolution pasta sacerētājs."
+
+#: 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 pasta sacerētājs."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Importē mbox failus 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 "Ražotne, lai importētu Outlook Express 4 pastu 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 "Importē Outlook Express 4 failus Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Evolution pasta sacerētājs."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -11874,101 +12117,96 @@ 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 "Jūs neesat aizpildijis visu pieprasīto informāciju."
 
 #. 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 kontu redaktors"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:159
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Hosts:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Lietotājvārds:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "_Ceļš:"
 
-#: mail/mail-account-gui.c:1847
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr "Jūs nevarat izveidot divus kontus ar vienādiem nosaukumiem."
 
-#: mail/mail-accounts.c:224
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties izdzēst šo kontu?"
 
-#: mail/mail-accounts.c:228
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "Nedzēst"
 
-#: mail/mail-accounts.c:231
-msgid "Really delete account?"
-msgstr "Tiešām dzēst kontu?"
-
-#: 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 "Deaktivizēt"
 
-#: 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 "Aktivizēt"
 
-#: mail/mail-accounts.c:467
+#. translators: default account indicator
+#: mail/mail-accounts.c:433
 msgid "[Default]"
 msgstr "[Noklusētais]"
 
-#: mail/mail-accounts.c:538 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 "Aktivizēts"
 
-#: mail/mail-accounts.c:539 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Konta nosaukums"
 
-#: mail/mail-accounts.c:540 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protokols"
 
-#: mail/mail-autofilter.c:78
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Pasts uz %s"
 
-#: mail/mail-autofilter.c:242
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Subjekts ir %s"
 
-#: mail/mail-autofilter.c:258
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Pasts no %s"
 
-#: mail/mail-autofilter.c:275
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s pasta sarakste"
 
-#: mail/mail-autofilter.c:327
+#: mail/mail-autofilter.c:323
 msgid "Add Filter Rule"
 msgstr "Pievienot filtra noteikumus"
 
-#: mail/mail-autofilter.c:376
+#: mail/mail-autofilter.c:372
 msgid "The following filter rule(s):\n"
 msgstr "Sekojoši filtru noteikumi:\n"
 
-#: mail/mail-autofilter.c:382
+#: mail/mail-autofilter.c:378
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11979,7 +12217,12 @@ msgstr ""
 "    '%s'\n"
 "Un tiek atjaunota."
 
-#: 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 "Nerādīt šo ziņu vēlreiz."
+
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11991,7 +12234,16 @@ msgstr ""
 "saņemt vai sacerēt pastu.\n"
 "Vai jūs vēlētos nokonfigurēt to tagad?"
 
-#: 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 ""
+"Jums vajag konfigurēt identitāti,\n"
+"pirms jūs varēsiet sacerēt vēstuli."
+
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11999,7 +12251,7 @@ msgstr ""
 "Jums vajag konfigurēt identitāti,\n"
 "pirms jūs varēsiet sacerēt vēstuli."
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -12008,7 +12260,7 @@ msgstr ""
 "pirms jūs saceriet pastu."
 
 #. 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"
@@ -12016,11 +12268,11 @@ msgstr ""
 "Jūs sūtat HTML formatētu vēstuli. Lūdzu pārliecinieties, vai\n"
 "sekojoši adresāti vēlas un spēj saņemt HTML pastu:\n"
 
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "Sūtīt jebkurā gadījumā?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12028,7 +12280,7 @@ msgstr ""
 "Šai vēstulei nav virsraksta.\n"
 "Patiešām nosūtīt?"
 
-#: 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."
@@ -12036,11 +12288,11 @@ msgstr ""
 "Tā kā kontaktu saraksts, uz kuru jūs sūtiet, ir konfigurēts slēpt saraksta "
 "adreses, šī vēstule saturēs tikai bcc adresātus."
 
-#: mail/mail-callbacks.c:360
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr "Šī vēstule satur tikai Bcc adresātus."
 
-#: 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"
@@ -12050,11 +12302,11 @@ msgstr ""
 "Apparently-To (Acīmredzot uz) galveni.\n"
 "Sūtīt jebkurā gadījumā?"
 
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr "Jums jānorāda adresāti, lai nosūtītu šo vēstuli."
 
-#: 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?"
@@ -12062,28 +12314,28 @@ msgstr ""
 "Nevaru atvērt melnraksta mapi šim kontam.\n"
 "Vai jūs vēlaties izmantot noklusēto melnrakstu mapi?"
 
-#: mail/mail-callbacks.c:1233
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "nezināms nosūtītājs"
 
-#: mail/mail-callbacks.c:1237
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%Y-%m-%d at %H:%M, %%s rakstīja:"
 
-#: mail/mail-callbacks.c:1738 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr "Pārvietot vēstuli(es) uz"
 
-#: mail/mail-callbacks.c:1740 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr "Kopēt vēstuli(es) uz"
 
-#: mail/mail-callbacks.c:2407
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties rediģēt visas %d vēstules?"
 
-#: mail/mail-callbacks.c:2432
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12091,7 +12343,7 @@ msgstr ""
 "Jums vajadzētu rediģēt tikai Melnraksta\n"
 "mapē noglabātās vēstules."
 
-#: mail/mail-callbacks.c:2471
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12099,43 +12351,46 @@ msgstr ""
 "Jūs varat pārsūtīt vēlreiz tikai\n"
 "tās vēstules, kas atrodas 'Nosūtītas' mapē."
 
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Vai jūs vēlaties pārsūtīt vēlreiz visas %d vēstules?"
 
-#: mail/mail-callbacks.c:2511
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "Nav izvēlēta vēstule"
 
-#: mail/mail-callbacks.c:2556 mail/mail-display.c:189
-msgid "Overwrite file?"
-msgstr "Pārrakstīt failu?"
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"Nevar dabūt vēstuli: %s\n"
+"  %s"
+
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Fails '%s' jau eksistē.\n"
+"Pārrakstīt to?"
 
-#: mail/mail-callbacks.c:2610
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "Saglabāt vēstuli kā..."
 
-#: mail/mail-callbacks.c:2612
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "Saglabāt vēstules kā..."
 
-#: mail/mail-callbacks.c:2681
-msgid "Go to next folder with unread messages?"
-msgstr "Doties uz nākamo mapi ar neizlasītām vēstulēm?"
-
-#: mail/mail-callbacks.c:2688
-msgid ""
-"There are no more new messages in this folder.\n"
-"Would you like to go to the next folder?"
-msgstr ""
-"Šajā mapē nav vairs jaunu vēstuļu.\n"
-"Vai jūs vēlētos doties uz nākamo mapi?"
-
-#: mail/mail-callbacks.c:2931
+#: 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 ""
@@ -12144,7 +12399,7 @@ msgstr ""
 "\n"
 "Patiešām izdzēst šīs vēstules?"
 
-#: mail/mail-callbacks.c:3044
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12153,64 +12408,64 @@ msgstr ""
 "Kļūda ielādējot filtra informāciju:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3056
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:3100
+#: mail/mail-callbacks.c:2831
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d. lapa no %d"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "Drukāt vēstuli"
 
-#: mail/mail-callbacks.c:3182
-msgid "US-Letter"
-msgstr "US-Letter"
-
-#: mail/mail-callbacks.c:3223
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "Vēstules drukāšana neizdevās"
 
-#: mail/mail-callbacks.c:3413
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Vai jūs esat pārliecināts, ka vēlaties atvērt visas %d vēstules atsevišķos "
 "logos?"
 
-#: mail/mail-composer-prefs.c:223
-msgid ""
-"Please specify signature filename\n"
-"in Advanced section of signature settings."
-msgstr ""
-"Lūdzu norādiet paraksta faila nosaukumu\n"
-"Paplašināti sekcijā, parakstu uzstādījumos."
-
-#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
-#: mail/mail-composer-prefs.c:416
-msgid " [script]"
-msgstr " [skripts]"
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
+msgid "Unnamed"
+msgstr "Bezvārda"
 
-#: mail/mail-composer-prefs.c:309
-msgid "Please specify a valid script name"
+#: mail/mail-composer-prefs.c:335
+#, fuzzy
+msgid "You must specify a valid script name."
 msgstr "Lūdzu norādiet atļautu skripta nosaukumu"
 
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
-msgid "Unnamed"
-msgstr "Bezvārda"
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
+#, fuzzy
+msgid "[script]"
+msgstr " [skripts]"
+
+#: mail/mail-composer-prefs.c:864
+#, fuzzy
+msgid "Language(s)"
+msgstr "Valoda"
 
-#: mail/mail-composer-prefs.c:880
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr "Pievienot skripta parakstu"
 
-#: mail/mail-composer-prefs.c:881
-msgid "Add Signature"
-msgstr "Pievienot parakstu"
+#: mail/mail-composer-prefs.c:926
+#, fuzzy
+msgid "Signature(s)"
+msgstr "_Paraksti"
 
-#: mail/mail-config-druid.c:146
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr "Identitāte"
+
+#: 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 "
@@ -12220,7 +12475,12 @@ msgstr ""
 "tikt neaizpildīti, kāmēr jūs nevēlaties iekļaut šo informāciju epastā ko "
 "nosūtāt."
 
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "_Saņemot pastu"
+
+#: 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."
@@ -12229,11 +12489,16 @@ msgstr ""
 "neesat pārliecināti, prasiet jūsu sistēmu administrātoram vai Internet "
 "servisa piegādātājam."
 
-#: mail/mail-config-druid.c:150
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Lūdzu izvēlieties starp sekojošām opcijām"
 
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:400
+#, fuzzy
+msgid "Sending Mail"
+msgstr "_Sūtot pastu"
+
+#: 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."
@@ -12242,7 +12507,11 @@ msgstr ""
 "pārliecināti, prasiet jūsu sistēmu administrātoram vai Internet servisa "
 "piegādātājam."
 
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "Kontu pārvaldība"
+
+#: 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 "
@@ -12256,21 +12525,11 @@ msgstr ""
 "kontu. Lūdzu ievadiet konta nosaukumu laukumā zemāk. Šis nosaukums tiks "
 "izmantots tikai attēlošanas nolūkos."
 
-#. set window title
-#: mail/mail-config-druid.c:638
-msgid "Evolution Account Assistant"
-msgstr "Evolution kontu asistents"
-
-#: mail/mail-config.c:622
-#, c-format
-msgid "Account %d"
-msgstr "Konts %d"
-
-#: mail/mail-config.c:2316
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Pārbaudam servisu"
 
-#: 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 "Savienojamies ar serveri..."
 
@@ -12286,14 +12545,10 @@ msgstr "(SSL nav vēl atbalstīts šajā Evolution kompilējumā)"
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL nav vēl atbalstīts šajā Evolution kompilējumā)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "_Vienmēr kodēt uz mani, sūtot kodētu pastu"
 
-#: mail/mail-config.glade.h:7
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr "AaĀāBbCcČčDdEeĒēGgĢģHhĪīJjKkĶķĻļMmNnŅņOoPpRrSsTtUuŪūVvZzŽž"
-
 #: mail/mail-config.glade.h:8
 msgid "Account Editor"
 msgstr "Kontu redaktors"
@@ -12302,10 +12557,6 @@ msgstr "Kontu redaktors"
 msgid "Account Information"
 msgstr "Kontu informācija"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "Kontu pārvaldība"
-
 #: mail/mail-config.glade.h:11
 msgid "Add Sc_ript"
 msgstr "Pievienot sk_riptu"
@@ -12387,13 +12638,14 @@ msgid "Configuration"
 msgstr "Konfigurācija"
 
 #: 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 ""
 "Apsveicu, jūsu pasta konfigurēšana ir pabeigta.\n"
 "\n"
@@ -12430,7 +12682,7 @@ msgstr "Necitēt oriģinālo vēstuli"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Neparakstīt _sanāksmju pieprasījumus (savietojamībai ar 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 "Izdarīts"
 
@@ -12458,6 +12710,10 @@ msgstr "Epasta _adrese:"
 msgid "Empty _trash folders on exit"
 msgstr "Iztukšot _atkritumu mapes pie iziešanas"
 
+#: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr "Evolution kontu asistents"
+
 #: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Izpildīt komandu..."
@@ -12486,10 +12742,6 @@ msgstr "Izcelt _citātus ar"
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr "Identitāte"
-
 #: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Iekļaut"
@@ -12523,6 +12775,11 @@ msgid "Message Display"
 msgstr "Vēstules attēlošana"
 
 #: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Vēstule satur"
+
+#: mail/mail-config.glade.h:76
 msgid "Microsoft"
 msgstr "Microsoft"
 
@@ -12538,146 +12795,138 @@ msgstr ""
 "Piezīme: jums nepieprasīs ievadīt paroli līdz jūs savienosieties pirmo reizi"
 
 #: mail/mail-config.glade.h:81
-msgid "On Screen fonts"
-msgstr "Ekrāna fonti"
-
-#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Optionāla informācija"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:83
 msgid "Or_ganization:"
 msgstr "Or_ganizācija:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Atslēgas ID:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Izvēlies krāsu"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:89
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Norādīt, kad sūta vēstules tikai ar norādītiem _bcc adresātiem"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:90
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:91
 msgid "Printed Fonts"
 msgstr "Drukātie fonti"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:93
 msgid "Quote original message"
 msgstr "Citēt oriģinālo vēstuli"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr "Citēts"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr "Atc_erēties šo paroli"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:96
 msgid "Re_ply-To:"
 msgstr "At_bildēt-Uz:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr "Saņemu epastu"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:98
 msgid "Receiving _Options"
 msgstr "Saņemšanas _opcijas"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:99
 msgid "Remember this _password"
 msgstr "Atcerēties šo _paroli"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "Pieprasītā informācija"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:101
 msgid "Restore Defaults"
 msgstr "Atjaunot noklusējumus"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:103
 msgid "S_ecurity"
 msgstr "_Drošība"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "Drošais MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr "Izvēlieties HTML fiksēta platuma fontu"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr "Izvēlieties HTML fiksēta platuma fontu drukāšanai"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr "Izvēlieties HTML mainīga platuma fontu"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr "Izvēlieties HTML mainīga platuma fontu drukāšanai"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
 msgstr "Sūtu epastu"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "Nosūtīto _ziņu mape:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "Nosūtītās un melnraksta vēstules"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris pieprasa autentikāciju"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Servera konfigurācija"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "Servera _tips: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:116
 msgid "Shortcuts _type:"
 msgstr "Saīsinājumu _tips:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:117
 msgid "Specify _filename:"
 msgstr "Norādiet _faila nosaukumu:"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell Checking Language"
-msgstr "Pareizrakstības pārbaudes valoda"
-
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr "_Pareizrakstības pārbaude"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Standarta Unix mbox"
 
-#: mail/mail-config.glade.h:122
+#: 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"
@@ -12687,7 +12936,7 @@ msgstr ""
 "paraksts. Nosaukums, kuru norādīsiet, tiks\n"
 "izmantots tikai attēlošanas nolūkos."
 
-#: mail/mail-config.glade.h:125
+#: 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 "
@@ -12697,7 +12946,7 @@ msgstr ""
 "Valodu saraksts šeit parāda tikai tās valodas, kurām jums ir uzstādīta "
 "vārdnīca."
 
-#: mail/mail-config.glade.h:127
+#: 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\""
@@ -12705,177 +12954,184 @@ msgstr ""
 "Ievadiet nosaukumu, kādu jūs gribētu piešķirt šim kontam.\n"
 "Piemēram: \"Darbs\" vai \"Personīgi\""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "_Mainīgs platums:"
 
-#: mail/mail-config.glade.h:131
+#: 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 ""
 "Esiet laipni aicināti Evoltion Pasta Konfigurācijas Asistentā.\n"
 "\n"
 "Klikšķiniet \"Nākošais\" lai sāktu."
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Pievienot parakstu"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Vienmēr ielādēt attēlus no tīkla"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Vienmēr parakstīt izejošās vēstules, kad izmanto šo kontu"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Autentifikācijas tips:"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Autentifikācijas tips:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "_Automātiski parbaudīt jauno pastu"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Automātiski ievietot smaidiņu attēlus"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Pīkstēt, kad ir saņemts jauns pasts"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "_Sertifikāta ID:"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr "_Apstiprināt, iztīrot mapi"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Default signature:"
 msgstr "_Noklusētais paraksts:"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Defaults"
 msgstr "_Noklusētie"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr "Neziņojiet _man, kad ierodas jauns pasts"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Enable"
 msgstr "_Aktivizēt"
 
-#: mail/mail-config.glade.h:154
-msgid "_Fixed-width:"
-msgstr "_Fiksēts platums:"
-
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Forward style:"
 msgstr "_Pārsūtīšanas stils:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "_Pilns vārds:"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr "_HTML pasts"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr "_Identitāte"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "_Ielādēt attēlus, ja sūtītājs ir adrešu grāmatā"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "_Padarīt šo par manu noklusēto kontu"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "_Atzīmēt vēstules kā lasītas pēc"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Vārds:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "_Nekad neielādēt attēlus no tīkla"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr "_Spēlēt skaņas failu, kad tiek saņemts jauns pasts"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Norādīt, kad sūta HTML vēstules kontaktiem, kuri to nevēlas"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Norādīt, kad sūta vēstules ar tukšu subjekta rindu"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr "_Saņemot pastu"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "_Atbildes stils:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr "_Atjaunot noklusējumus"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Skripts:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "_Sūtot pastu"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Rādīt kustīgos attēlus"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Paraksti"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "Sand Point"
+
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "Oriģinālais kontakts:"
+
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "_Lietot drošu savienojumu (SSL):"
 
-#: mail/mail-config.glade.h:178
-msgid "_Variable-width:"
-msgstr "_Mainīgs platums:"
+#: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:178
 msgid "_every"
 msgstr "_katru"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr "krāsa"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "apraksts"
 
@@ -12899,7 +13155,7 @@ msgstr "Nevarēja izveidot S/MIME aploksnes kontekstu."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nevarēja izveidot S/MIME atkodēšanas kontekstu."
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:193
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -12908,181 +13164,177 @@ msgstr ""
 "Fails '%s' jau eksistē.\n"
 "Pārrakstīt to?"
 
-#: mail/mail-display.c:326
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Saglabāt piesaistni"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:406
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Nevarēju izveidot pagaidu failu '%s': %s"
 
-#: mail/mail-display.c:437
+#: mail/mail-display.c:454
 msgid "Save Attachment..."
 msgstr "Saglabāt piesaistni..."
 
-#: mail/mail-display.c:438
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr "Skatīt iekļauti"
 
-#: mail/mail-display.c:439
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "Atvērt ar %s..."
 
-#: mail/mail-display.c:499
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Skatīt iekļauti (via %s)"
 
-#: mail/mail-display.c:503
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "Slēpt"
 
-#: mail/mail-display.c:524
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "Ārējais skatītājs"
 
-#: mail/mail-display.c:1320
+#: mail/mail-display.c:1365
 msgid "Downloading images"
 msgstr "Ielādēju attēlus"
 
-#: mail/mail-display.c:1497
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "Ielādējam vēstules saturu"
 
-#: mail/mail-display.c:1784
+#: mail/mail-display.c:1879
 msgid "Overdue:"
 msgstr "Nokavētie:"
 
-#: mail/mail-display.c:1788
+#: mail/mail-display.c:1883
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "līdz %B %d, %Y, %l:%M %P"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Kopēt saiti pārlūkprogrammā"
 
-#: mail/mail-display.c:2116
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Kopēt saites lokāciju"
 
-#: mail/mail-display.c:2118
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Saglabāt saiti kā (FIXME)"
 
-#: mail/mail-display.c:2120
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Saglabāt attēlu kā..."
 
-#: mail/mail-folder-cache.c:743
+#: mail/mail-folder-cache.c:744
 #, c-format
 msgid "Pinging %s"
 msgstr "Ehotestējam %s"
 
-#: mail/mail-format.c:656
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr "%s piesaistne"
 
-#: 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 "Nevarēju noparsēt MIME vēstuli. Attēloju kā avotu."
 
-#: 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 "Datums"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr "Slikta adrese"
 
-#: 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 "No"
 
-#: mail/mail-format.c:917
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Atbildēt-Uz"
 
-#: 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 "Kam"
 
-#: 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
-msgid "Mailer"
-msgstr "Pastnieks"
-
-#: mail/mail-format.c:1848
+#: mail/mail-format.c:1451
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Šī vēstule ir digitāli parakstīta. Klikšķiniet uz slēdzenes ikonu, lai "
 "uzzinātu vairāk."
 
-#: mail/mail-format.c:1875
+#: mail/mail-format.c:1479
 msgid "Could not create a PGP verfication context"
 msgstr "Nevarēju izveidot PGP pārbaudes kontekstu"
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Šī vēstule ir digitāli parakstīta un ir autentiska."
 
-#: 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 ""
 "Šī vēstule ir digitāli parakstīta, bet nevar tikt pārbaudīta, vai ir "
 "autnetiska."
 
-#: mail/mail-format.c:2157
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Norāde uz FTP saiti (%s)"
 
-#: mail/mail-format.c:2171
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Norāde uz lokālu failu (%s) atļautu saitē \"%s\""
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Norāde uz lokālu failu (%s)"
 
-#: mail/mail-format.c:2205
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Norāde uz attālinātiem datiem (%s)"
 
-#: mail/mail-format.c:2213
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Norāde uz nezināmiem ārējiem datiem (\"%s\" tips)"
 
-#: mail/mail-format.c:2218
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr "Sliktformēta ārējā ķermeņa daļa."
 
-#: mail/mail-local.c:539 mail/mail-local.c:541
+#: mail/mail-local.c:537 mail/mail-local.c:539
 #, c-format
 msgid "Local folders/%s"
 msgstr "Lokālās mapes/%s"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr "Pārkonfigurēju mapi"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:748
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13091,12 +13343,12 @@ msgstr ""
 "Nevaru saglabāt mapes metainfo; jūs, iespējams, vairs\n"
 "nevarēsiet atvērt šo mapi: %s: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:804
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nevaru saglabāt mapes metainfo uz %s: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Nevaru izdzēst mapes metadatus %s: %s"
@@ -13106,7 +13358,7 @@ msgstr "Nevaru izdzēst mapes metadatus %s: %s"
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Izmainu mapes formātu no \"%s\" uz \"%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."
@@ -13114,12 +13366,12 @@ msgstr ""
 "Ja jūs vairāk nevariet atvērt šo pastkasti, tad\n"
 "tā jums varētu būt jāsalabo manuāli."
 
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Pārkonfigurēt /%s"
 
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
 msgstr "Jūs nevariet mainīt nelokālas mapes formātu."
 
@@ -13141,108 +13393,108 @@ msgstr ""
 "Kļūda izpildot operāciju:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Strādāju"
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Filtrējam mapi"
 
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Pasta saņemšana"
 
-#: 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 "Kaut arī, vēstule tika veiksmīgi nosūtīta."
 
-#: mail/mail-ops.c:618
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sūtu \"%s\""
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sūtam %d. vēstuli no %d"
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Kļūda pie %d vēstules no %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 "Izpildīts."
 
-#: mail/mail-ops.c:853
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Saglabāju vēstuli mapē"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Pārvietoju vēstules uz %s"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopēju vēstules uz %s"
 
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanēju mapes \"%s\""
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Pārsūtītās vēstules"
 
-#: mail/mail-ops.c:1277
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atveru mapi %s"
 
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "Atveru glabātuvi %s"
 
-#: mail/mail-ops.c:1422
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Izņemu mapi %s"
 
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Glabāju mapi '%s'"
 
-#: mail/mail-ops.c:1567
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Atjauninu mapi"
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1594
 msgid "Expunging folder"
 msgstr "Iztīru mapi"
 
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Saņemu vēstuli %s"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Saņemu %d vēstuli(es)"
 
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1801
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Saglabāju %d vēstuli(es)"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13251,7 +13503,7 @@ msgstr ""
 "Nevaru izveidot izejas failu: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13260,11 +13512,11 @@ msgstr ""
 "Kļūda glabājot vēstules uz: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "Saglabājam piesaistni"
 
-#: mail/mail-ops.c:2041
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13273,54 +13525,54 @@ msgstr ""
 "Nevaru izveidot izejas failu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2071
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nevarēju ierakstīt datus: %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atvienojos no %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Pārvienojos ar %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "_Meklēt"
-
-#: mail/mail-search.c:137
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(Nenosaukta vēstule)"
 
-#: mail/mail-search.c:240
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "Nenosaukta vēstule"
 
-#: mail/mail-search.c:244
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "Tukša vēstule"
 
-#: mail/mail-search.c:291
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "Meklēt vēstulē"
 
-#: mail/mail-search.c:321
+#: mail/mail-search.c:285
+msgid "Search"
+msgstr "Meklēšana"
+
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "Reģistrjūtīgs"
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr "Meklēt uz priekšu"
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "Meklēt:"
 
-#: mail/mail-search.c:346
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "Atbilstumi:"
 
@@ -13328,68 +13580,64 @@ msgstr "Atbilstumi:"
 msgid "Cancelling..."
 msgstr "Atsaucu..."
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serveris: %s, Tips: %s"
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Ceļš: %s, Tips: %s"
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:252
 #, c-format
 msgid "Type: %s"
 msgstr "Tips: %s"
 
-#: mail/mail-send-recv.c:293
+#: mail/mail-send-recv.c:297
 msgid "Send & Receive Mail"
 msgstr "Sūtīt un saņemt pastu"
 
-#: mail/mail-send-recv.c:295
+#: mail/mail-send-recv.c:299
 msgid "Cancel All"
 msgstr "Atcelt Visu"
 
-#: mail/mail-send-recv.c:355
+#: mail/mail-send-recv.c:378
 msgid "Updating..."
 msgstr "Atjauninu..."
 
-#: 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 "Gaidu..."
 
-#: mail/mail-session.c:221
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr "Lietotājs atsauca operāciju."
 
-#: mail/mail-session.c:272
-msgid "_Remember this password"
-msgstr "_Atcerēties šo paroli"
-
-#: mail/mail-session.c:273
-msgid "_Remember this password for the remainder of this session"
-msgstr "_Atcerēties šo paroli uz visu atlikušo sesijas laiku"
-
-#: mail/mail-session.c:330
+#: mail/mail-session.c:258
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ievadiet %s paroli"
 
-#: mail/mail-session.c:333
+#: mail/mail-session.c:260
 msgid "Enter Password"
 msgstr "Ievadiet paroli"
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-session.c:280
+msgid "_Remember this password"
+msgstr "_Atcerēties šo paroli"
+
+#: mail/mail-session.c:281
+msgid "_Remember this password for the remainder of this session"
+msgstr "_Atcerēties šo paroli uz visu atlikušo sesijas laiku"
+
+#: mail/mail-signature-editor.c:80
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Nevarēju saglabāt paraksta failu: %s"
 
-#: mail/mail-signature-editor.c:175
-msgid "Save signature"
-msgstr "Saglabāt parakstu"
-
-#: 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"
@@ -13399,42 +13647,50 @@ msgstr ""
 "\n"
 "Vai jūs vēlaties saglabāt jūsu izmaiņas?"
 
-#: 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 "Saglabāt parakstu"
+
+#: mail/mail-signature-editor.c:389
 msgid "Edit signature"
 msgstr "Rediģēt parakstu"
 
-#: mail/mail-signature-editor.c:372
+#: mail/mail-signature-editor.c:429
 msgid "Enter a name for this signature."
 msgstr "Ievadiet nosaukumu šim parakstam."
 
-#: 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 "Nosaukums:"
 
-#: mail/mail-tools.c:262
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Pārsūtītā vēstule - %s"
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "Pārsūtīta vēstule"
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "Pārsūtīta vēstule"
 
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Uzstādu vmapi: %s"
 
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Atjauninu vmapes priekš uri: %s"
 
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13447,97 +13703,97 @@ msgstr ""
 "    '%s'\n"
 "Un tagad tiek atjauninātas."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "vMapes"
 
-#: mail/mail-vfolder.c:819
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "vMapes"
 
-#: mail/mail-vfolder.c:861
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Rediģēt vMapi"
 
-#: 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ēģinājums rediģēt vmapi '%s', kur īstenībā neeksistē"
 
-#: mail/mail-vfolder.c:931
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Jauna vMape"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(Nav subjekta)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Vēstule"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:740
 msgid "Unseen"
 msgstr "Neredzēta"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:741
 msgid "Seen"
 msgstr "Redzēta"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr "Atbildēta"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:743
 msgid "Multiple Unseen Messages"
 msgstr "Vairākas neredzētas vēstules"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:744
 msgid "Multiple Messages"
 msgstr "Vairākas vēstules"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:748
 msgid "Lowest"
 msgstr "Zemākais"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:749
 msgid "Lower"
 msgstr "Zemāk"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:753
 msgid "Higher"
 msgstr "Augstāk"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:754
 msgid "Highest"
 msgstr "Augstākais"
 
-#: 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 "Šodien %l:%M %p"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Vakardien %I:%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 "Izveidoju vēstuļu sarakstu"
 
@@ -13569,43 +13825,43 @@ msgstr "Saņemts"
 msgid "Size"
 msgstr "Izmērs"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr "Izsaukums"
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:63
 msgid "Do Not Forward"
 msgstr "Neparsūtīt (Do Not Forward)"
 
-#: mail/message-tag-followup.c:56
+#: mail/message-tag-followup.c:64
 msgid "Follow-Up"
 msgstr "Sekojums"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:65
 msgid "For Your Information"
 msgstr "Jūsu zināšanai (For Your Information)"
 
-#: 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 "Pārsūtīt"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:67
 msgid "No Response Necessary"
 msgstr "Nav nepieciešama atbilde (No Response Necessary)"
 
-#: 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 "Atbildēt"
 
-#: 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 "Atbildēt Visiem"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:71
 msgid "Review"
 msgstr "Apskats"
 
-#: 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 "Karogs sekojumam"
 
@@ -13633,88 +13889,95 @@ msgstr "_Līdz:"
 msgid "_Flag:"
 msgstr "Ka_rodziņš:"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Skanējam mapes zem %s uz \"%s\""
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Skanējam saknes līmeņa mapes uz \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Pierakstīties uz mapi \"%s\""
 
-#: mail/subscribe-dialog.c:338
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Atrakstīties no mapes \"%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 "Mape"
 
-#: mail/subscribe-dialog.c:1450
+#: mail/subscribe-dialog.c:1389
 msgid "Scanning folders..."
 msgstr "Skanēju mapes..."
 
-#: mail/subscribe-dialog.c:1557
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Nav izvēlēts serveris"
 
-#: mail/subscribe-dialog.c:1621
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Lūdzu izvēlieties serveri."
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "All folders"
-msgstr "Visas mapes"
-
-#: mail/subscribe-dialog.glade.h:4 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 ui/evolution-message-composer.h:15
+#: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Aizvērt"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "Display Options"
-msgstr "Attēlošanas opcijas"
-
-#: mail/subscribe-dialog.glade.h:6
-msgid "Folders whose names begin with:"
-msgstr "Mapes ar nosaukumiem, kuri sākas ar:"
-
-#: mail/subscribe-dialog.glade.h:7
+#: mail/subscribe-dialog.glade.h:4
 msgid "Manage Subscriptions"
 msgstr "Pārvaldīt pierakstījumus"
 
-#: mail/subscribe-dialog.glade.h:8 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Atsvaidzināt sarakstu"
 
-#: mail/subscribe-dialog.glade.h:9
-msgid "Refresh folder listing"
-msgstr "Atjaunināt mapju sarakstu"
-
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:6
 msgid "S_elect server: "
 msgstr "Izvēlēties s_erveri:"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "_Parakstīties"
 
-#: mail/subscribe-dialog.glade.h:12
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "_Atrakstīties"
 
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
+msgid "Configure the appearance of the Evolution Summary here"
+msgstr "Šeit konfigurējiet Evolution Kopsavilkuma izskatu"
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Summary"
+msgstr "Evolution Kopsavilkuma komponente."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Summary component"
+msgstr "Evolution Kopsavilkuma komponente."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
+msgid "Summary Preferences"
+msgstr "Kopsavilkuma preferences"
+
 #: my-evolution/Locations.h:1
 msgid "Aarhus"
 msgstr "Aarhus"
@@ -17112,7 +17375,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 "Hail"
 
@@ -18805,5996 +19068,5987 @@ 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 "Marseļa"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marshall"
 msgstr "Maršala"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshalltown"
 msgstr "Maršaltauvna"
 
-#: 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 "Martinsburga"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsville"
 msgstr "Martinsvila"
 
-#: 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 "Masena"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Matamoros"
 msgstr "Matamorosa"
 
-#: 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 "Matona"
 
-#: 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 "Mazatlana"
 
-#: 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 "Makartija"
 
-#: 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 "Makgregora"
 
-#: 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 "Medforda"
 
-#: 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 "Melnburna"
 
-#: 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 "Memfisa"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis-NAS"
 msgstr "Memfisa-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 "Meksikalī"
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Miami"
 msgstr "Majamī"
 
-#: 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 "Tuvie Austrumi"
 
-#: 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 "Miltona"
 
-#: 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 "Miniapolisa"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis [2]"
 msgstr "Miniapolisa [2]"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [3]"
 msgstr "Miniapolisa [3]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minnesota"
 msgstr "Minesota"
 
-#: 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 "Minota"
 
-#: 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 "Misissipī"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Missoula"
 msgstr "Misoula"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missouri"
 msgstr "Missūrī"
 
-#: 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 "Mitilīnī"
 
-#: 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 "Mobridža"
 
-#: 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 "Mojavē"
 
-#: 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 "Monklova"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Moncton"
 msgstr "Monktona"
 
-#: 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 "Montāna"
 
-#: 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 "Montereja"
 
-#: 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 "Montrosa"
 
-#: 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 "Morelija"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morgantown"
 msgstr "Morgantauvna"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Moriarty"
 msgstr "Moriartija"
 
-#: 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 "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 "Mulāna"
 
-#: 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 "Minhene"
 
-#: 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 "Murmanska"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Mus"
 msgstr "Musa"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Muscatine"
 msgstr "Muskatīna"
 
-#: 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 "Naha 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 "Namsosa"
 
-#: 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 "Naninga"
 
-#: 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 "Naplesa"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Napoli"
 msgstr "Napolī"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Narvik"
 msgstr "Narvika"
 
-#: 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 "Natāla"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natchez"
 msgstr "Natčesa"
 
-#: 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 "Nevarka"
 
-#: 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 "Ņūkāsla"
 
-#: 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 "Ņūdžersija"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Mexico"
 msgstr "Ņūmeksika"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Orleans"
 msgstr "Ņūorleāna"
 
-#: 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 "Ņūporta"
 
-#: 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 "Ņūtona"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "New York"
 msgstr "Ņujorka"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York-JFK Arpt"
 msgstr "Ņujorka-JFK lid."
 
-#: 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 "Niagāras Ūdenskritums"
 
-#: 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 "Nipavina"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nis"
 msgstr "Nisa"
 
-#: 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 "Nogalesa"
 
-#: 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 "Norfolka"
 
-#: 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 "Ziemeļkarolīna"
 
-#: 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 "North 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 "Ziemeļrietumu Teritorijas"
 
-#: 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 "Norvuda"
 
-#: 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 "Novosibirska"
 
-#: 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 "Okala"
 
-#: 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 "Odensa"
 
-#: 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 "Ogdena"
 
-#: 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 "Ohrīda"
 
-#: 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 Sala"
 
-#: 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 "Oklahomsitija"
 
-#: 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 "Okuširī Sala"
 
-#: 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 "Olbija"
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olympia"
 msgstr "Olimpija"
 
-#: 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 "Omaka"
 
-#: 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 "Omska"
 
-#: 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 "Ostende"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oran"
 msgstr "Orāna"
 
-#: 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 "Oarndža"
 
-#: 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 "Oregona"
 
-#: 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 "Orlande"
 
-#: 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 starpt. lid.)"
 
-#: 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 starptautiskā lidosta"
 
-#: 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 "Oskoda"
 
-#: 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 "Otava"
 
-#: 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 "Oksforda"
 
-#: 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 "Palaciosa"
 
-#: 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 "Palmera"
 
-#: 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 "Panamas Sitija"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Pantelleria"
 msgstr "Pantelerija"
 
-#: 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 "Paposa"
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paris"
 msgstr "Parīze"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris/Charles De Gaulle"
 msgstr "Parīze/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Le Bourget"
 msgstr "Parīze/Le Bourget"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Orly"
 msgstr "Parīze/Orlī"
 
-#: 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 "Pasko"
 
-#: 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 "Pajasandu"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Payson"
 msgstr "Pajsona"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Pellston"
 msgstr "Pelstona"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pelotas"
 msgstr "Pelotasa"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pendleton"
 msgstr "Pendeltona"
 
-#: 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 "People's Republic of China"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "Peoria"
 msgstr "Peorija"
 
-#: 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 "Perma"
 
-#: 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 "Perta"
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Perugia"
 msgstr "Perudžija"
 
-#: 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 "Petersburga"
 
-#: 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 "Filipsburga"
 
-#: 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 "Fēniksa"
 
-#: 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 "Pisko"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pittsburgh"
 msgstr "Pitsburga"
 
-#: 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 "Pokatello"
 
-#: 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 "Ponkē"
 
-#: 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 "Pontiaka"
 
-#: 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 "Poprada"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Port Alexander"
 msgstr "Aleksandra Osta"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alsworth"
 msgstr "Alsvortas Osta"
 
-#: 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 "Portlenda"
 
-#: 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 "Portoroza"
 
-#: 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 "Posadasa"
 
-#: 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 "Poznaņa"
 
-#: 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 "Pretorija"
 
-#: 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 "Pristīna"
 
-#: 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 "Pskova"
 
-#: 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 "Riko"
 
-#: 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 "Kvebeka"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec City"
 msgstr "Kvebeksitija"
 
-#: 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 "Rabata"
 
-#: 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 "Readinga"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Rebun Island"
 msgstr "Rebuna Sala"
 
-#: 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 "Redinga"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redig"
 msgstr "Rediga"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redmond"
 msgstr "Redmonda"
 
-#: 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 "Rentona"
 
-#: 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 "Riširi Sala"
 
-#: 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 "Rokčestera"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1900
 msgid "Rockford"
 msgstr "Rokforda"
 
-#: 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 "Rodosa"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
 msgid "Rogers"
 msgstr "Rogersa"
 
-#: 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 "Rorosa"
 
-#: 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 "Rizenburga"
 
-#: 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 "Rosta"
 
-#: 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 "Rozvela"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1923
 msgid "Rotterdam"
 msgstr "Roterdama"
 
-#: 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 "Rusella"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1928
 msgid "Russia"
 msgstr "Krievija"
 
-#: 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 "Sakramento"
 
-#: 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 "Salinasa"
 
-#: 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 "Salmona"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1955
 msgid "Salmon (2)"
 msgstr "Salmona (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 "Salvadora"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1962
 msgid "Salzburg"
 msgstr "Zalcburga"
 
-#: 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 "Samosa"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1965
 msgid "Samsun"
 msgstr "Samsuna"
 
-#: 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 "Sanderga"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
 msgid "Sanderson"
 msgstr "Sandersone"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1977
 msgid "San Diego"
 msgstr "San Diēgo"
 
-#: 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 "Sanforda"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1987
 msgid "San Francisco"
 msgstr "Sanfrancisko"
 
-#: 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 "Sanktpētersburga"
 
-#: 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 "Sv. Nikolas Sala"
 
-#: 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 Krūza"
 
-#: 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 Marija"
 
-#: 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 "Santamonika"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2011
 msgid "Santander"
 msgstr "Santandera"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
 msgid "Santarem"
 msgstr "Santarema"
 
-#: 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 "Santjago"
 
-#: 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 "Santosa"
 
-#: 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 "Sarājeva"
 
-#: 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 "Sajūna"
 
-#: 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 "Skrantona"
 
-#: 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 "Sedalija"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2048
 msgid "Seeb"
 msgstr "Sība"
 
-#: 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 Lidosta"
 
-#: 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 "Šanhaja"
 
-#: 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 "Šeldona"
 
-#: 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 "Šeltona"
 
-#: 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 "Širaza"
 
-#: 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 "Šorēhama"
 
-#: 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 "Sidneja"
 
-#: 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 "Silversitija"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2086
 msgid "Sindal"
 msgstr "Sindala"
 
-#: 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 "Soč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 "Sokotra"
 
-#: 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 "Sofija"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2110
 msgid "Sogndal"
 msgstr "Sogndala"
 
-#: 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 "Somerseta"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
 msgid "Sonderborg"
 msgstr "Sonderburga"
 
-#: 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 "Dienvidkarolīna"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
 msgid "South Dakota"
 msgstr "Dienviddakota"
 
-#: 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 "Splita"
 
-#: 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 "Springfilda"
 
-#: 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 "Sv. Džordžs"
 
-#: 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 "Stoholma (Arlanda)"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Bromma)"
 msgstr "Stoholma (Broma)"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2152
 msgid "Stockton"
 msgstr "Stoktona"
 
-#: 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 "Santpaula"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2158
 msgid "St Petersburg"
 msgstr "Santpētersburga"
 
-#: 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 "Štutgarte"
 
-#: 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 "Sumburga"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2168
 msgid "Sumter"
 msgstr "Sumtera"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2169
 msgid "Sumter (2)"
 msgstr "Sumtera (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 "Sutona"
 
-#: 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 "Sidneja"
 
-#: 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 "Tabriza"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2189
 msgid "Tabuk"
 msgstr "Tabuka"
 
-#: 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 "Takna"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2192
 msgid "Tacoma"
 msgstr "Takoma"
 
-#: 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 "Taifa"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
 msgid "Tainan"
 msgstr "Tainana"
 
-#: 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 "Taiza"
 
-#: 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 Lidosta"
 
-#: 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 "Tallina"
 
-#: 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 "Taosa"
 
-#: 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 "Tarbesa"
 
-#: 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 "Teksasa"
 
-#: 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 "Tirāna"
 
-#: 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 "Tokačī GSDF"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2265
 msgid "Tokunoshima Island"
 msgstr "Tokunošimas Sala"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2266
 msgid "Tokushima Ab"
 msgstr "Tokušima Ab"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2267
 msgid "Tokyo Heliport"
 msgstr "Tokijo Heliosta"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2268
 msgid "Tokyo International Airport"
 msgstr "Tokijo Internacionālā Lidosta"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2269
 msgid "Tokyo New International Airport"
 msgstr "Tokijas Jaunā Internacionālā Lidosta"
 
-#: 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 "Toluka"
 
-#: 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 "Torpa"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
 msgid "Torrance"
 msgstr "Torance"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
 msgid "Torreon"
 msgstr "Toreona"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
 msgid "Tottori Airport"
 msgstr "Totori Lidosta"
 
-#: 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 "Tovnsvila"
 
-#: 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 "Trapānī"
 
-#: 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 "Treleva"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2292
 msgid "Trenton"
 msgstr "Trentona"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
 msgid "Trevico"
 msgstr "Treviko"
 
-#: 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 "Triesta"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2297
 msgid "Trinidad"
 msgstr "Trinidada"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2298
 msgid "Tripoli"
 msgstr "Tripolī"
 
-#: 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 "Turaifa"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
 msgid "Turin"
 msgstr "Turīna"
 
-#: 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 "Ulsana"
 
-#: 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 "Apvienotie Arābu Erimāti"
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2341
 msgid "Unst"
 msgstr "Unsta"
 
-#: 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 "Urugāna"
 
-#: 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 "Jūta"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2348
 msgid "Utica"
 msgstr "Utika"
 
-#: 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 "Vagara"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2355
 msgid "Valdez 2"
 msgstr "Valdeza 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 "Valencija"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2359
 msgid "Valentine"
 msgstr "Valentīna"
 
-#: 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 "Valkenburga"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2362
 msgid "Valley"
 msgstr "Valeja"
 
-#: 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 "Vana"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2366
 msgid "Vancouver"
 msgstr "Vankuvera"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2367
 msgid "Vandel"
 msgstr "Vandela"
 
-#: 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 "Vastertas"
 
-#: 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 "Venēcija"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2378
 msgid "Venice"
 msgstr "Venēcija"
 
-#: 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 "Vermiliona"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2381
 msgid "Vermont"
 msgstr "Vermonta"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2382
 msgid "Vernal"
 msgstr "Vernala"
 
-#: 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 "Viksburga"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2388
 msgid "Victoria"
 msgstr "Viktorija"
 
-#: 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 "Viļņa"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2398
 msgid "Virginia"
 msgstr "Virdžīnija"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2399
 msgid "Virginia Beach"
 msgstr "Virdžīnijas Pludmale"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2400
 msgid "Virginia Tech Airport"
 msgstr "Virdžīnijas Tehniskā Lidosta"
 
-#: 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 "Visālija"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2403
 msgid "Visby"
 msgstr "Visbija"
 
-#: 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 "Vitorija"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2406
 msgid "Vladikavkaz"
 msgstr "Vladikavkāzs"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2407
 msgid "Vladivostok"
 msgstr "Vladivostoka"
 
-#: 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 "Volgograda"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2411
 msgid "Volkel"
 msgstr "Volkela"
 
-#: 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ža"
 
-#: 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 "Vako"
 
-#: 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 "Varšava"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2426
 msgid "Washington"
 msgstr "Vašigtona"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2427
 msgid "Washington/Dulles"
 msgstr "Vašingtona/Dulles"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2428
 msgid "Waterbury"
 msgstr "Vatersburga"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
 msgid "Waterloo"
 msgstr "Vaterlo"
 
-#: 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 "Vatervilla"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2432
 msgid "Waukesha"
 msgstr "Vakeša"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2433
 msgid "Wausau"
 msgstr "Vausau"
 
-#: 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 "Vebstersitija"
 
-#: 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 "Velingtona"
 
-#: 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 "Vendovera"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2441
 msgid "West Atlanta"
 msgstr "Rietumu 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 "Vesterlande"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
 msgid "Westfield"
 msgstr "Vestfilda"
 
-#: 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 "Vīne"
 
-#: 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 "Vilingstona"
 
-#: 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 "Vilmingtona"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2470
 msgid "Winchester"
 msgstr "Vinčestera"
 
-#: 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 "Vinipega"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2476
 msgid "Winslow"
 msgstr "Vinslova"
 
-#: 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 "Ksiamena"
 
-#: 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 "Jakima"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2498
 msgid "Yakushima"
 msgstr "Jukašima"
 
-#: 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 "Jakutska"
 
-#: 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 "Janktona"
 
-#: 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 "Joro"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2518
 msgid "Yosu"
 msgstr "Josu"
 
-#: 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 "Jukona"
 
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2523
 msgid "Yuma MCAS"
 msgstr "Juma 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 "Zadara"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
 msgid "Zagreb"
 msgstr "Zagreba"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2529
 msgid "Zakinthos"
 msgstr "Zakintos"
 
-#: 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 "Zanesvila"
 
-#: 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 "Cīrihe"
 
-#: my-evolution/component-factory.c:51
+#: my-evolution/component-factory.c:56
 msgid "Folder containing the Evolution Summary"
 msgstr "Evolution kopsavilkumu saturoša mape"
 
-#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
+#: my-evolution/e-summary-calendar.c:380
 msgid "Appointments"
 msgstr "Tikšanās"
 
-#: my-evolution/e-summary-calendar.c:382
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
 msgstr "Nav tikšanos"
 
-#: 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 "Nav apraksta"
 
-#: my-evolution/e-summary-mail.c:153
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "Pasta kopsavilkums"
 
-#: 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 "Lokālās mapes"
 
-#. 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 Dienas Vārds"
 
-#: my-evolution/e-summary-preferences.c:602
+#: my-evolution/e-summary-preferences.c:374
 msgid "Quotes of the Day"
 msgstr "Dienas citāti"
 
-#: my-evolution/e-summary-preferences.c:840
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr "Pievienot ziņu barotni"
 
-#: 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 "Ievadiet ziņu barotnes URL, kuru jūs vēlaties pievienot"
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr "Kļūda lejuplādējot RDF"
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr "Ziņu barotne"
 
-#: my-evolution/e-summary-shown.c:519
+#: my-evolution/e-summary-shown.c:518
 msgid "All"
 msgstr "Visu"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:531
+#: my-evolution/e-summary-shown.c:530
 msgid "Add"
 msgstr "Pievienot"
 
-#: 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 "Parādīts"
 
-#: my-evolution/e-summary-tasks.c:328
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "Nav uzdevumu"
 
-#: my-evolution/e-summary-tasks.c:372
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(Nav apraksta)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:73
 msgid "My Weather"
 msgstr "Mani laikapstākļi"
 
-#: my-evolution/e-summary-weather.c:268
+#: my-evolution/e-summary-weather.c:262
 msgid "There was an error downloading data for"
 msgstr "Kļūda, ielādējot datus priekš"
 
-#: my-evolution/e-summary-weather.c:489
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr "Laikapstākļi"
 
-#: 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 "Lūdzu uzgaidiet..."
 
-#: 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 "Drukāt kopsavilkumu"
 
-#: my-evolution/e-summary.c:640
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Kopsavilkuma drukāšana neveiksmīga"
 
-#: my-evolution/main.c:68
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "Kopsavilkuma komponente nespēja inicializēt Bonobo.\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 "pēdas"
 
-#: 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 "jūdzes"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "kilometers"
 msgstr "kilometri"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Clear sky"
 msgstr "Tīras debesis"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Broken clouds"
 msgstr "Lauzti mākoņi"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Scattered clouds"
 msgstr "Izkliedēti mākoņi"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Few clouds"
 msgstr "Daži mākoņi"
 
-#: my-evolution/metar.c:48
+#: my-evolution/metar.c:49
 msgid "Overcast"
 msgstr "Apmācies"
 
-#: 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 "Nepareizs"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Variable"
 msgstr "Mainīgs"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North"
 msgstr "Ziemeļu"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North - NorthEast"
 msgstr "Ziemeļu - Ziemeļaustrumu"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Northeast"
 msgstr "Ziemeļaustrumu"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - NorthEast"
 msgstr "Austrumu - Ziemeļaustrumu"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East"
 msgstr "Austrumu"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East - Southeast"
 msgstr "Austrumu - Dienvidaustrumu"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southeast"
 msgstr "Dienvidaustrumu"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southeast"
 msgstr "Dienvidu - Dienvidaustrumu"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South"
 msgstr "Dienvidu"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South - Southwest"
 msgstr "Dienvidu - Dienvidrietumu"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Southwest"
 msgstr "Dienvidrietumu"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Southwest"
 msgstr "Rietumu - Dienvidrietumu"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West"
 msgstr "Rietumu"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West - Northwest"
 msgstr "Rietumu - Ziemeļrietumu"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "Northwest"
 msgstr "Ziemeļrietumu"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "North - Northwest"
 msgstr "Ziemeļu - Ziemeļrietumu"
 
 #. DRIZZLE
-#: my-evolution/metar.c:127
+#: my-evolution/metar.c:128
 msgid "Drizzle"
 msgstr "Smalks lietus"
 
-#: my-evolution/metar.c:128
+#: my-evolution/metar.c:129
 msgid "Drizzle in the vicinity"
 msgstr "Gaidāms smalks lietus"
 
-#: my-evolution/metar.c:129
+#: my-evolution/metar.c:130
 msgid "Light drizzle"
 msgstr "Viegls smalks lietus"
 
-#: my-evolution/metar.c:130
+#: my-evolution/metar.c:131
 msgid "Moderate drizzle"
 msgstr "Mērens smalks lietus"
 
-#: my-evolution/metar.c:131
+#: my-evolution/metar.c:132
 msgid "Heavy drizzle"
 msgstr "Spēcīgs smalks lietus"
 
-#: my-evolution/metar.c:132
+#: my-evolution/metar.c:133
 msgid "Shallow drizzle"
 msgstr "Nedaudz smalks lietus"
 
-#: my-evolution/metar.c:133
+#: my-evolution/metar.c:134
 msgid "Patches of drizzle"
 msgstr "Vietām smalks lietus"
 
-#: my-evolution/metar.c:134
+#: my-evolution/metar.c:135
 msgid "Partial drizzle"
 msgstr "Pa daļai smalks lietus"
 
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
 msgid "Thunderstorm"
 msgstr "Pērkona negaiss"
 
-#: my-evolution/metar.c:136
+#: my-evolution/metar.c:137
 msgid "Windy drizzle"
 msgstr "Vējains smalks lietus"
 
-#: my-evolution/metar.c:137
+#: my-evolution/metar.c:138
 msgid "Showers"
 msgstr "Lietavas"
 
-#: my-evolution/metar.c:138
+#: my-evolution/metar.c:139
 msgid "Drifting drizzle"
 msgstr "Mainīga smidzināšana"
 
-#: my-evolution/metar.c:139
+#: my-evolution/metar.c:140
 msgid "Freezing drizzle"
 msgstr "Saldējoša smidzināšana"
 
 #. RAIN
-#: my-evolution/metar.c:142
+#: my-evolution/metar.c:143
 msgid "Rain"
 msgstr "Lietus"
 
-#: my-evolution/metar.c:143
+#: my-evolution/metar.c:144
 msgid "Rain in the vicinity"
 msgstr "Gaidāms lietus"
 
-#: my-evolution/metar.c:144
+#: my-evolution/metar.c:145
 msgid "Light rain"
 msgstr "Neliels lietus"
 
-#: my-evolution/metar.c:145
+#: my-evolution/metar.c:146
 msgid "Moderate rain"
 msgstr "Mērens lietus"
 
-#: my-evolution/metar.c:146
+#: my-evolution/metar.c:147
 msgid "Heavy rain"
 msgstr "Spēcīgs lietus"
 
-#: my-evolution/metar.c:147
+#: my-evolution/metar.c:148
 msgid "Shallow rain"
 msgstr "Neliels lietus"
 
-#: my-evolution/metar.c:148
+#: my-evolution/metar.c:149
 msgid "Patches of rain"
 msgstr "Vietām lietus"
 
-#: my-evolution/metar.c:149
+#: my-evolution/metar.c:150
 msgid "Partial rainfall"
 msgstr "Pa daļai nokrišņi"
 
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:152
 msgid "Blowing rainfall"
 msgstr "Ļoti spēcīgas lietusgāzes"
 
-#: my-evolution/metar.c:152
+#: my-evolution/metar.c:153
 msgid "Rain showers"
 msgstr "Lietusgāzes"
 
-#: my-evolution/metar.c:153
+#: my-evolution/metar.c:154
 msgid "Drifting rain"
 msgstr "Mainīgs lietus daudzums"
 
-#: my-evolution/metar.c:154
+#: my-evolution/metar.c:155
 msgid "Freezing rain"
 msgstr "Saldējošs lietus"
 
 #. SNOW
-#: my-evolution/metar.c:157
+#: my-evolution/metar.c:158
 msgid "Snow"
 msgstr "Sniegs"
 
-#: my-evolution/metar.c:158
+#: my-evolution/metar.c:159
 msgid "Snow in the vicinity"
 msgstr "Gaidāms sniegs"
 
-#: my-evolution/metar.c:159
+#: my-evolution/metar.c:160
 msgid "Light snow"
 msgstr "Viegla snigšana"
 
-#: my-evolution/metar.c:160
+#: my-evolution/metar.c:161
 msgid "Moderate snow"
 msgstr "Mērena snigšana"
 
-#: my-evolution/metar.c:161
+#: my-evolution/metar.c:162
 msgid "Heavy snow"
 msgstr "Spēcīga snigšana"
 
-#: my-evolution/metar.c:162
+#: my-evolution/metar.c:163
 msgid "Shallow snow"
 msgstr "Neliela snigšana"
 
-#: my-evolution/metar.c:163
+#: my-evolution/metar.c:164
 msgid "Patches of snow"
 msgstr "Vietām sniegs"
 
-#: my-evolution/metar.c:164
+#: my-evolution/metar.c:165
 msgid "Partial snowfall"
 msgstr "Pa daļai sniegputenis"
 
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr "Sniega vētra"
 
-#: my-evolution/metar.c:166
+#: my-evolution/metar.c:167
 msgid "Blowing snowfall"
 msgstr "Ļoti spēcīgs sniegputenis"
 
-#: my-evolution/metar.c:167
+#: my-evolution/metar.c:168
 msgid "Snow showers"
 msgstr "Sniega krišana"
 
-#: my-evolution/metar.c:168
+#: my-evolution/metar.c:169
 msgid "Drifting snow"
 msgstr "Mainīgs sniega daudzums"
 
-#: my-evolution/metar.c:169
+#: my-evolution/metar.c:170
 msgid "Freezing snow"
 msgstr "Saldējošs sniegs"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:172
+#: my-evolution/metar.c:173
 msgid "Snow grains"
 msgstr "Sniega graudi"
 
-#: my-evolution/metar.c:173
+#: my-evolution/metar.c:174
 msgid "Snow grains in the vicinity"
 msgstr "Gaidāmi sniega graudi"
 
-#: my-evolution/metar.c:174
+#: my-evolution/metar.c:175
 msgid "Light snow grains"
 msgstr "Viegli sniega graudi"
 
-#: my-evolution/metar.c:175
+#: my-evolution/metar.c:176
 msgid "Moderate snow grains"
 msgstr "Mēreni sniega graudi"
 
-#: my-evolution/metar.c:176
+#: my-evolution/metar.c:177
 msgid "Heavy snow grains"
 msgstr "Spēcīgi sniega graudi"
 
-#: my-evolution/metar.c:177
+#: my-evolution/metar.c:178
 msgid "Shallow snow grains"
 msgstr "Nedaudz sniega graudi"
 
-#: my-evolution/metar.c:178
+#: my-evolution/metar.c:179
 msgid "Patches of snow grains"
 msgstr "Vietām sniega graudi"
 
-#: my-evolution/metar.c:179
+#: my-evolution/metar.c:180
 msgid "Partial snow grains"
 msgstr "Pa daļai sniega graudi"
 
-#: my-evolution/metar.c:181
+#: my-evolution/metar.c:182
 msgid "Blowing snow grains"
 msgstr "Ļoti spēcīgi sniega graudi"
 
-#: my-evolution/metar.c:182
+#: my-evolution/metar.c:183
 msgid "Snow grain showers"
 msgstr "Sniega graudu krusa"
 
-#: my-evolution/metar.c:183
+#: my-evolution/metar.c:184
 msgid "Drifting snow grains"
 msgstr "Mainīgs sniega graudu daudzums"
 
-#: my-evolution/metar.c:184
+#: my-evolution/metar.c:185
 msgid "Freezing snow grains"
 msgstr "Saldējoši sniega graudi"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:187
+#: my-evolution/metar.c:188
 msgid "Ice crystals"
 msgstr "Ledus kristāli"
 
-#: my-evolution/metar.c:188
+#: my-evolution/metar.c:189
 msgid "Ice crystals in the vicinity"
 msgstr "Gaidāmi ledus kristāli"
 
-#: my-evolution/metar.c:189
+#: my-evolution/metar.c:190
 msgid "Few ice crystals"
 msgstr "Daži ledus kristāli"
 
-#: my-evolution/metar.c:190
+#: my-evolution/metar.c:191
 msgid "Moderate ice crystals"
 msgstr "Mēreni ledus kristāli"
 
-#: my-evolution/metar.c:191
+#: my-evolution/metar.c:192
 msgid "Heavy ice crystals"
 msgstr "Spēcīgi ledus kristāli"
 
-#: my-evolution/metar.c:193
+#: my-evolution/metar.c:194
 msgid "Patches of ice crystals"
 msgstr "Vietām ledus kristāli"
 
-#: my-evolution/metar.c:194
+#: my-evolution/metar.c:195
 msgid "Partial ice crystals"
 msgstr "Pa daļai ledus kristāli"
 
-#: my-evolution/metar.c:195
+#: my-evolution/metar.c:196
 msgid "Ice crystal storm"
 msgstr "Ledus kristālu vētra"
 
-#: my-evolution/metar.c:196
+#: my-evolution/metar.c:197
 msgid "Blowing ice crystals"
 msgstr "Ļoti spēcīgi ledus kristāli"
 
-#: my-evolution/metar.c:197
+#: my-evolution/metar.c:198
 msgid "Showers of ice crystals"
 msgstr "Ledus kristālu krusa"
 
-#: my-evolution/metar.c:198
+#: my-evolution/metar.c:199
 msgid "Drifting ice crystals"
 msgstr "Mainīgs ledus kristālu daudzums"
 
-#: my-evolution/metar.c:199
+#: my-evolution/metar.c:200
 msgid "Freezing ice crystals"
 msgstr "Saldējoši ledus kristāli"
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:202
+#: my-evolution/metar.c:203
 msgid "Ice pellets"
 msgstr "Ledus lodītes"
 
-#: my-evolution/metar.c:203
+#: my-evolution/metar.c:204
 msgid "Ice pellets in the vicinity"
 msgstr "Gaidāmas ledus lodītes"
 
-#: my-evolution/metar.c:204
+#: my-evolution/metar.c:205
 msgid "Few ice pellets"
 msgstr "Dažas ledus lodītes"
 
-#: my-evolution/metar.c:205
+#: my-evolution/metar.c:206
 msgid "Moderate ice pellets"
 msgstr "Mērenas ledus lodītes"
 
-#: my-evolution/metar.c:206
+#: my-evolution/metar.c:207
 msgid "Heavy ice pellets"
 msgstr "Spēcīgas ledus lodītes"
 
-#: my-evolution/metar.c:207
+#: my-evolution/metar.c:208
 msgid "Shallow ice pellets"
 msgstr "Nedaudz ledus kristāli"
 
-#: my-evolution/metar.c:208
+#: my-evolution/metar.c:209
 msgid "Patches of ice pellets"
 msgstr "Vietām ledus lodītes"
 
-#: my-evolution/metar.c:209
+#: my-evolution/metar.c:210
 msgid "Partial ice pellets"
 msgstr "Pa daļai ledus lodītes"
 
-#: my-evolution/metar.c:210
+#: my-evolution/metar.c:211
 msgid "Ice pellet storm"
 msgstr "Ledus lodīšu vētra"
 
-#: my-evolution/metar.c:211
+#: my-evolution/metar.c:212
 msgid "Blowing ice pellets"
 msgstr "Ļoti spēcigas ledus lodītes"
 
-#: my-evolution/metar.c:212
+#: my-evolution/metar.c:213
 msgid "Showers of ice pellets"
 msgstr "Ledus lodīšu krusa"
 
-#: my-evolution/metar.c:213
+#: my-evolution/metar.c:214
 msgid "Drifting ice pellets"
 msgstr "Mainīgs ledus lodīšu daudzums"
 
-#: my-evolution/metar.c:214
+#: my-evolution/metar.c:215
 msgid "Freezing ice pellets"
 msgstr "Saldējošas ledus lodītes"
 
-#: my-evolution/metar.c:218
+#: my-evolution/metar.c:219
 msgid "Hail in the vicinity"
 msgstr "Gaidāma krusa"
 
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
+#: my-evolution/metar.c:220 my-evolution/metar.c:235
 msgid "Light hail"
 msgstr "Viegla krusa"
 
-#: my-evolution/metar.c:220
+#: my-evolution/metar.c:221
 msgid "Moderate hail"
 msgstr "Mērena krusa"
 
-#: my-evolution/metar.c:221
+#: my-evolution/metar.c:222
 msgid "Heavy hail"
 msgstr "Spēcīga krusa"
 
-#: my-evolution/metar.c:222
+#: my-evolution/metar.c:223
 msgid "Shallow hail"
 msgstr "Neliela krusa"
 
-#: my-evolution/metar.c:223
+#: my-evolution/metar.c:224
 msgid "Patches of hail"
 msgstr "Vietām krusa"
 
-#: my-evolution/metar.c:224
+#: my-evolution/metar.c:225
 msgid "Partial hail"
 msgstr "Pa daļai krusa"
 
-#: my-evolution/metar.c:225
+#: my-evolution/metar.c:226
 msgid "Hailstorm"
 msgstr "Krusas vētra"
 
-#: my-evolution/metar.c:226
+#: my-evolution/metar.c:227
 msgid "Blowing hail"
 msgstr "Ļoti spēcīga krusa"
 
-#: my-evolution/metar.c:227
+#: my-evolution/metar.c:228
 msgid "Hail showers"
 msgstr "Krusas birums"
 
-#: my-evolution/metar.c:228
+#: my-evolution/metar.c:229
 msgid "Drifting hail"
 msgstr "Mainīgs krusas daudzums"
 
-#: my-evolution/metar.c:229
+#: my-evolution/metar.c:230
 msgid "Freezing hail"
 msgstr "Saldējoša krusa"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:232
+#: my-evolution/metar.c:233
 msgid "Small hail"
 msgstr "Neliela krusa"
 
-#: my-evolution/metar.c:233
+#: my-evolution/metar.c:234
 msgid "Small hail in the vicinity"
 msgstr "Gaidāma neliela krusa"
 
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:236
 msgid "Moderate small hail"
 msgstr "Mērena neliela krusa"
 
-#: my-evolution/metar.c:236
+#: my-evolution/metar.c:237
 msgid "Heavy small hail"
 msgstr "Spēcīga neliela krusa"
 
-#: my-evolution/metar.c:237
+#: my-evolution/metar.c:238
 msgid "Shallow small hail"
 msgstr "Nedaudz neliela krusa"
 
-#: my-evolution/metar.c:238
+#: my-evolution/metar.c:239
 msgid "Patches of small hail"
 msgstr "Vietām neliela krusa"
 
-#: my-evolution/metar.c:239
+#: my-evolution/metar.c:240
 msgid "Partial small hail"
 msgstr "Pa daļai neliela krusa"
 
-#: my-evolution/metar.c:240
+#: my-evolution/metar.c:241
 msgid "Small hailstorm"
 msgstr "Neiela vētra ar krusu"
 
-#: my-evolution/metar.c:241
+#: my-evolution/metar.c:242
 msgid "Blowing small hail"
 msgstr "Spēcīga neliela krusa"
 
-#: my-evolution/metar.c:242
+#: my-evolution/metar.c:243
 msgid "Showers of small hail"
 msgstr "Nelielas krusas birums"
 
-#: my-evolution/metar.c:243
+#: my-evolution/metar.c:244
 msgid "Drifting small hail"
 msgstr "Mainīgs nelielas krusas daudzums"
 
-#: my-evolution/metar.c:244
+#: my-evolution/metar.c:245
 msgid "Freezing small hail"
 msgstr "Saldējoša neliela krusa"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:247
+#: my-evolution/metar.c:248
 msgid "Unknown precipitation"
 msgstr "Nezināmi nokrišņi"
 
-#: my-evolution/metar.c:248
+#: my-evolution/metar.c:249
 msgid "Precipitation in the vicinity"
 msgstr "Gaidāmi nokrišņi"
 
-#: my-evolution/metar.c:249
+#: my-evolution/metar.c:250
 msgid "Light precipitation"
 msgstr "Viegli nokrišņi"
 
-#: my-evolution/metar.c:250
+#: my-evolution/metar.c:251
 msgid "Moderate precipitation"
 msgstr "Mēreni nokrišņi"
 
-#: my-evolution/metar.c:251
+#: my-evolution/metar.c:252
 msgid "Heavy precipitation"
 msgstr "Spēcīgi nokrišņi"
 
-#: my-evolution/metar.c:252
+#: my-evolution/metar.c:253
 msgid "Shallow precipitation"
 msgstr "Nelieli nokrišņi"
 
-#: my-evolution/metar.c:253
+#: my-evolution/metar.c:254
 msgid "Patches of precipitation"
 msgstr "Vietām nokrišņi"
 
-#: my-evolution/metar.c:254
+#: my-evolution/metar.c:255
 msgid "Partial precipitation"
 msgstr "Pa daļai nokrišņi"
 
-#: my-evolution/metar.c:255
+#: my-evolution/metar.c:256
 msgid "Unknown thunderstorm"
 msgstr "Nezināms pērkona negaiss"
 
-#: my-evolution/metar.c:256
+#: my-evolution/metar.c:257
 msgid "Blowing precipitation"
 msgstr "Ļoti spēcīgi nokrišņi"
 
-#: my-evolution/metar.c:257
+#: my-evolution/metar.c:258
 msgid "Showers, type unknown"
 msgstr "Lietusgāzes, tips nezināms"
 
-#: my-evolution/metar.c:258
+#: my-evolution/metar.c:259
 msgid "Drifting precipitation"
 msgstr "Mainīgs nokrišņu daudzums"
 
-#: my-evolution/metar.c:259
+#: my-evolution/metar.c:260
 msgid "Freezing precipitation"
 msgstr "Saldējoši nokrišņi"
 
 #. MIST
-#: my-evolution/metar.c:262
+#: my-evolution/metar.c:263
 msgid "Mist"
 msgstr "Dūmaka"
 
-#: my-evolution/metar.c:263
+#: my-evolution/metar.c:264
 msgid "Mist in the vicinity"
 msgstr "Gaidāma dūmaka"
 
-#: my-evolution/metar.c:264
+#: my-evolution/metar.c:265
 msgid "Light mist"
 msgstr "Viegla dūmaka"
 
-#: my-evolution/metar.c:265
+#: my-evolution/metar.c:266
 msgid "Moderate mist"
 msgstr "Mērena dūmaka"
 
-#: my-evolution/metar.c:266
+#: my-evolution/metar.c:267
 msgid "Thick mist"
 msgstr "Bieza dūmaka"
 
-#: my-evolution/metar.c:267
+#: my-evolution/metar.c:268
 msgid "Shallow mist"
 msgstr "Neliela dūmaka"
 
-#: my-evolution/metar.c:268
+#: my-evolution/metar.c:269
 msgid "Patches of mist"
 msgstr "Vietām dūmaka"
 
-#: my-evolution/metar.c:269
+#: my-evolution/metar.c:270
 msgid "Partial mist"
 msgstr "Pa daļai dūmaka"
 
-#: my-evolution/metar.c:271
+#: my-evolution/metar.c:272
 msgid "Mist with wind"
 msgstr "Dūmaka ar vēju"
 
-#: my-evolution/metar.c:273
+#: my-evolution/metar.c:274
 msgid "Drifting mist"
 msgstr "Mainīgs dūmakas daudzums"
 
-#: my-evolution/metar.c:274
+#: my-evolution/metar.c:275
 msgid "Freezing mist"
 msgstr "Saldējoša dūmaka"
 
 #. FOG
-#: my-evolution/metar.c:277
+#: my-evolution/metar.c:278
 msgid "Fog"
 msgstr "Migla"
 
-#: my-evolution/metar.c:278
+#: my-evolution/metar.c:279
 msgid "Fog in the vicinity"
 msgstr "Gaidāma migla"
 
-#: my-evolution/metar.c:279
+#: my-evolution/metar.c:280
 msgid "Light fog"
 msgstr "Viegla migla"
 
-#: my-evolution/metar.c:280
+#: my-evolution/metar.c:281
 msgid "Moderate fog"
 msgstr "Mērena migla"
 
-#: my-evolution/metar.c:281
+#: my-evolution/metar.c:282
 msgid "Thick fog"
 msgstr "Bieza migla"
 
-#: my-evolution/metar.c:282
+#: my-evolution/metar.c:283
 msgid "Shallow fog"
 msgstr "Neliela migla"
 
-#: my-evolution/metar.c:283
+#: my-evolution/metar.c:284
 msgid "Patches of fog"
 msgstr "Vietām migla"
 
-#: my-evolution/metar.c:284
+#: my-evolution/metar.c:285
 msgid "Partial fog"
 msgstr "Pa daļai migla"
 
-#: my-evolution/metar.c:286
+#: my-evolution/metar.c:287
 msgid "Fog with wind"
 msgstr "Migla ar vēju"
 
-#: my-evolution/metar.c:288
+#: my-evolution/metar.c:289
 msgid "Drifting fog"
 msgstr "Mainīgs miglas daudzums"
 
-#: my-evolution/metar.c:289
+#: my-evolution/metar.c:290
 msgid "Freezing fog"
 msgstr "Saldējoša migla"
 
 #. SMOKE
-#: my-evolution/metar.c:292
+#: my-evolution/metar.c:293
 msgid "Smoke"
 msgstr "Dūmi"
 
-#: my-evolution/metar.c:293
+#: my-evolution/metar.c:294
 msgid "Smoke in the vicinity"
 msgstr "Gaidāmi dūmi"
 
-#: my-evolution/metar.c:294
+#: my-evolution/metar.c:295
 msgid "Thin smoke"
 msgstr "Plāni dūmi"
 
-#: my-evolution/metar.c:295
+#: my-evolution/metar.c:296
 msgid "Moderate smoke"
 msgstr "Mēreni dūmi"
 
-#: my-evolution/metar.c:296
+#: my-evolution/metar.c:297
 msgid "Thick smoke"
 msgstr "Biezi dūmi"
 
-#: my-evolution/metar.c:297
+#: my-evolution/metar.c:298
 msgid "Shallow smoke"
 msgstr "Nelieli dūmi"
 
-#: my-evolution/metar.c:298
+#: my-evolution/metar.c:299
 msgid "Patches of smoke"
 msgstr "Vietām dūmi"
 
-#: my-evolution/metar.c:299
+#: my-evolution/metar.c:300
 msgid "Partial smoke"
 msgstr "Pa daļai dūmi"
 
-#: my-evolution/metar.c:300
+#: my-evolution/metar.c:301
 msgid "Thunderous smoke"
 msgstr "Postoši dūmi"
 
-#: my-evolution/metar.c:301
+#: my-evolution/metar.c:302
 msgid "Smoke with wind"
 msgstr "Dūmi ar vēju"
 
-#: my-evolution/metar.c:303
+#: my-evolution/metar.c:304
 msgid "Drifting smoke"
 msgstr "Mainīgs dūmu daudzums"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:307
+#: my-evolution/metar.c:308
 msgid "Volcanic ash"
 msgstr "Vūlkāniskie pelni"
 
-#: my-evolution/metar.c:308
+#: my-evolution/metar.c:309
 msgid "Volcanic ash in the vicinity"
 msgstr "Gaidāmi vūlkāniskie pelni"
 
-#: my-evolution/metar.c:310
+#: my-evolution/metar.c:311
 msgid "Moderate volcanic ash"
 msgstr "Mēreni vūlkāniskie pelni"
 
-#: my-evolution/metar.c:311
+#: my-evolution/metar.c:312
 msgid "Thick volcanic ash"
 msgstr "Biezi vūlkāniskie pelni"
 
-#: my-evolution/metar.c:312
+#: my-evolution/metar.c:313
 msgid "Shallow volcanic ash"
 msgstr "Nedaudz vūlkāniskie pelni"
 
-#: my-evolution/metar.c:313
+#: my-evolution/metar.c:314
 msgid "Patches of volcanic ash"
 msgstr "Vietām vūlkāniskie pelni"
 
-#: my-evolution/metar.c:314
+#: my-evolution/metar.c:315
 msgid "Partial volcanic ash"
 msgstr "Pa daļai vūlkāniskie pelni"
 
-#: my-evolution/metar.c:315
+#: my-evolution/metar.c:316
 msgid "Thunderous volcanic ash"
 msgstr "Vūlkāniskie pelni ar pērkonu"
 
-#: my-evolution/metar.c:316
+#: my-evolution/metar.c:317
 msgid "Blowing volcanic ash"
 msgstr "Sprāgstoši vūlkāniskie pelni"
 
-#: my-evolution/metar.c:317
+#: my-evolution/metar.c:318
 msgid "Showers of volcanic ash"
 msgstr "Vūlkānisko pelnu lietus"
 
-#: my-evolution/metar.c:318
+#: my-evolution/metar.c:319
 msgid "Drifting volcanic ash"
 msgstr "Mainīgs vūlkānisko pelnu daudzums"
 
-#: my-evolution/metar.c:319
+#: my-evolution/metar.c:320
 msgid "Freezing volcanic ash"
 msgstr "Saldējoši vūlkāniskie pelni"
 
 #. SAND
-#: my-evolution/metar.c:322
+#: my-evolution/metar.c:323
 msgid "Sand"
 msgstr "Smiltis"
 
-#: my-evolution/metar.c:323
+#: my-evolution/metar.c:324
 msgid "Sand in the vicinity"
 msgstr "Gaidāmas smiltis"
 
-#: my-evolution/metar.c:324
+#: my-evolution/metar.c:325
 msgid "Light sand"
 msgstr "Vieglas smiltis"
 
-#: my-evolution/metar.c:325
+#: my-evolution/metar.c:326
 msgid "Moderate sand"
 msgstr "Mērenas smiltis"
 
-#: my-evolution/metar.c:326
+#: my-evolution/metar.c:327
 msgid "Heavy sand"
 msgstr "Spēcīgas smiltis"
 
-#: my-evolution/metar.c:328
+#: my-evolution/metar.c:329
 msgid "Patches of sand"
 msgstr "Vietām smiltis"
 
-#: my-evolution/metar.c:329
+#: my-evolution/metar.c:330
 msgid "Partial sand"
 msgstr "Pa daļai smiltis"
 
-#: my-evolution/metar.c:331
+#: my-evolution/metar.c:332
 msgid "Blowing sand"
 msgstr "Smilšu putenis"
 
-#: my-evolution/metar.c:333
+#: my-evolution/metar.c:334
 msgid "Drifting sand"
 msgstr "Klejojošas smiltis"
 
 #. HAZE
-#: my-evolution/metar.c:337
+#: my-evolution/metar.c:338
 msgid "Haze"
 msgstr "Dūmaka"
 
-#: my-evolution/metar.c:338
+#: my-evolution/metar.c:339
 msgid "Haze in the vicinity"
 msgstr "Gaidāma dūmaka"
 
-#: my-evolution/metar.c:339
+#: my-evolution/metar.c:340
 msgid "Light haze"
 msgstr "Viegla dūmaka"
 
-#: my-evolution/metar.c:340
+#: my-evolution/metar.c:341
 msgid "Moderate haze"
 msgstr "Mērena dūmaka"
 
-#: my-evolution/metar.c:341
+#: my-evolution/metar.c:342
 msgid "Thick haze"
 msgstr "Bieza dūmaka"
 
-#: my-evolution/metar.c:342
+#: my-evolution/metar.c:343
 msgid "Shallow haze"
 msgstr "Sekla dūmaka"
 
-#: my-evolution/metar.c:343
+#: my-evolution/metar.c:344
 msgid "Patches of haze"
 msgstr "Vietām dūmaka"
 
-#: my-evolution/metar.c:344
+#: my-evolution/metar.c:345
 msgid "Partial haze"
 msgstr "Pa daļai dūmaka"
 
-#: my-evolution/metar.c:346
+#: my-evolution/metar.c:347
 msgid "Haze with wind"
 msgstr "Dūmaka ar vēju"
 
-#: my-evolution/metar.c:348
+#: my-evolution/metar.c:349
 msgid "Drifting haze"
 msgstr "Mainīgs dūmakas daudzums"
 
-#: my-evolution/metar.c:349
+#: my-evolution/metar.c:350
 msgid "Freezing haze"
 msgstr "Saldējoša dūmaka"
 
 #. SPRAY
-#: my-evolution/metar.c:352
+#: my-evolution/metar.c:353
 msgid "Spray"
 msgstr "Smidzināšana"
 
-#: my-evolution/metar.c:353
+#: my-evolution/metar.c:354
 msgid "Spray in the vicinity"
 msgstr "Gaidāma smidzināšana"
 
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
 msgid "Light spray"
 msgstr "Viegla smidzināšana"
 
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
 msgid "Moderate spray"
 msgstr "Mērena smidzināšana"
 
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
 msgid "Heavy spray"
 msgstr "Spēcīga smidzināšana"
 
-#: my-evolution/metar.c:357
+#: my-evolution/metar.c:358
 msgid "Shallow spray"
 msgstr "Neliela smidzināšana"
 
-#: my-evolution/metar.c:358
+#: my-evolution/metar.c:359
 msgid "Patches of spray"
 msgstr "Vietām smidzināšana"
 
-#: my-evolution/metar.c:359
+#: my-evolution/metar.c:360
 msgid "Partial spray"
 msgstr "Pa daļai smidzināšana"
 
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
 msgid "Blowing spray"
 msgstr "Smidzināšana ar vēju"
 
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
 msgid "Drifting spray"
 msgstr "Mainīgs smidzināšanas daudzums"
 
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
 msgid "Freezing spray"
 msgstr "Saldējoša smidzināšana"
 
 #. DUST
-#: my-evolution/metar.c:367
+#: my-evolution/metar.c:368
 msgid "Dust"
 msgstr "Putekļi"
 
-#: my-evolution/metar.c:368
+#: my-evolution/metar.c:369
 msgid "Dust in the vicinity"
 msgstr "Gaidāmi putekļi"
 
-#: my-evolution/metar.c:369
+#: my-evolution/metar.c:370
 msgid "Light dust"
 msgstr "Viegli putekļi"
 
-#: my-evolution/metar.c:370
+#: my-evolution/metar.c:371
 msgid "Moderate dust"
 msgstr "Mēreni putekļi"
 
-#: my-evolution/metar.c:371
+#: my-evolution/metar.c:372
 msgid "Heavy dust"
 msgstr "Spēcīgi putekļi"
 
-#: my-evolution/metar.c:373
+#: my-evolution/metar.c:374
 msgid "Patches of dust"
 msgstr "Vietām putekļi"
 
-#: my-evolution/metar.c:374
+#: my-evolution/metar.c:375
 msgid "Partial dust"
 msgstr "Pa daļai putekļi"
 
-#: my-evolution/metar.c:376
+#: my-evolution/metar.c:377
 msgid "Blowing dust"
 msgstr "Ļoti spēcīgi putekļi"
 
-#: my-evolution/metar.c:378
+#: my-evolution/metar.c:379
 msgid "Drifting dust"
 msgstr "Mainīgs putekļu daudzums"
 
 #. SQUALL
-#: my-evolution/metar.c:382
+#: my-evolution/metar.c:383
 msgid "Squall"
 msgstr "Brāzmas"
 
-#: my-evolution/metar.c:383
+#: my-evolution/metar.c:384
 msgid "Squall in the vicinity"
 msgstr "Gaidāmas brāzmas"
 
-#: my-evolution/metar.c:384
+#: my-evolution/metar.c:385
 msgid "Light squall"
 msgstr "Vieglas brāzmas"
 
-#: my-evolution/metar.c:385
+#: my-evolution/metar.c:386
 msgid "Moderate squall"
 msgstr "Mērenas brāzmas"
 
-#: my-evolution/metar.c:386
+#: my-evolution/metar.c:387
 msgid "Heavy squall"
 msgstr "Spēcīgas brāzmas"
 
-#: my-evolution/metar.c:389
+#: my-evolution/metar.c:390
 msgid "Partial squall"
 msgstr "Pa daļai brāzmas"
 
-#: my-evolution/metar.c:390
+#: my-evolution/metar.c:391
 msgid "Thunderous squall"
 msgstr "Postošas brāzmas"
 
-#: my-evolution/metar.c:391
+#: my-evolution/metar.c:392
 msgid "Blowing squall"
 msgstr "Ļoti spēcīgas brāzmas"
 
-#: my-evolution/metar.c:393
+#: my-evolution/metar.c:394
 msgid "Drifting squall"
 msgstr "Mainīgas brāzmas"
 
-#: my-evolution/metar.c:394
+#: my-evolution/metar.c:395
 msgid "Freezing squall"
 msgstr "Saldējošas brāzmas"
 
 #. SANDSTORM
-#: my-evolution/metar.c:397
+#: my-evolution/metar.c:398
 msgid "Sandstorm"
 msgstr "Smilšu vētra"
 
-#: my-evolution/metar.c:398
+#: my-evolution/metar.c:399
 msgid "Sandstorm in the vicinity"
 msgstr "Tuvojas smilšu vētra"
 
-#: my-evolution/metar.c:399
+#: my-evolution/metar.c:400
 msgid "Light standstorm"
 msgstr "Viegla smilšu vētra"
 
-#: my-evolution/metar.c:400
+#: my-evolution/metar.c:401
 msgid "Moderate sandstorm"
 msgstr "Mērena smilšu vētra"
 
-#: my-evolution/metar.c:401
+#: my-evolution/metar.c:402
 msgid "Heavy sandstorm"
 msgstr "Spēcīga smilšu vētra"
 
-#: my-evolution/metar.c:402
+#: my-evolution/metar.c:403
 msgid "Shallow sandstorm"
 msgstr "Neliela smilšu vētra"
 
-#: my-evolution/metar.c:404
+#: my-evolution/metar.c:405
 msgid "Partial sandstorm"
 msgstr "Pa daļai smilšu vētra"
 
-#: my-evolution/metar.c:405
+#: my-evolution/metar.c:406
 msgid "Thunderous sandstorm"
 msgstr "Postoša smilšu vētra"
 
-#: my-evolution/metar.c:406
+#: my-evolution/metar.c:407
 msgid "Blowing sandstorm"
 msgstr "Ļoti spēcīga smilšu vētra"
 
-#: my-evolution/metar.c:408
+#: my-evolution/metar.c:409
 msgid "Drifting sandstorm"
 msgstr "Mainīga smilšu vētra"
 
-#: my-evolution/metar.c:409
+#: my-evolution/metar.c:410
 msgid "Freezing sandstorm"
 msgstr "Saldējoša smilšu vētra"
 
 #. DUSTSTORM
-#: my-evolution/metar.c:412
+#: my-evolution/metar.c:413
 msgid "Duststorm"
 msgstr "Putekļu vētra"
 
-#: my-evolution/metar.c:413
+#: my-evolution/metar.c:414
 msgid "Duststorm in the vicinity"
 msgstr "Gaidāma putekļu vētra"
 
-#: my-evolution/metar.c:414
+#: my-evolution/metar.c:415
 msgid "Light duststorm"
 msgstr "Viegla putekļu vētra"
 
-#: my-evolution/metar.c:415
+#: my-evolution/metar.c:416
 msgid "Moderate duststorm"
 msgstr "Mērena putekļu vētra"
 
-#: my-evolution/metar.c:416
+#: my-evolution/metar.c:417
 msgid "Heavy duststorm"
 msgstr "Spēcīga putekļu vētra"
 
-#: my-evolution/metar.c:417
+#: my-evolution/metar.c:418
 msgid "Shallow duststorm"
 msgstr "Neliela putekļu vētra"
 
-#: my-evolution/metar.c:419
+#: my-evolution/metar.c:420
 msgid "Partial duststorm"
 msgstr "Pa daļai putekļu vētra"
 
-#: my-evolution/metar.c:420
+#: my-evolution/metar.c:421
 msgid "Thunderous duststorm"
 msgstr "Postoša putekļu vētra"
 
-#: my-evolution/metar.c:421
+#: my-evolution/metar.c:422
 msgid "Blowing duststorm"
 msgstr "Ļoti spēcīga putekļu vētra"
 
-#: my-evolution/metar.c:423
+#: my-evolution/metar.c:424
 msgid "Drifting duststorm"
 msgstr "Mainīga putekļu vētra"
 
-#: my-evolution/metar.c:424
+#: my-evolution/metar.c:425
 msgid "Freezing duststorm"
 msgstr "Saldējoša putekļu vētra"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
+#: my-evolution/metar.c:428
 msgid "Funnel cloud"
 msgstr "Dūmu mākonis"
 
-#: my-evolution/metar.c:428
+#: my-evolution/metar.c:429
 msgid "Funnel cloud in the vicinity"
 msgstr "Gaidāmi dūmu makoņi"
 
-#: my-evolution/metar.c:429
+#: my-evolution/metar.c:430
 msgid "Light funnel cloud"
 msgstr "Viegli dūmu makoņi"
 
-#: my-evolution/metar.c:430
+#: my-evolution/metar.c:431
 msgid "Moderate funnel cloud"
 msgstr "Mēreni dūmu makoņi"
 
-#: my-evolution/metar.c:431
+#: my-evolution/metar.c:432
 msgid "Thick funnel cloud"
 msgstr "Biezi dūmu makoņi"
 
-#: my-evolution/metar.c:432
+#: my-evolution/metar.c:433
 msgid "Shallow funnel cloud"
 msgstr "Sekli dūmu makoņi"
 
-#: my-evolution/metar.c:433
+#: my-evolution/metar.c:434
 msgid "Patches of funnel clouds"
 msgstr "Vietām dūmu makoņi"
 
-#: my-evolution/metar.c:434
+#: my-evolution/metar.c:435
 msgid "Partial funnel clouds"
 msgstr "Pa daļai dūmu makoņi"
 
-#: my-evolution/metar.c:436
+#: my-evolution/metar.c:437
 msgid "Funnel cloud w/ wind"
 msgstr "Dūmu makoņi ar vēju"
 
-#: my-evolution/metar.c:438
+#: my-evolution/metar.c:439
 msgid "Drifting funnel cloud"
 msgstr "Mainīgs dūmu makoņu daudzums"
 
 #. 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 "Gaidāms tornado"
 
-#: my-evolution/metar.c:445
+#: my-evolution/metar.c:446
 msgid "Moderate tornado"
 msgstr "Mērens tornādo"
 
-#: my-evolution/metar.c:446
+#: my-evolution/metar.c:447
 msgid "Raging tornado"
 msgstr "Spēcīgs tornādo"
 
-#: my-evolution/metar.c:449
+#: my-evolution/metar.c:450
 msgid "Partial tornado"
 msgstr "Pa daļai tornādo"
 
-#: my-evolution/metar.c:450
+#: my-evolution/metar.c:451
 msgid "Thunderous tornado"
 msgstr "Postošs tornādo"
 
-#: my-evolution/metar.c:453
+#: my-evolution/metar.c:454
 msgid "Drifting tornado"
 msgstr "Mainīgs tornādo"
 
-#: my-evolution/metar.c:454
+#: my-evolution/metar.c:455
 msgid "Freezing tornado"
 msgstr "Saldējošs tornādo"
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:457
+#: my-evolution/metar.c:458
 msgid "Dust whirls"
 msgstr "Putekļu virpuļi"
 
-#: my-evolution/metar.c:458
+#: my-evolution/metar.c:459
 msgid "Dust whirls in the vicinity"
 msgstr "Gaidāmi putekļu virpuļi"
 
-#: my-evolution/metar.c:459
+#: my-evolution/metar.c:460
 msgid "Light dust whirls"
 msgstr "Viegli putekļu virpuļi"
 
-#: my-evolution/metar.c:460
+#: my-evolution/metar.c:461
 msgid "Moderate dust whirls"
 msgstr "Mēreni putekļu virpuļi"
 
-#: my-evolution/metar.c:461
+#: my-evolution/metar.c:462
 msgid "Heavy dust whirls"
 msgstr "Spēcīgi putekļu virpuļi"
 
-#: my-evolution/metar.c:462
+#: my-evolution/metar.c:463
 msgid "Shallow dust whirls"
 msgstr "Nelieli putekļu virpuļi"
 
-#: my-evolution/metar.c:463
+#: my-evolution/metar.c:464
 msgid "Patches of dust whirls"
 msgstr "Vietām putekļu virpuļi"
 
-#: my-evolution/metar.c:464
+#: my-evolution/metar.c:465
 msgid "Partial dust whirls"
 msgstr "Pa daļai putekļu virpuļi"
 
-#: my-evolution/metar.c:466
+#: my-evolution/metar.c:467
 msgid "Blowing dust whirls"
 msgstr "Ļoti spēcīgi putekļu virpuļi"
 
-#: my-evolution/metar.c:468
+#: my-evolution/metar.c:469
 msgid "Drifting dust whirls"
 msgstr "Mainīgi putekļu virpuļi"
 
@@ -24890,31 +25144,33 @@ msgstr "_Saraksts"
 msgid "_Weather"
 msgstr "_Laikapstākļi"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution folder settings."
-msgstr "Konfigurācijas kontrole Evolution mapju uzstādījumiem."
-
-#: 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 "Konfigurēt speciālo mapju un nesaistes mapes uzvedību šeit"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution čaula."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
 msgid "Folder Settings"
 msgstr "Mapes uzstādījumi"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "The Evolution shell."
-msgstr "Evolution čaula."
-
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr "Parādīt detaļas"
 
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
 msgid "Cancel Operation"
 msgstr "Atsaukt operāciju"
 
-#: shell/e-folder-dnd-bridge.c:53
+#: shell/e-folder-dnd-bridge.c:55
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24923,54 +25179,37 @@ msgstr ""
 "Nevar pārsūtīt mapi:\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
 #, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "\"%s\" iekš \"%s\""
 
-#: shell/e-folder-list.c:312
+#: shell/e-folder-list.c:338
 msgid "Add a Folder"
 msgstr "Pievienot mapi"
 
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
 msgid "Drafts"
 msgstr "Melnraksti"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
-#: shell/e-shortcuts.c:1051
+#: 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 "Iesūtne"
 
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:181
 msgid "Outbox"
 msgstr "Izsūtne"
 
-#: shell/e-local-storage.c:181
+#: shell/e-local-storage.c:182
 msgid "Sent"
 msgstr "Nosūtītās"
 
-#: shell/e-setup.c:126
-msgid "Evolution installation"
-msgstr "Evolution installācija"
-
-#: shell/e-setup.c:130
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Šī jaunā Evolution versija pieprasa uzinstalētus jaunus failus\n"
-"jūsu personīgajā Evolution direktorijā"
-
-#: shell/e-setup.c:131
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Lūdzu klikšķiniet \"Labi\", lai instalētu failus, vai \"Atcelt\", lai izietu."
-
-#: shell/e-setup.c:171
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "Nevar korekti atjaunināt failus"
 
-#: shell/e-setup.c:194
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -24981,7 +25220,7 @@ msgstr ""
 "%s\n"
 "Kļūda: %s"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -24990,40 +25229,7 @@ msgstr ""
 "Kļūda kopējot failus uz\n"
 "`%s'."
 
-#: shell/e-setup.c:282
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Evolution nevarēja izveidot direktoriju\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 ""
-"Direktorijai %s\n"
-"nav pareizas atļaujas. Lūdzu padariet\n"
-"to nolasāmu un sāknējamu un pārstartējiet 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 ""
-"Failam %s\n"
-"jābūt izdzēstam, lai at atļautu Evolution strādāt pareizi.\n"
-"Lūdzu izdzēsiet šo failu un pārstartējiet Evolution."
-
-#: shell/e-setup.c:329
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -25034,21 +25240,7 @@ msgstr ""
 "Lūdzu pārvietojiet to, lai atļautu Evolution\n"
 "instalēt lietotāja failus."
 
-#: 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 ir atradusi vecu\n"
-" izpildkopsavilkuma direktoriju.\n"
-"Tai ir jābūt izdzēstai pirms\n"
-"tiek palaista Evolution.\n"
-"Vai jūs vēlaties izdzēst šo direktoriju?"
-
-#: shell/e-setup.c:368
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25063,23 +25255,23 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Piedāvā jums"
 
-#: shell/e-shell-config-autocompletion.c:106
+#: shell/e-shell-config-autocompletion.c:110
 msgid "Extra Completion folders"
 msgstr "Papildus aizpildes mapes"
 
-#: shell/e-shell-config-default-folders.c:133
+#: shell/e-shell-config-default-folders.c:149
 msgid "Select Default Folder"
 msgstr "Izvēlēties noklusēto mapi"
 
-#: shell/e-shell-config-folder-settings.c:71
+#: shell/e-shell-config-folder-settings.c:70
 msgid "Default Folders"
 msgstr "Noklusētās mapes"
 
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
 msgid "Offline Folders"
 msgstr "Nesaistes mapes"
 
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 msgid "Autocompletion Folders"
 msgstr "Autoaizpildes mapes"
 
@@ -25088,42 +25280,42 @@ msgstr "Autoaizpildes mapes"
 msgid "Cannot copy folder: %s"
 msgstr "Nevaru nokopēt mapi: %s"
 
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
 #, c-format
 msgid "Cannot move folder: %s"
 msgstr "Nevaru pārvietot mapi: %s"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr "Nevaru pārvietot mapi pār sevi pašu."
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr "Nevaru nokopēt mapi pār sevi pašu."
 
-#: 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 "Nevaru pārvietot mapi uz vienu no tās apakšmapēm."
 
-#: 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 "Norādiet mapi, uz kurieni kopēt mapi \"%s\":"
 
-#: shell/e-shell-folder-commands.c:325
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr "Kopēt mapi"
 
-#: 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 "Norādiet mapi, uz kuru pārvietot mapi \"%s\":"
 
-#: shell/e-shell-folder-commands.c:369
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "Pārvietot mapi"
 
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25132,17 +25324,17 @@ msgstr ""
 "Nevaru izdzēst mapi:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:406
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Dzēst \"%s\""
-
-#: shell/e-shell-folder-commands.c:407
+#: shell/e-shell-folder-commands.c:405
 #, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "Patiešām izdzēst mapi \"%s\"?"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:412
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Dzēst \"%s\""
+
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25151,26 +25343,26 @@ msgstr ""
 "Nevaru pārsaukt mapi:\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 "Pārdēvēt \"%s\" mapi par:"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr "Pārdēvēt mapi"
 
-#: 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 "Norādītais mapes nosaukums nav pareizs: %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 "Izvēlētā mape nepieder citam lietotājam"
 
-#: shell/e-shell-folder-commands.c:589
+#: shell/e-shell-folder-commands.c:586
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25179,7 +25371,7 @@ msgstr ""
 "Nevar izņemt mapi:\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"
@@ -25188,23 +25380,19 @@ msgstr ""
 "Nevar izveidot norādīto mapi:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:308
 msgid "Create New Folder"
 msgstr "Izveidot jaunu mapi"
 
-#: shell/e-shell-folder-selection-dialog.c:393
-msgid "New..."
-msgstr "Jauns..."
-
-#: shell/e-shell-folder-title-bar.c:637 shell/e-shell-folder-title-bar.c:638
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Nenosaukts)"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid "Choose the type of importer to run:"
 msgstr "Izvēlieties importētāja tipu:"
 
-#: 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"
@@ -25218,11 +25406,11 @@ msgstr ""
 "Jūs varat izvēlēties \"Automātiski\", ja jūs precīzi nezināt faila tipu. "
 "Evolution mēģinās tad to noteikt jūsu vietā."
 
-#: 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 "Lūdzu izvēlieties informāciju, ko jūs vēlētos importēt:"
 
-#: 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"
@@ -25231,21 +25419,21 @@ msgstr ""
 "Improtējam %s\n"
 "Importējām priekšmetu %d."
 
-#: shell/e-shell-importer.c:355
+#: shell/e-shell-importer.c:351
 msgid "Select importer"
 msgstr "Izvēlēties mapi"
 
-#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "Fails %s neeksistē"
 
-#: 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 kļūda "
 
-#: 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"
@@ -25254,11 +25442,11 @@ msgstr ""
 "Nav importētāja, kurš spētu tikt galā ar\n"
 "%s"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "Importējam"
 
-#: shell/e-shell-importer.c:522
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25267,17 +25455,17 @@ msgstr ""
 "Importējam %s.\n"
 "Sākam %s"
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "Kļūda sāknējot %s"
 
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Kļūda ielādējot %s"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25286,31 +25474,31 @@ msgstr ""
 "Importējam %s\n"
 "Importējam priekšmetu 1."
 
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "Automātisks"
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Faila nosaukums:"
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Izvēlieties failu"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Faila tips:"
 
-#: shell/e-shell-importer.c:716
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "Importēt datus un uzstādijumus no vecākām programmām"
 
-#: shell/e-shell-importer.c:720
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "Importēt vienu failu"
 
-#: 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"
@@ -25318,32 +25506,32 @@ msgstr ""
 "Lūdzu uzgaidiet...\n"
 "Meklējam eksistējošus uzstādijumus"
 
-#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Startēju inteliģentos importētājus"
 
-#: 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 "No %s:"
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Izvēlieties mapi"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Izvēlieties gala mērķa direktoriju, lai importētu šos datus"
 
-#: 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 "Importēt"
 
-#: shell/e-shell-offline-handler.c:582
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "Aizvērt savienojumus..."
 
-#: shell/e-shell-offline-sync.c:161
+#: shell/e-shell-offline-sync.c:163
 #, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
@@ -25352,35 +25540,43 @@ msgstr ""
 "Kļūda sinhronizējot \"%s\":\n"
 "%s"
 
-#: shell/e-shell-offline-sync.c:239
+#: shell/e-shell-offline-sync.c:232
 msgid "Syncing Folder"
 msgstr "Sinhronizējam mapi"
 
 #. 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 "Sinhronizējam \"%s\" (%d no %d) ..."
 
-#: shell/e-shell-settings-dialog.c:327
+#: shell/e-shell-settings-dialog.c:345
 msgid "Evolution Settings"
 msgstr "Evolution Uzstādījumi"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:362
+#. 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 "Lūdzu izvēlieties serveri."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 msgid "Opening Folder"
 msgstr "Atveram mapi"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:369
+#: shell/e-shell-shared-folder-picker-dialog.c:380
 #, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Atveram mapi \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:374
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, c-format
 msgid "in \"%s\" ..."
 msgstr "iekš \"%s\" ..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:460
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Nevar atvērt koplietošanas mapi: `%s'."
@@ -25389,115 +25585,109 @@ msgstr "Nevar atvērt koplietošanas mapi: `%s'."
 msgid "Cannot find the specified shared folder."
 msgstr "Nevar atrast norādīto koplietošanas mapi."
 
-#: shell/e-shell-startup-wizard.c:159
-#, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-"Nevarēju startēt Evolution pastnieka asistenta saskarni\n"
-"(%s)"
-
-#: shell/e-shell-startup-wizard.c:169
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "Nevarēju startēt Evolution pastnieka asistenta saskarni\n"
-
-#: shell/e-shell-user-creatable-items-handler.c:583
-#: shell/e-shell-user-creatable-items-handler.c:637
-#: ui/evolution-addressbook.h:14 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 "Jauna"
 
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Nav norādīts mapes nosaukums."
 
-#: shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr "Mapes nosaukums nedrīkst saturēt Return (Enter) simbolu."
 
-#: shell/e-shell-utils.c:127
-msgid "Folder name cannot contain slashes."
-msgstr "Mapes nosaukums nevar saturēt slīpzīmes."
+#: shell/e-shell-utils.c:129
+#, fuzzy
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "Mapes nosaukums nedrīkst saturēt Return (Enter) simbolu."
+
+#: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "Mapes nosaukums nedrīkst saturēt Return (Enter) simbolu."
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' un '..' ir rezervēti mapju nosaukumi."
 
-#: 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 "Izskatās, ka GNOME Pilot rīki nav uzstādīti šajā sistēmā."
 
-#: shell/e-shell-view-menu.c:102
+#: shell/e-shell-view-menu.c:97
 #, c-format
 msgid "Error executing %s."
 msgstr "Kļūda sāknējot %s."
 
-#: shell/e-shell-view-menu.c:196
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug buddy netika atrasts jūsu $PATH."
+#: shell/e-shell-view-menu.c:193
+#, fuzzy
+msgid "Bug buddy is not installed."
+msgstr "Bug buddy nevar tikt palaists."
 
-#: shell/e-shell-view-menu.c:204
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy nevar tikt palaists."
 
-#: shell/e-shell-view-menu.c:248
+#: shell/e-shell-view-menu.c:247
 msgid "About Ximian Evolution"
 msgstr "Par Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:503
+#: shell/e-shell-view-menu.c:502
 msgid "Go to folder..."
 msgstr "Iet uz mapi..."
 
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:503
 msgid "Select the folder that you want to open"
 msgstr "Izvēlies mapi, kuru jūs vēlaties atvērt"
 
-#: shell/e-shell-view-menu.c:625
+#: shell/e-shell-view-menu.c:617
 msgid "Create New Shortcut"
 msgstr "Izveidot jaunu saīsinājumu"
 
-#: 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 "Izvēlieties mapi, uz kuru jūs gribat saīsinājumu:"
 
-#: shell/e-shell-view-menu.c:788
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr "_Strādāt tiešsaistē"
 
-#: 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 "_Strādāt nesaistē"
 
-#: 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 "Strādāt nesaistē"
 
-#: shell/e-shell-view.c:226
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "(Nav atēlota mape)"
 
-#: 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 "(Nekas)"
 
-#: 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 pašreiz ir tiešaistē. Klikšķiniet pogu lai strādātu "
 "nesaistē."
 
-#: 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 ieiet nesaistes režīmā."
 
-#: 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 ""
@@ -25515,12 +25705,12 @@ msgstr ""
 "Kļūda no aktivizēšanas sistēmas ir:\n"
 "%s"
 
-#: shell/e-shell.c:739
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nevar uzstādīt vietējo glabātuvi -- %s"
 
-#: shell/e-shell.c:1877
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25531,148 +25721,142 @@ msgstr ""
 "ir pēkšņi aizvēries. Jums vajadzēs Evolution un pārstartēt datoru,\n"
 "lai tiktu atkal pie datiem."
 
-#: shell/e-shell.c:2178
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Nepareizi argrumenti"
 
-#: shell/e-shell.c:2180
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "Nevar reģistrēties uz OAF"
 
-#: shell/e-shell.c:2182
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "Konfigurāciju datubāze nav atrasta"
 
-#: shell/e-shell.c:2184 shell/e-storage.c:571
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Vispārēja kļūda"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:80
 msgid "Create new shortcut group"
 msgstr "Izveidot jaunu saīsinājumu grupu"
 
-#: shell/e-shortcuts-view.c:77
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
 msgstr "Grupas nosaukums:"
 
-#: 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 ""
 "Vai jūs patiešām vēlaties izņemt grupu\n"
 "`%s' no saīsinājumu joslas?"
 
-#: shell/e-shortcuts-view.c:178
-msgid "Don't remove"
-msgstr "Nepārvietot"
-
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr "Pārdēvēt saīsinājumu grupu"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr "Pārdēvēt izvēlēto saīsinājumu grupu par:"
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "_Mazas ikonas"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr "Parādīt saīsinājumus kā mazas ikonas"
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr "_Lielas ikonas"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr "Parādīt saīsinājumus kā lielas ikonas"
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr "_Jauna grupa..."
 
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr "Izveidot jaunu saīsinājumu grupu"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
 msgstr "_Izņemt šo grupu..."
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr "Izņemt šo saīsinājumu grupu"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
 msgstr "_Pārsaukt šo grupu..."
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr "Pārdēvēt saīsinājumu grupu"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr "_Paslēpt saīsinājumu joslu"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr "Paslēpt saīsinājumjoslu"
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:281
 msgid "Create _Default Shortcuts"
 msgstr "Izveidot _noklusētos saīsinājumus"
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:282
 msgid "Create Default Shortcuts"
 msgstr "Izveidot noklusētos saīsinājumus"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr "Pārdēvēt saīsinājumu"
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr "Pārdēvēt izvēlēto saīsinājumu par:"
 
-#: shell/e-shortcuts-view.c:408
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr "Atvērt mapi sasaistītu ar šo saīsinājumu"
 
-#: 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 "Atvērt _jaunā logā"
 
-#: 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 "Atvērt mapi, saistītu ar šo īsinājumu jaunā logā"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr "_Pārsaukt"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr "Pārdēvēt šo saīsinājumu"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Re_move"
 msgstr "_Izņemt"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Izņemt šo saīsinājumu no saīsinājumu joslas"
 
-#: shell/e-shortcuts.c:637
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr "Kļūda glabājot saīsinājumus."
 
-#: shell/e-shortcuts.c:1076
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr "Saīsinājumi"
 
@@ -25680,73 +25864,73 @@ msgstr "Saīsinājumi"
 msgid "Checkbox"
 msgstr "Izvēles rūtiņa"
 
-#: shell/e-storage.c:569
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "Nav kļūdas"
 
-#: shell/e-storage.c:573
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr "Mape ar šadu nosaukumu jau eksistē"
 
-#: shell/e-storage.c:575
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr "Norādītais mapes tips nav pareizs"
 
-#: shell/e-storage.c:577
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "I/O kļūda"
 
-#: shell/e-storage.c:579
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr "Nav pietiekami vietas, lai izveidotu mapi"
 
-#: shell/e-storage.c:581
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr "Mape nav tukša"
 
-#: shell/e-storage.c:583
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr "Norādītā mape netika atrasta"
 
-#: shell/e-storage.c:585
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr "Funkcija nav implementēta šajā glabātuvē"
 
-#: shell/e-storage.c:589
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr "Operācija nav atbalstīta"
 
-#: shell/e-storage.c:591
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr "Norādītais tips nav atbalstīts šajā glabātuvē"
 
-#: shell/e-storage.c:593
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr "Norādītā mape nevar tikt mainīta vai izņemta"
 
-#: 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 "Nevaru izveidot mapi ar šādu nosaukumu"
 
-#: shell/e-storage.c:599
+#: shell/e-storage.c:600
 msgid "This operation cannot be performed in off-line mode"
 msgstr "Šī operācija nevar tikt izpildīta nesaistes režīmā"
 
-#: 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%% izpildīts)"
 
-#: shell/evolution-folder-selector-button.c:94
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<klikšķiniet šeit, lai izvēlētos mapi>"
 
@@ -25787,84 +25971,81 @@ msgstr ""
 "Kļūda no aktivizēšanas sistēmas ir:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1145
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "COBRA kļūda"
 
-#: shell/evolution-shell-component.c:1147
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Pārtraukts"
 
-#: shell/evolution-shell-component.c:1149
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Nepareizs arguments"
 
-#: shell/evolution-shell-component.c:1151
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "Jau ir īpašnieks"
 
-#: shell/evolution-shell-component.c:1153
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Nav īpašnieka"
 
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Nav atrasts"
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Neatbalstīts tips"
 
-#: shell/evolution-shell-component.c:1159
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Neatbalstīta shēma"
 
-#: shell/evolution-shell-component.c:1161
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Neatbalstīta operācija"
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Iekšēja kļūda"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Izejam"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "Nepareizs URI"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Ir apakšmapes"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Nav brīvas vietas"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "Vecais īpašnieks ir 'miris'"
 
-#: shell/evolution-test-component.c:49
+#: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Testa tips"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr "Aktīvie savienojumi"
+#: shell/evolution-test-component.c:703
+#, fuzzy
+msgid "Evolution Test Component"
+msgstr "Evolution Kopsavilkuma komponente."
 
-#: 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šķiniet 'Labi', lai aizvērtu šos savienojumus un ietu nesaistes režīmā"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "Hosts"
-
-#: 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 "Pašreizējie aktīvie savienojumi ir:"
 
@@ -25884,15 +26065,15 @@ msgstr "_Pasts:"
 msgid "_Tasks:"
 msgstr "_Uzdevumi:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder name:"
 msgstr "Mapes nosaukums:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder type:"
 msgstr "Mapes tips:"
 
-#: 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 "Norādīt, kur lai izveidotu mapi:"
 
@@ -25912,29 +26093,30 @@ msgstr "_Mapes nosaukums:"
 msgid "_User:"
 msgstr "_Lietotājs:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution uzstādīšanas asistents"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Importējam failus"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Laika zona"
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Esiet aicināti"
 
-#: 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 ""
 "Esiet laipni aicināti Evolution. Daži nākošie ekrāni jums atļaus\n"
 "Evolution pieslēgt jūsu epasta kontiem, un importēt\n"
@@ -25942,12 +26124,13 @@ msgstr ""
 "\n"
 "Lūdzu klikšķiniet \"Nākošais\" pogu, lai turpinātu."
 
-#: 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 ""
 "Jūs esat veiksmīgi ievadījis visu informāciju,\n"
 "npeiciešamu lai uzstādītu Evolution. \n"
@@ -25988,60 +26171,112 @@ msgstr ""
 "Ar asistentu jūs tiksiet vadīts cauri\n"
 "ārējo failu importēšanas procesam Evolution."
 
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
 msgid "Importers"
 msgstr "Importeri"
 
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Neimportēt"
 
-#: shell/importer/intelligent.c:198
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Neprasiet man vēlreiz"
 
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution var importēt datus no sekojošiem failiem:"
 
-#: shell/main.c:98
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:104
+#: shell/main.c:118
 msgid "Evolution is now exiting ..."
 msgstr "Evolution tagad iziet ..."
 
-#: shell/main.c:330
+#. 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 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 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"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+"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"
+"\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"
+"\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"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+
+#: shell/main.c:290
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr ""
+"Paldies\n"
+"Ximian Evolution Komanda\n"
+
+#: shell/main.c:298
+msgid "Don't tell me again"
+msgstr "Nesakiet man vēlreiz"
+
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nevar atvērt Ximian Evolution čaulu."
 
-#: shell/main.c:339
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nevaru inicializēt Ximian Evolution čaulu: %s"
 
-#: shell/main.c:421
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Deaktivizēt splash ekrānu"
 
-#: shell/main.c:423
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "Startēt nesaistes režīmā"
 
-#: shell/main.c:425
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "Startēt tiešsaistes režīmā"
 
-#: shell/main.c:427
+#: 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 "Sūtīt visu atkļudošanas informāciju no visiem komponentiem uz failu."
 
-#: shell/main.c:429
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr "Forsēt konfigurācijas failu atjaunināšanu no Evolution versijas 1.0.x"
 
-#: shell/main.c:447
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26050,108 +26285,56 @@ msgstr ""
 "%s: --online un --offline nevar tikt lietoti kopā.\n"
 "  Izmantojiet %s --help, lai iegūtu vairāk informācijas.\n"
 
-#: shell/main.c:478
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Nevaru inicializēt Bonobo komponentu sistēmu."
-
-#: 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 "Kļūda ielādējot noklusēto adrešu grāmatu."
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Ievada fails"
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "Izvada fails"
-
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Nav dots faila nosaukums."
 
-#: tools/evolution-launch-composer.c:322
+#: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
 msgstr "Piesaistne, ko pievienot."
 
-#: tools/evolution-launch-composer.c:323
+#: tools/evolution-launch-composer.c:325
 msgid "Content type of the attachment."
 msgstr "Piesaistnes satura tips."
 
-#: tools/evolution-launch-composer.c:324
+#: tools/evolution-launch-composer.c:326
 msgid "The filename to display in the mail."
 msgstr "Faila nosaukums, kuru attēlot pastā."
 
-#: tools/evolution-launch-composer.c:325
+#: tools/evolution-launch-composer.c:327
 msgid "Description of the attachment."
 msgstr "Piesaistnes apraksts."
 
-#: tools/evolution-launch-composer.c:326
+#: tools/evolution-launch-composer.c:328
 msgid "Mark attachment to be shown inline by default."
 msgstr "Atzīmēt piesaistni, lai tā tiktu rādīta iekļauti pēc noklusējuma."
 
-#: tools/evolution-launch-composer.c:327
+#: tools/evolution-launch-composer.c:329
 msgid "Default subject for the message."
 msgstr "Vēstules noklusētais subjekts."
 
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
 #.
-#. *  This file is autogenerated from evolution-addressbook.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-addressbook.h:9
-msgid "_Print Contacts..."
-msgstr "_Drukāt kontaktus..."
-
-#: ui/evolution-addressbook.h:10
-msgid "As _Table"
-msgstr "Kā _tabulu"
-
-#: ui/evolution-addressbook.h:11
-msgid "_New Contact"
-msgstr "_Jauns kontakts"
-
-#: ui/evolution-addressbook.h:12 ui/evolution-mail-message.xml.h:113
-#: ui/evolution.xml.h:65
-msgid "_Tools"
-msgstr "_Rīki"
-
-#: ui/evolution-addressbook.h:13
-msgid "_Search for contacts"
-msgstr "_Meklēt kontaktus"
-
-#: ui/evolution-addressbook.h:17
-msgid "Find a contact"
-msgstr "Sameklēt kontaktu"
-
-#: ui/evolution-addressbook.h:19
-msgid "Print contacts"
-msgstr "Drukāt kontaktus"
-
-#: ui/evolution-addressbook.h:21
-msgid "Delete a contact"
-msgstr "Dzēst kontaktu"
-
-#: ui/evolution-addressbook.h:22
-msgid "View All"
-msgstr "Skatīt visu"
-
-#: ui/evolution-addressbook.h:23
-msgid "View all contacts"
-msgstr "Skatīt visus kontaktus"
-
-#: ui/evolution-addressbook.h:24 ui/evolution-addressbook.xml.h:26
-msgid "Stop"
-msgstr "Stop"
+#: tools/killev.c:63
+#, fuzzy, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "Nevarēju pārsaukt '%s': %s"
 
-#: ui/evolution-addressbook.h:25 ui/evolution-addressbook.xml.h:27
-msgid "Stop Loading"
-msgstr "Apturēt Ielādi"
+#: 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..."
@@ -26223,6 +26406,14 @@ msgstr "Sūtīt vēstuli kontaktam"
 msgid "Send selected contacts to another person."
 msgstr "Sūtīt izvēlētos kontaktus citai personai."
 
+#: ui/evolution-addressbook.xml.h:26
+msgid "Stop"
+msgstr "Stop"
+
+#: ui/evolution-addressbook.xml.h:27
+msgid "Stop Loading"
+msgstr "Apturēt Ielādi"
+
 #: ui/evolution-addressbook.xml.h:28
 msgid "View the current contact"
 msgstr "Parādīt pašreizējo kontaktu"
@@ -26233,7 +26424,7 @@ msgstr "Parādīt pašreizējo kontaktu"
 #: 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 "_Darbības"
 
@@ -26350,9 +26541,8 @@ msgstr "Apskatīt drukāto priekšmetu"
 msgid "Print this item"
 msgstr "Drukāt šo priekšmetu"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.h:11
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save"
 msgstr "Saglabāt"
 
@@ -26376,10 +26566,10 @@ msgstr "Saglabāt šo priekšmetu uz diska"
 
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
-#: ui/evolution-mail-messagedisplay.xml.h:7 ui/evolution-message-composer.h:31
+#: 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 "_Fails"
 
@@ -26388,7 +26578,7 @@ msgid "Print En_velope..."
 msgstr "Drukāt ap_loksni..."
 
 #: ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5 ui/evolution-message-composer.h:34
+#: ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Nogl_abāt kā..."
@@ -26403,7 +26593,7 @@ msgstr "Sūtīt _vēstuli kontaktam..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.h:33 ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:47
 #: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "N_oglabāt"
@@ -26627,7 +26817,7 @@ msgstr "Sasaistīts vēstuļu saraksts"
 msgid "_Expunge"
 msgstr "_Iztīrīt"
 
-#: 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 "_Mape"
 
@@ -27031,6 +27221,10 @@ msgstr "_Citēts"
 msgid "_Resend..."
 msgstr "_Pārsūtīt..."
 
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
+msgid "_Tools"
+msgstr "_Rīki"
+
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Atdzēst"
@@ -27039,153 +27233,29 @@ msgstr "_Atdzēst"
 msgid "Close this window"
 msgstr "Aizvērt šo logu"
 
-#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution-message-composer.h:39
+#: 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 "_Aizvērt"
 
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-message-composer.h:42
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
 msgid "_View"
 msgstr "_Skatīt"
 
-#.
-#. *  This file is autogenerated from evolution-message-composer.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-message-composer.h:9 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Atvērt"
-
-#: ui/evolution-message-composer.h:10 ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "Atvērt failu"
-
-#: ui/evolution-message-composer.h:12 ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:7
-msgid "Save the current file"
-msgstr "Saglabāt pašreizējo failu"
-
-#: ui/evolution-message-composer.h:13 ui/evolution-message-composer.xml.h:17
-msgid "Save As"
-msgstr "Saglabāt kā"
-
-#: ui/evolution-message-composer.h:14 ui/evolution-message-composer.xml.h:22
-msgid "Save the current file with a different name"
-msgstr "Saglabāt pašreizējo failu ar citu nosaukumu"
-
-#: ui/evolution-message-composer.h:16 ui/evolution-message-composer.xml.h:4
-#: ui/evolution-signature-editor.xml.h:2
-msgid "Close the current file"
-msgstr "Aizvērt pašreizējo failu"
-
-#: ui/evolution-message-composer.h:17 ui/evolution-message-composer.xml.h:20
-msgid "Save in folder..."
-msgstr "Saglabāt mapē..."
-
-#: ui/evolution-message-composer.h:18 ui/evolution-message-composer.xml.h:23
-msgid "Save the message in a specified folder"
-msgstr "Saglabāt vēstuli norādītajā mapē"
-
-#: ui/evolution-message-composer.h:19
-msgid "Insert text file..."
-msgstr "Ievietot teksta failu..."
-
-#: ui/evolution-message-composer.h:20
-msgid "Insert a file as text into the message"
-msgstr "Ievietot failu kā tekstu vēstulē"
-
-#: ui/evolution-message-composer.h:21 ui/evolution-message-composer.h:37
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Sūtīt"
-
-#: ui/evolution-message-composer.h:22
-msgid "Send the message now"
-msgstr "Sūtīt šo vēstuli tagad"
-
-#: ui/evolution-message-composer.h:23
-msgid "Send _later"
-msgstr "Sūtīt _vēlāk"
-
-#: ui/evolution-message-composer.h:24
-msgid "Send the message later"
-msgstr "Sūtīt šo vēstuli vēlāk"
-
-#: ui/evolution-message-composer.h:25 ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Piesaistīt"
 
-#: ui/evolution-message-composer.h:27
-msgid "HTML"
-msgstr "HTML"
-
-#: ui/evolution-message-composer.h:28 ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:9
-msgid "Send the mail in HTML format"
-msgstr "Sūtīt pastu HTML formātā"
-
-#: ui/evolution-message-composer.h:29 ui/evolution-message-composer.xml.h:29
-msgid "Show attachments"
-msgstr "Parādīt piesaistnes"
-
-#: ui/evolution-message-composer.h:30 ui/evolution-message-composer.xml.h:27
-msgid "Show / hide attachments"
-msgstr "Parādīt / slēpt piesaistnes"
-
-#: ui/evolution-message-composer.h:32 ui/evolution-message-composer.xml.h:45
-msgid "_Open..."
-msgstr "_Atvērt..."
-
-#: ui/evolution-message-composer.h:35
-msgid "Save in _folder... (FIXME)"
-msgstr "Saglabāt _mapē... (FIXME)"
-
-#: ui/evolution-message-composer.h:36
-msgid "_Insert text file... (FIXME)"
-msgstr "_Ievietot teksta failu... (FIXME)"
-
-#: ui/evolution-message-composer.h:38
-msgid "Send _Later"
-msgstr "Sūtīt _vēlāk"
-
-#: ui/evolution-message-composer.h:41
-msgid "F_ormat"
-msgstr "F_ormāts"
-
-#: ui/evolution-message-composer.h:43 ui/evolution-message-composer.xml.h:28
-msgid "Show _attachments"
-msgstr "P_arādīt piesaistnes"
-
-#: ui/evolution-message-composer.h:44 ui/evolution-signature-editor.xml.h:13
-#: ui/evolution.xml.h:54
-msgid "_Help"
-msgstr "_Palīdzība"
-
-#: ui/evolution-message-composer.h:45
-msgid "_About..."
-msgstr "P_ar..."
-
-#: ui/evolution-message-composer.h:46
-msgid "_Debug"
-msgstr "_Atkļūdot"
-
-#: ui/evolution-message-composer.h:47
-msgid "Send this message now"
-msgstr "Sūtīt šo vēstuli tagad"
-
-#: ui/evolution-message-composer.h:48
-msgid "Bold"
-msgstr "Paresnināts"
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Piesaistīt failu"
 
-#: ui/evolution-message-composer.h:49
-msgid "Sets something as bold"
-msgstr "Uzstāda paresnināto šriftu"
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
+msgid "Close the current file"
+msgstr "Aizvērt pašreizējo failu"
 
 #: ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
@@ -27207,6 +27277,14 @@ msgstr "For_māts"
 msgid "HT_ML"
 msgstr "H_TML"
 
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Atvērt"
+
+#: ui/evolution-message-composer.xml.h:11
+msgid "Open a file"
+msgstr "Atvērt failu"
+
 #: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP kodējums"
@@ -27223,14 +27301,56 @@ msgstr "S/MIME kodējums"
 msgid "S/MIME Sign"
 msgstr "S/MIME paraksts"
 
+#: ui/evolution-message-composer.xml.h:17
+msgid "Save As"
+msgstr "Saglabāt kā"
+
 #: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Saglabāt _melnrakstā"
 
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save in folder..."
+msgstr "Saglabāt mapē..."
+
+#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-signature-editor.xml.h:7
+msgid "Save the current file"
+msgstr "Saglabāt pašreizējo failu"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save the current file with a different name"
+msgstr "Saglabāt pašreizējo failu ar citu nosaukumu"
+
+#: ui/evolution-message-composer.xml.h:23
+msgid "Save the message in a specified folder"
+msgstr "Saglabāt vēstuli norādītajā mapē"
+
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Sūtīt"
+
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
+msgid "Send the mail in HTML format"
+msgstr "Sūtīt pastu HTML formātā"
+
 #: ui/evolution-message-composer.xml.h:26
 msgid "Send this message"
 msgstr "Sūtīt šo vēstuli"
 
+#: ui/evolution-message-composer.xml.h:27
+msgid "Show / hide attachments"
+msgstr "Parādīt / slēpt piesaistnes"
+
+#: ui/evolution-message-composer.xml.h:28
+msgid "Show _attachments"
+msgstr "P_arādīt piesaistnes"
+
+#: ui/evolution-message-composer.xml.h:29
+msgid "Show attachments"
+msgstr "Parādīt piesaistnes"
+
 #: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Parakstīt šo vēstuli ar jūsu PGP atslēgu"
@@ -27280,6 +27400,10 @@ msgstr "_No lauks"
 msgid "_Insert"
 msgstr "_Ievietot"
 
+#: ui/evolution-message-composer.xml.h:45
+msgid "_Open..."
+msgstr "_Atvērt..."
+
 #: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "Atbildēt-_Uz lauks"
@@ -27296,6 +27420,10 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Saglabāt šo failu un aizvērt logu"
 
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:52
+msgid "_Help"
+msgstr "_Palīdzība"
+
 #: ui/evolution-signature-editor.xml.h:16
 msgid "_Signature editor"
 msgstr "_Paraksta redaktors"
@@ -27469,122 +27597,114 @@ msgid "Pi_lot Settings..."
 msgstr "Pi_lot Uzstādījumi..."
 
 #: ui/evolution.xml.h:27
-msgid "Pilot Con_duit Settings..."
-msgstr "Pilot Uz_stādījumi..."
-
-#: ui/evolution.xml.h:28
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "Izdzēst mapi pievienotu ar \"Atvērt cita lietotāja mapi\""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "Sūtīt / Saņemt"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Send queued items and retrieve new items"
 msgstr "Sūtīt sarindotos priekšmetus un saņemt jaunus priekšmetus"
 
-#: ui/evolution.xml.h:31
-msgid "Set up Pilot conduit configuration"
-msgstr "Uzstādīt Pilot konfigurāciju"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Set up Pilot configuration"
 msgstr "Uzstādīt Pilot konfigurāciju"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr "Parādīt informāciju par Ximian Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Nosūtīt Kļūdu Ziņojumu"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "Nosūtīt _Kļūdu Ziņojumu"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Nosūtīt kļūdu ziņojumu, izmantojot Bug Buddy"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "Norādīt"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "Norādīt, vai tiek rādīta mapes josla"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Norādīt, vai tiek rādīta saīsinājumu josla"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr "Norādīt, vai mēs strādājam nesaistes režīmā."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "Parādīt izvēlēto mapi"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _VUJ"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 msgid "_About Ximian Evolution..."
 msgstr "_Par Ximian Evolution..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "_Kopēt..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Mapju josla"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Folder..."
 msgstr "_Mape..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "_Iet uz mapi..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr "I_mportēt..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "_Pārvietot..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "_Jauns"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "_Jauna mape"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 msgid "_Remove Other User's Folder"
 msgstr "_Dzēst cita lietotāja mapi"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "Pā_rsaukt..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "_Sūtīt / Saņemt"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "Ī_sinājumikonu josla"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 msgid "_Shortcut..."
 msgstr "Ī_sinājums..."
 
@@ -27660,9 +27780,8 @@ msgstr "Ar _kategoriju"
 msgid "_Tasks"
 msgstr "_Uzdevumi"
 
-#. 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"
 
@@ -27688,20 +27807,20 @@ msgstr ""
 "laika zonu.\n"
 " Lietojiet labo peles taustiņu, lai samazinātu."
 
-#: widgets/menus/gal-view-menus.c:295
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr "_Pašreizējais Skats"
 
 #. 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 "Skats pēc izvēles"
 
-#: widgets/menus/gal-view-menus.c:366
+#: widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View"
 msgstr "Saglabāt skatu pēc izvēles"
 
-#: widgets/menus/gal-view-menus.c:379
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr "_Definēt skatus"
 
@@ -27712,19 +27831,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 "Tagad"
 
-#: 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 "Šodien"
 
-#: 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 "Laikam jābūt šādā formātā: %s"
@@ -27733,80 +27852,80 @@ msgstr "Laikam jābūt šādā formātā: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentu vērtībai jābūt starp 0 un 100, ieskaitot"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "Baltijas"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "Centrāleiropas"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "Ķīniešu"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "Kirlicas"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr "Grieķu"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr "Ebreju"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr "Japāņu"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "Korejiešu"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "Turku"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr "Unikodes"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
 msgstr "Rietumeiropas"
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "Tradicionālā"
 
-#: 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 "Vienkāršā"
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "Ukraiņu"
 
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:97
 msgid "Visual"
 msgstr "Vizuāls"
 
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Nezināma rakstzīmju kopa: %s"
 
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr "Ievadiet kādu rakstzīmju kopu lietot"
 
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "Cita..."
 
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr "Rakstzīmju šifrēšana"
 
@@ -27814,11 +27933,12 @@ msgstr "Rakstzīmju šifrēšana"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:189
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr "Meklēšanas redaktors"
 
-#: widgets/misc/e-filter-bar.c:211
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "Saglabāt meklēšanu"
 
@@ -27834,64 +27954,723 @@ msgstr "_Rediģēt saglabātos meklējumus..."
 msgid "_Advanced..."
 msgstr "_Paplašināti..."
 
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
 msgid "Information"
 msgstr "Informācija"
 
-#: widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:168
 msgid "Error"
 msgstr "Kļūda"
 
-#: widgets/misc/e-messagebox.c:173
+#: widgets/misc/e-messagebox.c:175
 msgid "Question"
 msgstr "Jautājums"
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
 msgid "Message"
 msgstr "Vēstule"
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
-msgstr "Nerādīt šo ziņu vēlreiz."
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "_Meklēt"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:537
 msgid "_Find Now"
 msgstr "_Meklēt Tagad"
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 msgid "_Clear"
 msgstr "_Tīrs"
 
-#: 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 "Tests"
+
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "Tīrs"
 
-#: widgets/misc/e-search-bar.c:897
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Meklēt tagad"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Personālais adrešu grāmatas serveris"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
+
+#: 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 kalendāra kopsavilkuma komponente."
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Ražotne LDIF failu importēšanai Evolution."
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Importē LDIF failus Evolution."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Ražotne VKaršu (VCard) failu importēšanai Evolution."
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Importē VKartes (VCard) failus Evolution."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "Bonobo kontrole adrešu uzniršanai."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Bonobo kontrole adrešu parādīšanai."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Vienkārša Bonobo kontrole, kas parāda adrešu grāmatu."
+
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr "Evolution adrešu grāmatu glabātuvju konfigurācijas kontrole."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Kontrole, kas parāda Evolution adrešu grāmatas minikarti."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Evolution komponente kontaktu pārvaldīšanai."
+
+#~ msgid "Factory for the Addressbook Minicard control"
+#~ msgstr "Ražotne Adrešu grāmatas minikaršu kontrolei"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "Personālais kalendāra serveris; kalendāra ražotne"
+#~ msgid "Factory for the Addressbook's address displayer"
+#~ msgstr "Ražotne adrešu grāmatas adrešu rādītājam"
 
-#: wombat/wombat.c:199
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): nevaru inicializēt  GNOME-VFS"
+#~ msgid ""
+#~ "Factory for the configuration controls for the Evolution Addressbook."
+#~ msgstr "Konfigurācijas kontroļu ražotne Evolution adrešu grāmatai."
+
+#~ msgid "Factory for the sample Addressbook control"
+#~ msgstr "Ražotne vienkāršai adrešu grāmatas kontrolei"
+
+#~ msgid "1234"
+#~ msgstr "1234"
+
+#~ msgid "380"
+#~ msgstr "380"
+
+#~ msgid "666"
+#~ msgstr "666"
+
+#~ msgid "<- _Remove"
+#~ msgstr "<- _Izņemt"
+
+#~ msgid "<< Fewer Options"
+#~ msgstr "<< Mazāk opcijas"
+
+#~ msgid "Add (or Edit) Attribute Mappings"
+#~ msgstr "Pievienot (vai rediģēt) atribūtu atbilstības"
+
+#~ msgid "Associated LDAP Attribute"
+#~ msgstr "Asociētais LDAP atribūts"
+
+#~ msgid "Attribute"
+#~ msgstr "Atribūts"
+
+#~ msgid "Corresponding Evolution Attribute"
+#~ msgstr "Ziņoju Evolution atribūtu"
 
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): nevaru inicializēt GNOME"
+#~ msgid "DN Customization"
+#~ msgstr "DN pārveide"
 
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): nevaru inicializēt Bonobo"
+#~ msgid "Evolution Attribute"
+#~ msgstr "Evolution atribūts"
+
+#~ msgid "LDAP Attribute"
+#~ msgstr "LDAP atribūts"
+
+#~ msgid "Mappings"
+#~ msgstr "Atbilstības"
+
+#~ msgid "Objectclasses"
+#~ msgstr "Objektklases"
+
+#~ msgid "Objectclasses Used in Evolution:"
+#~ msgstr "Evolution izmantotās objektklases:"
+
+#~ msgid "Objectclasses Used on Server:"
+#~ msgstr "Servera izmantotās objektklases:"
+
+#~ msgid ""
+#~ "Please select an Evolution attribute and an\n"
+#~ "LDAP attribute to associate with it."
+#~ msgstr ""
+#~ "Lūdzu izvēlieties Evolution atribūtu un\n"
+#~ "LDAP atribūtu, ar kuru to asociēt."
+
+#~ msgid "R_estore Defaults"
+#~ msgstr "At_jaunot noklusējumus"
+
+#~ msgid "Re_store Defaults"
+#~ msgstr "At_jaunot noklusējumus"
+
+#~ msgid "Select"
+#~ msgstr "Izvēlēties"
+
+#~ 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 ""
+#~ "Lai pievienotu atribūtu DN, izvēlieties to no saraksta un klikšķiniet "
+#~ "\"Pievienot atribūtu\" pogu.\n"
+#~ "Jebkuras vērtības, kuras jūs pievienosiet DN kļūs par pieprasītām "
+#~ "vērŧībām priekš jebkuriem jauniem\n"
+#~ "kontaktiem kurus jūs pievienosiet LDAP serverim."
+
+#~ msgid "_Add ->"
+#~ msgstr "_Pievienot ->"
+
+#~ msgid "_Add Mapping"
+#~ msgstr "_Pievienot atbilstību"
+
+#~ msgid "_Add to DN"
+#~ msgstr "_Pievienot DN"
+
+#~ msgid "_Always"
+#~ msgstr "_Vienmēr"
+
+#~ msgid "_Delete Mapping"
+#~ msgstr "_Dzēst atbilstību"
+
+#~ msgid "_Distinguished Name (DN):"
+#~ msgstr "_Atšķiramais vārds (DN):"
+
+#~ msgid "_Don't use SSL/TLS"
+#~ msgstr "_Neizmantot SSL/TLS"
+
+#~ msgid "_Edit Mapping"
+#~ msgstr "_Rediģēt atbilstību"
+
+#~ msgid "_Evolution attribute:"
+#~ msgstr "_Evolution atribūts:"
+
+#~ msgid "_If necessary "
+#~ msgstr "_Ja nepieciešams"
+
+#~ msgid "_LDAP attribute:"
+#~ msgstr "_LDAP atribūts:"
+
+#~ msgid "_LDAP attributes:"
+#~ msgstr "_LDAP atribūti:"
+
+#~ msgid "_More Options >>"
+#~ msgstr "_Vairāk opcijas >>"
+
+#~ msgid "_Restore Defaults"
+#~ msgstr "_Atjaunot noklusējumus"
+
+#~ msgid "account-druid"
+#~ msgstr "account-druid"
+
+#~ msgid "account-editor"
+#~ msgstr "account-editor"
+
+#~ 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 "Factory for the Addressbook's name selection interface"
+#~ msgstr "Ražotne Adrešu grāmatas vārda izvēles saskarnei"
+
+#~ msgid "Edit Contact List"
+#~ msgstr "Rediģēt kontaktu sarakstu"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Nenosaukts kontaktu saraksts"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d nav parādīts)"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "K_ontakti..."
+
+#~ msgid "Phone Types"
+#~ msgstr "Telefona tipi"
+
+#~ msgid "Delete Contact?"
+#~ msgstr "Dzēst Kontaktu?"
+
+#~ msgid "Confirm Overwrite"
+#~ msgstr "Apstiprināt pārrakstīšanu"
+
+#~ msgid "Don't bother translating this string.  It's not used."
+#~ msgstr "Don't bother translating this string.  It's not used."
+
+#~ msgid "Display Cards?"
+#~ msgstr "Attēlot kartes?"
+
+#~ msgid "Display Cards"
+#~ msgstr "Attēlot kartes"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Bonobo kontrole, kas parāda uzdevumu sarakstu."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Vienkārša Bonobo kontrole, kura attēlo kalendāru."
+
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Evolution kalendāra konfigurācijas kontrole."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Evolution komponente kalendāra vadīšanai."
+
+#~ msgid "Factory for the Evolution Tasks control"
+#~ msgstr "Ražotne Evolution Uzdevumu kontrolei"
+
+#~ msgid "Factory for the calendar iTip view control"
+#~ msgstr "Ražotne kalendāra iTip skata kontrolei"
+
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr "Ražotne vienkāršai kalendāra kontrolei."
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr "Ražotne kalendāra komponentes redaktora dialogu centralizēšanai"
+
+#~ msgid "Factory to create a component editor factory"
+#~ msgstr "Ražotne komponenšu redaktora ražotnes radīšanai"
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Trauksmes notifikācijas serviss"
+
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "Nevarēju inicializēt GNOME"
+
+#~ msgid ""
+#~ "Evolution does not yet support email notification for reminders.  You "
+#~ "will not be able to edit the options for this reminder."
+#~ msgstr ""
+#~ "Evolution vēl neatbalsta šāda veida atgādinājumus. Jums nebūs iespējams "
+#~ "rediģēt opcijas šim atgādinājumam."
+
+#~ msgid "st"
+#~ msgstr "."
+
+#~ msgid "nd"
+#~ msgstr "."
+
+#~ msgid "rd"
+#~ msgstr "."
+
+#~ msgid "th"
+#~ msgstr "."
+
+#~ msgid "Could not activate Bonobo"
+#~ msgstr "Nevarēju aktivizēt Bonobo"
+
+#~ msgid "Could not create the component editor factory"
+#~ msgstr "Nevarēju izveidot komponentes redaktora ražotni"
+
+#~ msgid "Print Calendar"
+#~ msgstr "Drukāt Kalendāru"
+
+#~ msgid ""
+#~ "Could not create the tasks view.  Please check your ORBit and OAF setup."
+#~ msgstr ""
+#~ "Nevar izveidot uzdevumu skatu. Lūdzu pārbaudiet jūsu ORBit un OAF "
+#~ "uzstādījumu."
+
+#~ msgid ""
+#~ "Evolution has taken the tasks that were in your calendar folder and "
+#~ "automatically migrated them to the new tasks folder."
+#~ msgstr ""
+#~ "Evolution automātiski pārvietoja uzdevumus, kas bija jūsu kalendāra mapē, "
+#~ "uz jaunizveidoto uzdevumu mapi."
+
+#~ 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 ir mēģinājusi pārvietot uzdevumus no jūsu kalendāra mapes uz "
+#~ "jauno uzdevumu mapi.\n"
+#~ "Daži no uzdevumu ierakstiem nevarēja tikt pārvietoti, tāpēc šis process "
+#~ "var tikt vēlreiz mēģināts vēlāk."
+
+#~ msgid ""
+#~ "Could not open `%s'; no items from the calendar folder will be migrated "
+#~ "to the tasks folder."
+#~ msgstr ""
+#~ "Nevar atvērt `%s'; priekšmeti no kalendāra mapes uz uzdevumu mapi netiks "
+#~ "pārnesti."
+
+#~ msgid ""
+#~ "The method required to load `%s' is not supported; no items from the "
+#~ "calendar folder will be migrated to the tasks folder."
+#~ msgstr ""
+#~ "Metode, kas pieprasīta lai ielādētu '%s', nav atbalstīta; nekādi "
+#~ "priekšmeti no kalendāra mapes netiks migrēti uz uzdevumu mapi."
+
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Ražotne, lai importētu iKalendāra failus Evolution"
+
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Importē iKalendāra failus Evolution"
+
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Importē vCalendar failus Evolution"
+
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr "Nevaru dabūt glabātuvju sarakstu no reģistra: %s"
+
+#~ msgid "Can't call getFolderAtPath on storage: %s"
+#~ msgstr "Nevaru izsaukt getFolderAtPath glabātuvē: %s"
+
+#~ msgid "Warning!"
+#~ msgstr "Brīdinājums!"
+
+#~ msgid ""
+#~ "Could not create composer window, because you have not yet\n"
+#~ "configured any identities in the mail component."
+#~ msgstr ""
+#~ "Nevarēju izveidot sacerētāja logu, tāpēc ka jūs neesat\n"
+#~ "vēl konfigurējis nekādas identitātes pasta komponentē."
+
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "Nevaru inicializēt Evolution sacerētāju."
+
+#~ msgid "minute"
+#~ msgstr "minūte"
+
+#~ msgid "hour"
+#~ msgstr "stunda"
+
+#~ msgid "week"
+#~ msgstr "nedēļa"
+
+#~ msgid "year"
+#~ msgstr "gads"
+
+#~ msgid "Add action"
+#~ msgstr "Pievienot darbību"
+
+#~ msgid "Add criterion"
+#~ msgstr "Pievienot kritēriju"
+
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Konfigurācijas kontrole Evolution attēlošanas fontiem."
+
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Konfigurācijas kontrole Evolution pasta kontiem."
+
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Konfigurācijas kontrole Evolution pastniekam."
+
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Konfigurācijas kontrole Evolution vēstuļu sacerētājam."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Evolution komponente pasta parvāldīšanai."
+
+#~ msgid "Evolution mail folder factory component."
+#~ msgstr "Evolution pasta mapes ražotnes komponents."
+
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr "Evolution sacerētāja ražotne."
+
+#~ msgid "Factory for the Mail Summary component."
+#~ msgstr "Pasta kopsavilkuma komponentes ražotne."
+
+#~ msgid "Warning: Unsent Messages"
+#~ msgstr "Brīdinājums: nenosūtītas vēstules"
+
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "Nevaru inicializēt Evolution pasta komponenti."
+
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "Nevar initializēt Evolution pasta konfigurācijas komponentu."
+
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Nevar initializēt Evolution mapes informatīvo komponentu."
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Ražotne, lai importētu mbox Evolution"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importē mbox failus Evolution"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "Ražotne, lai importētu Outlook Express 4 pastu Evolution."
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importē Outlook Express 4 failus Evolution"
+
+#~ msgid "Really delete account?"
+#~ msgstr "Tiešām dzēst kontu?"
+
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "Doties uz nākamo mapi ar neizlasītām vēstulēm?"
+
+#~ msgid ""
+#~ "There are no more new messages in this folder.\n"
+#~ "Would you like to go to the next folder?"
+#~ msgstr ""
+#~ "Šajā mapē nav vairs jaunu vēstuļu.\n"
+#~ "Vai jūs vēlētos doties uz nākamo mapi?"
+
+#~ msgid "US-Letter"
+#~ msgstr "US-Letter"
+
+#~ msgid ""
+#~ "Please specify signature filename\n"
+#~ "in Advanced section of signature settings."
+#~ msgstr ""
+#~ "Lūdzu norādiet paraksta faila nosaukumu\n"
+#~ "Paplašināti sekcijā, parakstu uzstādījumos."
+
+#~ msgid "Add Signature"
+#~ msgstr "Pievienot parakstu"
+
+#~ msgid "Account %d"
+#~ msgstr "Konts %d"
+
+#~ msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+#~ msgstr "AaĀāBbCcČčDdEeĒēGgĢģHhĪīJjKkĶķĻļMmNnŅņOoPpRrSsTtUuŪūVvZzŽž"
+
+#~ msgid "On Screen fonts"
+#~ msgstr "Ekrāna fonti"
+
+#~ msgid "Spell Checking Language"
+#~ msgstr "Pareizrakstības pārbaudes valoda"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "_Fiksēts platums:"
+
+#~ msgid "_Variable-width:"
+#~ msgstr "_Mainīgs platums:"
+
+#~ msgid "All folders"
+#~ msgstr "Visas mapes"
+
+#~ msgid "Display Options"
+#~ msgstr "Attēlošanas opcijas"
+
+#~ msgid "Folders whose names begin with:"
+#~ msgstr "Mapes ar nosaukumiem, kuri sākas ar:"
+
+#~ msgid "Refresh folder listing"
+#~ msgstr "Atjaunināt mapju sarakstu"
+
+#~ msgid "Marquette"
+#~ msgstr "Marquette"
+
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "Kopsavilkuma komponente nespēja inicializēt Bonobo.\n"
+
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Konfigurācijas kontrole Evolution mapju uzstādījumiem."
+
+#~ msgid "Evolution installation"
+#~ msgstr "Evolution installācija"
+
+#~ msgid ""
+#~ "This new version of Evolution needs to install additional files\n"
+#~ "into your personal Evolution directory"
+#~ msgstr ""
+#~ "Šī jaunā Evolution versija pieprasa uzinstalētus jaunus failus\n"
+#~ "jūsu personīgajā Evolution direktorijā"
+
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr ""
+#~ "Lūdzu klikšķiniet \"Labi\", lai instalētu failus, vai \"Atcelt\", lai "
+#~ "izietu."
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Evolution nevarēja izveidot direktoriju\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 ""
+#~ "Direktorijai %s\n"
+#~ "nav pareizas atļaujas. Lūdzu padariet\n"
+#~ "to nolasāmu un sāknējamu un pārstartējiet Evolution."
+
+#~ msgid ""
+#~ "File %s\n"
+#~ "should be removed to allow Evolution to work correctly.\n"
+#~ "Please remove this file and restart Evolution."
+#~ msgstr ""
+#~ "Failam %s\n"
+#~ "jābūt izdzēstam, lai at atļautu Evolution strādāt pareizi.\n"
+#~ "Lūdzu izdzēsiet šo failu un pārstartējiet 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 ir atradusi vecu\n"
+#~ " izpildkopsavilkuma direktoriju.\n"
+#~ "Tai ir jābūt izdzēstai pirms\n"
+#~ "tiek palaista Evolution.\n"
+#~ "Vai jūs vēlaties izdzēst šo direktoriju?"
+
+#~ msgid "New..."
+#~ msgstr "Jauns..."
+
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Nevarēju startēt Evolution pastnieka asistenta saskarni\n"
+#~ "(%s)"
+
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr "Nevarēju startēt Evolution pastnieka asistenta saskarni\n"
+
+#~ msgid "Folder name cannot contain slashes."
+#~ msgstr "Mapes nosaukums nevar saturēt slīpzīmes."
+
+#~ msgid "Bug buddy was not found in your $PATH."
+#~ msgstr "Bug buddy netika atrasts jūsu $PATH."
+
+#~ msgid "Don't remove"
+#~ msgstr "Nepārvietot"
+
+#~ msgid "Active connections"
+#~ msgstr "Aktīvie savienojumi"
+
+#~ msgid "Host"
+#~ msgstr "Hosts"
+
+#~ msgid "Cannot initialize the Bonobo component system."
+#~ msgstr "Nevaru inicializēt Bonobo komponentu sistēmu."
+
+#~ msgid "Output File"
+#~ msgstr "Izvada fails"
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "_Drukāt kontaktus..."
+
+#~ msgid "As _Table"
+#~ msgstr "Kā _tabulu"
+
+#~ msgid "_New Contact"
+#~ msgstr "_Jauns kontakts"
+
+#~ msgid "_Search for contacts"
+#~ msgstr "_Meklēt kontaktus"
+
+#~ msgid "Find a contact"
+#~ msgstr "Sameklēt kontaktu"
+
+#~ msgid "Print contacts"
+#~ msgstr "Drukāt kontaktus"
+
+#~ msgid "Delete a contact"
+#~ msgstr "Dzēst kontaktu"
+
+#~ msgid "View All"
+#~ msgstr "Skatīt visu"
+
+#~ msgid "View all contacts"
+#~ msgstr "Skatīt visus kontaktus"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Ievietot teksta failu..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Ievietot failu kā tekstu vēstulē"
+
+#~ msgid "Send the message now"
+#~ msgstr "Sūtīt šo vēstuli tagad"
+
+#~ msgid "Send _later"
+#~ msgstr "Sūtīt _vēlāk"
+
+#~ msgid "Send the message later"
+#~ msgstr "Sūtīt šo vēstuli vēlāk"
+
+#~ msgid "HTML"
+#~ msgstr "HTML"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Saglabāt _mapē... (FIXME)"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Ievietot teksta failu... (FIXME)"
+
+#~ msgid "Send _Later"
+#~ msgstr "Sūtīt _vēlāk"
+
+#~ msgid "F_ormat"
+#~ msgstr "F_ormāts"
+
+#~ msgid "_About..."
+#~ msgstr "P_ar..."
+
+#~ msgid "_Debug"
+#~ msgstr "_Atkļūdot"
+
+#~ msgid "Send this message now"
+#~ msgstr "Sūtīt šo vēstuli tagad"
+
+#~ msgid "Bold"
+#~ msgstr "Paresnināts"
+
+#~ msgid "Sets something as bold"
+#~ msgstr "Uzstāda paresnināto šriftu"
+
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "Pilot Uz_stādījumi..."
+
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "Uzstādīt Pilot konfigurāciju"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Personālais adrešu grāmatas serveris"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "Personālais kalendāra serveris; kalendāra ražotne"
+
+#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
+#~ msgstr "setup_vfs(): nevaru inicializēt  GNOME-VFS"
+
+#~ msgid "init_corba(): could not initialize GNOME"
+#~ msgstr "init_corba(): nevaru inicializēt GNOME"
+
+#~ msgid "init_bonobo(): could not initialize Bonobo"
+#~ msgstr "init_bonobo(): nevaru inicializēt Bonobo"
 
 #~ msgid ""
 #~ "Please select and Evolution attribute and an\n"
@@ -27918,66 +28697,9 @@ msgstr "init_bonobo(): nevaru inicializēt Bonobo"
 #~ msgid "Configuration control for the Evolution Summary."
 #~ msgstr "Konfigurācijas kontrole Evolution Kopsavilkumam."
 
-#~ msgid "Configure the appearance of the Evolution Summary here"
-#~ msgstr "Šeit konfigurējiet Evolution Kopsavilkuma izskatu"
-
-#~ msgid "Evolution Summary component."
-#~ msgstr "Evolution Kopsavilkuma komponente."
-
-#~ msgid "Factory for Evolution Summary's configuration control."
-#~ msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
-
 #~ msgid "Factory for the Evolution Summary component."
 #~ msgstr "Ražotne Evolution Kopsavilkuma komponentei."
 
-#~ msgid "Summary Preferences"
-#~ msgstr "Kopsavilkuma preferences"
-
-#~ 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"
-#~ "\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"
-#~ "\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"
-#~ "individuals prone to violent fits of anger.\n"
-#~ "\n"
-#~ "We hope that you enjoy the results of our hard work, and we\n"
-#~ "eagerly await your contributions!\n"
-#~ msgstr ""
-#~ "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"
-#~ "\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"
-#~ "\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"
-#~ "individuals prone to violent fits of anger.\n"
-#~ "\n"
-#~ "We hope that you enjoy the results of our hard work, and we\n"
-#~ "eagerly await your contributions!\n"
-
-#~ msgid ""
-#~ "Thanks\n"
-#~ "The Ximian Evolution Team\n"
-#~ msgstr ""
-#~ "Paldies\n"
-#~ "Ximian Evolution Komanda\n"
-
-#~ msgid "Don't tell me again"
-#~ msgstr "Nesakiet man vēlreiz"
-
 #~ msgid "_Configure..."
 #~ msgstr "_Konfigurēt..."
 
@@ -28042,9 +28764,6 @@ msgstr "init_bonobo(): nevaru inicializēt Bonobo"
 #~ "Importētājs nav gatavs.\n"
 #~ "Gaidām 5 sekundes, lai mēģinātu velreiz."
 
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Evoluion importēšanas asistents"
-
 #~ msgid "_Preferences..."
 #~ msgstr "_Preferences..."
 
@@ -28171,9 +28890,6 @@ msgstr "init_bonobo(): nevaru inicializēt Bonobo"
 #~ "laiku, kad filtrs būs aktīvs vai vmape\n"
 #~ "būs atvērta."
 
-#~ msgid "Evolution News Editor"
-#~ msgstr "Evolution ziņu redaktors"
-
 #~ msgid "Are you sure you want to delete this news account?"
 #~ msgstr "Vai jūs esat pārliecināts, ka vēlaties izdzēst šo ziņu kontu?"
 
@@ -28188,9 +28904,6 @@ msgstr "init_bonobo(): nevaru inicializēt Bonobo"
 #~ msgid "News Servers"
 #~ msgstr "Ziņu serveri"
 
-#~ msgid "Source"
-#~ msgstr "Avots"
-
 #~ msgid "Source Information"
 #~ msgstr "Avota informācija"
 
@@ -28231,9 +28944,6 @@ msgstr "init_bonobo(): nevaru inicializēt Bonobo"
 #~ msgid "Could not query for schema information"
 #~ msgstr "Nevarēju pieprasīt informāciju par shēmu"
 
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr "Evolution kalendāra kopsavilkuma komponente."
-
 #~ msgid "Factory for the Calendar Summary component."
 #~ msgstr "Pasta kopsavilkuma komponentes ražotne."
 
@@ -28308,9 +29018,6 @@ msgstr "init_bonobo(): nevaru inicializēt Bonobo"
 #~ msgid " Edit "
 #~ msgstr " Rediģēt "
 
-#~ msgid " New "
-#~ msgstr " Jauns "
-
 #~ msgid "Advanced Options"
 #~ msgstr "Paplašinātas Opcijas"
 
@@ -28605,9 +29312,6 @@ msgstr "init_bonobo(): nevaru inicializēt Bonobo"
 #~ msgid "New Contact _List"
 #~ msgstr "Jauns kontaktu _saraksts"
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "Rediģēt adrešu grāmatau"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Pievienot adrešu grāmatu"
 
@@ -28883,9 +29587,6 @@ msgstr "init_bonobo(): nevaru inicializēt Bonobo"
 #~ msgid "Regions"
 #~ msgstr "Reģioni"
 
-#~ msgid "Al_l stations:"
-#~ msgstr "Vi_sas stacijas:"
-
 #~ msgid "All _folders:"
 #~ msgstr "Visas _mapes:"
 
@@ -28901,9 +29602,6 @@ msgstr "init_bonobo(): nevaru inicializēt Bonobo"
 #~ msgid "(No name)"
 #~ msgstr "(Bez nosaukuma)"
 
-#~ msgid "New List"
-#~ msgstr "Jauns saraksts"
-
 #~ msgid "Configure the calendar's settings"
 #~ msgstr "Konfigurēt kalendāra uzstādījumus"
 
diff --git a/po/nl.po b/po/nl.po
index da8bfb6b4c..bf034df72c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 1\n"
-"POT-Creation-Date: 2003-02-27 04:33+0100\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-03-01 14:27+0100\n"
 "Last-Translator: Kees van den Broek <kvdb@NOSPAMkvdb.net>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -24,29 +24,37 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr "Fabriek om LDIF bestanden te importeren in Evolution."
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution Import Assistent"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "Importeert LDIF bestanden 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 "Fabriek om vCard bestanden te importeren in Evolution."
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution bericht-opsteller."
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importeert vCard bestanden in Evolution."
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution bericht-opsteller."
+
+#: 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 "Opslaan Als"
 
 #: 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
@@ -54,13 +62,13 @@ msgid "Name"
 msgstr "Naam"
 
 #: 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:1764
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "Eerste"
 
@@ -70,8 +78,8 @@ msgstr "1e"
 
 #: 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:1749
+#: 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 +87,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:1750
-#: addressbook/gui/contact-editor/e-contact-editor.c:1821
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr "Zakelijk"
 
@@ -90,12 +98,12 @@ msgid "Bus"
 msgstr "Bzg"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr "Terugbel"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "Bedrijf"
 
@@ -106,13 +114,13 @@ msgstr "Bedr"
 #: 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:1756
-#: addressbook/gui/contact-editor/e-contact-editor.c:1822
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr "Thuis"
 
 #: 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 "Organisatie"
@@ -123,18 +131,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:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "Mobiel"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: 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:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Bedrijfsfax"
@@ -144,13 +152,13 @@ msgid "Bus Fax"
 msgstr "Bedr. fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax thuis"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "Bedrijf 2"
 
@@ -159,43 +167,43 @@ msgid "Bus 2"
 msgstr "Bzg 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "Thuis 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: 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:1761
-#: addressbook/gui/contact-editor/e-contact-editor.c:1823
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "Overige"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1762
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Andere Fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1763
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Pieper"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
+#: 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:1766
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
@@ -206,15 +214,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:1794
+#: 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:492
-#: addressbook/gui/contact-editor/e-contact-editor.c:1795
+#: 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"
@@ -238,7 +246,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 "Kantoor"
@@ -248,7 +256,7 @@ msgid "Off"
 msgstr "Knt"
 
 #: 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 "Functie"
@@ -263,7 +271,7 @@ msgid "Prof"
 msgstr "Ber"
 
 #: 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 "Manager"
@@ -277,7 +285,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 "Bijnaam"
@@ -287,19 +295,19 @@ msgid "Nick"
 msgstr "Bijnaam"
 
 #: 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 "Echtgeno(o)t(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 "Opmerkingen"
 
 #: 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"
 
@@ -317,139 +325,144 @@ msgid "FBUrl"
 msgstr "VBUrl"
 
 #: 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 "Verjaardag"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Verj"
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "Geboortedatum"
 
-#: 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 "Categorieën"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Achternaam"
 
-#: 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-card-simple.c:893
 #: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr "Lijst van onbenoemden"
 
-#: 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 "Volledige Naam"
 
-#: 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 "Adres"
 
-#: addressbook/backend/ebook/e-card.c:1324
+#: addressbook/backend/ebook/e-card.c:1328
 msgid "Address Label"
 msgstr "Adres label"
 
-#: addressbook/backend/ebook/e-card.c:1331
+#: addressbook/backend/ebook/e-card.c:1335
 msgid "Phone"
 msgstr "Tel."
 
-#: addressbook/backend/ebook/e-card.c:1345
+#: addressbook/backend/ebook/e-card.c:1349
 msgid "Birth date"
 msgstr "Geboortedatum"
 
-#: 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 "Organisatie"
 
-#: 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 "Rol"
 
-#: addressbook/backend/ebook/e-card.c:1427 mail/mail-format.c:936
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
 #, fuzzy
 msgid "Mailer"
 msgstr "Post"
 
-#: addressbook/backend/ebook/e-card.c:1441
+#: addressbook/backend/ebook/e-card.c:1445
 msgid "Free/Busy URL"
 msgstr "Vrij/Bezet 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 "Gerelateerde contacten"
 
-#: addressbook/backend/ebook/e-card.c:1469
+#: addressbook/backend/ebook/e-card.c:1480
 msgid "Category List"
 msgstr "Categorie lijst"
 
-#: addressbook/backend/ebook/e-card.c:1476
+#: addressbook/backend/ebook/e-card.c:1487
 msgid "Wants HTML"
 msgstr "Wil HTML"
 
-#: addressbook/backend/ebook/e-card.c:1483
+#: addressbook/backend/ebook/e-card.c:1494
 msgid "Wants HTML set"
 msgstr "Wil HTML is gekozen"
 
-#: addressbook/backend/ebook/e-card.c:1490
+#: addressbook/backend/ebook/e-card.c:1501
 msgid "List"
 msgstr "Lijst"
 
-#: addressbook/backend/ebook/e-card.c:1497
+#: addressbook/backend/ebook/e-card.c:1508
 #, fuzzy
 msgid "List Show Addresses"
 msgstr "Ander Adres"
 
-#: addressbook/backend/ebook/e-card.c:1504
+#: addressbook/backend/ebook/e-card.c:1515
 msgid "Arbitrary"
 msgstr "Arbitrair"
 
-#: 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 "Laatst gebruikt"
 
-#: addressbook/backend/ebook/e-card.c:1529
+#: addressbook/backend/ebook/e-card.c:1540
 msgid "Use Score"
 msgstr "Gebruik score"
 
-#: addressbook/backend/ebook/e-card.c:2870
-msgid "Multiple VCards"
-msgstr "Meerdere Vkaarten"
-
-#: addressbook/backend/ebook/e-card.c:2878
-#, c-format
-msgid "VCard for %s"
-msgstr "Vkaart voor %s"
-
 #: addressbook/backend/ebook/test-client-list.c:15
 #: addressbook/backend/ebook/test-client.c:33
 #: calendar/gui/alarm-notify/notify-main.c:170
@@ -457,7 +470,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Kon Bonobo niet initialiseren"
 
 #: addressbook/backend/pas/pas-backend-file.c:465
-#: addressbook/backend/pas/pas-backend-ldap.c:3045
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 msgid "Searching..."
 msgstr "Bezig met zoeken..."
 
@@ -465,116 +478,118 @@ msgstr "Bezig met zoeken..."
 msgid "Loading..."
 msgstr "Bezig met laden..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:597
+#: addressbook/backend/pas/pas-backend-ldap.c:598
 #, fuzzy
 msgid "Using Distinguished Name (DN)"
 msgstr "Distinguished name (DN)"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:601
+#: addressbook/backend/pas/pas-backend-ldap.c:602
 #, fuzzy
 msgid "Using Email Address"
 msgstr "Emailadres"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:747
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 msgid "Reconnecting to LDAP server..."
 msgstr "Verbinding met LDAP server wordt opnieuw opgezet..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1290
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr "Kaart wordt toegevoegd aan LDAP server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1401
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr "Kaart wordt verwijderd van LDAP server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1637
-#: addressbook/backend/pas/pas-backend-ldap.c:1640
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr "Kaart van LDAP server wordt aangepast..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2956
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "Bezig met het ontvangen van LDAP zoekresultaten..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:3065
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 msgid "Error performing search"
 msgstr "Fout bij het zoeken"
 
-#: addressbook/conduit/address-conduit.c:292
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Standaard Sync Emailadres:"
 
-#: addressbook/conduit/address-conduit.c:535
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Cursor kon niet worden geladen\n"
 
-#: addressbook/conduit/address-conduit.c:548
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EBook niet geladen\n"
 
-#: 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 "Kon wombat server niet starten"
 
-#: 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 "Kon wombat niet starten"
 
-#: 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 "Kon de adresgegevens niet uit de pilot lezen"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Een Bonobo control dat een adresboek weergeeft."
+msgid "Configure access to LDAP directory servers here"
+msgstr "Hier kunt u de toegang tot LDAP servers instellen"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Een Bonobo control dat een adresboek weergeeft."
+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 "Een voorbeeld Bonobo control dat een adresboek weergeeft."
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Bewerk Adresboek"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr "Configuratie control voor  de Evolution adresboek opslag."
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "De adresboeknaam-selectie-interface van Evolution."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure access to LDAP directory servers here"
-msgstr "Hier kunt u de toegang tot LDAP servers instellen"
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Fabriek voor de naam selectie interface van het Adresboek"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Control dat een Evolution minikaart adresboek weergeeft."
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adresboek minikaartbekijker"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Directory Servers"
-msgstr ""
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adresboek minikaartbekijker"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution adresboek minikaartbekijker"
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution bericht-opsteller."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Component voor het afhandelen van contacten."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Factory for the controls exported by the Evolution Addressbook"
-msgstr ""
-"Fabriek voor de controls die door het Evolution adresboek worden geëxporteerd"
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution adresboek minikaartbekijker"
 
 #: 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 mail/importers/netscape-importer.c:1863
+#: 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 "Adresboek"
@@ -599,27 +614,27 @@ msgstr "Publiekelijk adresboek"
 msgid "Public folder containing contact information"
 msgstr "Map met contactinformatie die publiekelijk toegankelijk is"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Nieuw contact"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "C_ontact"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Create a new contact"
 msgstr "Nieuw contact maken"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Nieuwe contactenlijst"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "Contacten _lijst"
 
-#: addressbook/gui/component/addressbook-component.c:576
+#: addressbook/gui/component/addressbook-component.c:569
 msgid "Create a new contact list"
 msgstr "Maak een nieuwe contactenlijst"
 
@@ -639,27 +654,27 @@ msgstr "Kan geen query uitvoeren op de Root DSE"
 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 "Deze server ondersteunt geen LDAPv3 schema informatie"
 
-#: addressbook/gui/component/addressbook-config.c:1213
+#: addressbook/gui/component/addressbook-config.c:1215
 msgid "Error retrieving schema information"
 msgstr "Fout bij het laden van schema informatie"
 
-#: addressbook/gui/component/addressbook-config.c:1221
+#: addressbook/gui/component/addressbook-config.c:1223
 msgid "Server did not respond with valid schema information"
 msgstr "Het antwoord van de server bevatte geen geldige schema informatie"
 
-#: addressbook/gui/component/addressbook-config.c:1647
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr "Accountnaam"
 
-#: addressbook/gui/component/addressbook-config.c:1649
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr "Servernaam"
 
-#: 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 wordt niet ondersteund in deze versie van Evolution"
 
@@ -711,45 +726,44 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Kan het adresboek niet openen"
 
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:617
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr "Bezig met het een anonieme verbinding op te zetten met de LDAP server"
 
-#: addressbook/gui/component/addressbook.c:660
+#: addressbook/gui/component/addressbook.c:667
 msgid "Failed to authenticate.\n"
 msgstr "Fout bij het aanmelden.\n"
 
-#: addressbook/gui/component/addressbook.c:668
-#: addressbook/gui/component/addressbook.c:671
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sVoer uw wachtwoord in voor %s (gebruiker %s)"
 
-#: addressbook/gui/component/addressbook.c:806
+#: addressbook/gui/component/addressbook.c:813
 msgid "Name begins with"
 msgstr "Naam begint met"
 
-#: addressbook/gui/component/addressbook.c:807
+#: addressbook/gui/component/addressbook.c:814
 msgid "Email begins with"
 msgstr "Email begint met"
 
-#: addressbook/gui/component/addressbook.c:808
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Categorie is"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:809
+#: addressbook/gui/component/addressbook.c:816
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Een veld bevat"
 
-#: addressbook/gui/component/addressbook.c:810
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "Uitgebreid..."
 
-#: addressbook/gui/component/addressbook.c:980
+#: 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"
@@ -757,7 +771,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:986
+#: 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"
@@ -765,25 +779,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:992
+#: addressbook/gui/component/addressbook.c:999
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:995
+#: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:999
+#: addressbook/gui/component/addressbook.c:1006
 msgid "This query did not complete successfully."
 msgstr "De zoekopdracht is niet succesvol beeïndigd"
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1074
-#: calendar/gui/cal-search-bar.c:352
+#: addressbook/gui/component/addressbook.c:1089
+#: calendar/gui/cal-search-bar.c:354
 msgid "Any Category"
 msgstr "Elke categorie"
 
-#: addressbook/gui/component/addressbook.c:1154
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr "De URI die de Mapbladeraar zal laten zien"
 
@@ -792,47 +806,46 @@ msgstr "De URI die de Mapbladeraar zal laten zien"
 #. * 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 "(geen)"
 
-#: 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:1793
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr "Primaire Email"
 
-#: addressbook/gui/component/e-address-popup.c:608
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Kies een actie"
 
-#: 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 "Nieuw contact maken \"%s\""
 
-#: 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 "Voeg adres toe aan bestand contact \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:911
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Adresboek wordt benaderd..."
 
-#: 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 "Bewerk contactinformatie"
 
-#: 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 "Toevoegen aan contacten"
 
-#: addressbook/gui/component/e-address-popup.c:1068
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Emailadres invoegen"
 
@@ -860,73 +873,56 @@ msgstr "_Controleer op ondersteunde types"
 #: 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"
-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 "<- _Verwijderen"
-
-#: addressbook/gui/component/ldap-config.glade.h:15
-msgid "<< Fewer Options"
-msgstr "<< Minder opties"
-
-#: addressbook/gui/component/ldap-config.glade.h:16
-msgid "Add (or Edit) Attribute Mappings"
-msgstr ""
+#: 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 "Adresboekbronnen"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:62
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
 #: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Altijd"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Anonymously"
 msgstr "Anoniem"
 
-#: 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"
@@ -939,60 +935,57 @@ msgstr ""
 "\n"
 "Klik op de \"Finish\" knop om de zojuist gemaakte instellingen op te slaan."
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
 msgstr "Bezig met verbinden"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
-msgid "DN Customization"
-msgstr "DN Aanpassen"
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "_Verwijderen"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 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 "Emailadres:"
 
-#: 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 zal deze DN gebruiken om u te identificeren bij de server"
 
-#: 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 zal dit emailadres gebruiken om u te identificeren bij de server"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Finished"
 msgstr "Klaar"
 
-#: 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 "Algemeen"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "LDAP Configuration Assistant"
 msgstr "LDAP configuratie assistent"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "Mappings"
-msgstr "Koppelingen"
-
-#: addressbook/gui/component/ldap-config.glade.h:35 mail/mail-account-gui.c:64
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr "Nooit"
 
-#: 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"
@@ -1007,54 +1000,26 @@ msgstr ""
 "door sommige servers gebruikt voor het versleutelen van de verbinding.\n"
 "Vraag uw systeembeheerder of uw LDAP server deze protocols gebruikt."
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Objectclasses"
-msgstr "Objectclassen"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
-msgid "Objectclasses Used in Evolution:"
-msgstr "Objectklassen gebruikt in Evolution:"
-
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid "Objectclasses Used on Server:"
-msgstr "Objectklassen gebruikt op de server:"
-
-#: 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 ""
-"Kies een Evolution attribuut en een LDAP \n"
-"attribuut om het mee te associeëren."
-
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid "R_estore Defaults"
-msgstr "Zet op _standaardwaarden"
-
-#: addressbook/gui/component/ldap-config.glade.h:46
-msgid "Re_store Defaults"
-msgstr "Zet op _standaardwaarden"
-
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "Zoek_gebied: "
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:48
-#: calendar/gui/calendar-model.c:1968 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 "Zoeken"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Geselecteerd:"
 
-#: 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"
@@ -1063,7 +1028,7 @@ msgstr ""
 "Deze optie selecteren betekend dat Evolution alleen verbinding zal maken\n"
 "met uw LDAP server wanneer het SSL of TLS protocol gebruikt kan worden."
 
-#: 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"
@@ -1079,7 +1044,7 @@ msgstr ""
 "wanneer u en de LDAP server achter een firewall zitten is het niet nodig om "
 "de verbinding te versleutelen. De verbinding is dan al veilig."
 
-#: 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"
@@ -1092,7 +1057,7 @@ msgstr ""
 "u\n"
 "veiligheidsrisico's loopt."
 
-#: 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"
@@ -1101,7 +1066,7 @@ msgstr ""
 "Met deze optie kunt u de standaard Evolution LDAP zoek-, aanmaak- en \n"
 "wijzigingsinstellingen voor contacten veranderen ."
 
-#: 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."
@@ -1110,32 +1075,32 @@ msgstr ""
 "server\n"
 "te configureren."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 1: Server Information"
 msgstr "Stap 1: Server informatie"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Step 2: Connecting to Server"
 msgstr "Stap 2: Verbinden met server"
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr "Stap 3: Doorzoeken van de directory"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr "Stap 4: Schermnaam"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr "Sub"
 
 # , fuzzy
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Supported Search Bases"
 msgstr "Ondersteunde zoek 'bases'"
 
-#: 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"
@@ -1148,7 +1113,7 @@ msgstr ""
 "over\n"
 "deze informatie."
 
-#: 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"
@@ -1157,7 +1122,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"
@@ -1165,7 +1130,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"
@@ -1175,7 +1140,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"
@@ -1185,13 +1150,13 @@ 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
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -1201,7 +1166,7 @@ msgstr ""
 "Dit is het maximum aantal kaarten wat zal worden binnengehaald. Als u het te "
 "hoog zet wordt dit adresboek erg langzaam."
 
-#: 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 "
@@ -1211,7 +1176,7 @@ msgstr ""
 "op \"Email adres\" wordt gezet, is anonieme toegang tot de ldap server "
 "vereist."
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1221,7 +1186,7 @@ msgstr ""
 "Deze naam wordt gebruikt om uw account weer te geven. De naam is alleen voor "
 "weergave-doeleinden."
 
-#: 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"
@@ -1229,85 +1194,46 @@ 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 "Gebruik _SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:84
 #, fuzzy
 msgid "Using email address"
 msgstr "Emailadres"
 
-#: addressbook/gui/component/ldap-config.glade.h:101
-#: mail/mail-account-gui.c:63 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 "Indien mogelijk"
 
-#: 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
+#: 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 "_Toevoegen"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
-msgid "_Add ->"
-msgstr "_Toevoegen ->"
-
-#: addressbook/gui/component/ldap-config.glade.h:104
-msgid "_Add Mapping"
-msgstr "Koppeling _Toevoegen"
-
-#: addressbook/gui/component/ldap-config.glade.h:105
-#, fuzzy
-msgid "_Add to DN"
-msgstr "Actie Toevoegen"
-
-#: addressbook/gui/component/ldap-config.glade.h:106
-msgid "_Always"
-msgstr "_Altijd"
-
-#: addressbook/gui/component/ldap-config.glade.h:107
-msgid "_Delete Mapping"
-msgstr "_Verwijder koppeling"
-
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Display name:"
 msgstr "_Weergave naam:"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-#, fuzzy
-msgid "_Distinguished Name (DN):"
-msgstr "Distinguished name (DN)"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-msgid "_Don't use SSL/TLS"
-msgstr "Geen SSL/TLS gebruiker"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr "_Downloadlimiet:"
 
-#: addressbook/gui/component/ldap-config.glade.h:112 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
@@ -1317,149 +1243,91 @@ msgstr "_Downloadlimiet:"
 msgid "_Edit"
 msgstr "B_ewerken..."
 
-#: addressbook/gui/component/ldap-config.glade.h:113
-msgid "_Edit Mapping"
-msgstr "_Koppeling bewerken"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
-msgid "_Evolution attribute:"
-msgstr "_Evolution attribuut:"
-
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_If necessary "
-msgstr "_Indien noodzakelijk"
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_LDAP attribute:"
-msgstr "_LDAP attribuut"
-
-#: addressbook/gui/component/ldap-config.glade.h:117
-msgid "_LDAP attributes:"
-msgstr "_LDAP attributen"
-
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr "In_logmethode:"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-msgid "_More Options >>"
-msgstr "_Meer opties >>"
-
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Port number:"
 msgstr "_Poortnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_Restore Defaults"
-msgstr "_Standaard instellingen"
-
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "_Search base:"
 msgstr "Zoek_basis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "_Servernaam:"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Sluimertijd (minuten)"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
-#, fuzzy
-msgid "account-druid"
-msgstr "Account %d"
-
-#: addressbook/gui/component/ldap-config.glade.h:126
-msgid "account-editor"
-msgstr "Contactlijstbewerker"
-
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "cards"
 msgstr "kaarten"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Bezig met opnieuw verbinden met %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
-msgid "dn-customization-tab"
-msgstr "dn-aanpassings-tab"
-
-#: 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 "Algemeen-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
-msgid "mappings-tab"
-msgstr "koppelingen-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:133
-msgid "objectclasses-tab"
-msgstr "objectclassen tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "searching-tab"
 msgstr "Zoeken-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 "De adresboeknaam-selectie-interface van Evolution."
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Factory voor de naamselectie-interface van het Adresboek"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Alle verwijderen"
 
 #. 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:507
+#: 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 "Verwijderen"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:177
-msgid "Remove All"
-msgstr "Alle verwijderen"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+msgstr "Nieuwe contactenlijst"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact Info"
+msgstr "Bewerk contactinformatie"
 
-#: 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 "HTLM email versturen?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:399
-msgid "Edit Contact List"
-msgstr "Contactenlijst bewerken"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:417
-msgid "Unnamed Contact List"
-msgstr "Lijst van andere contacten"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:434
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d niet weergegeven)"
-
-#: 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 "Ander contact"
 
-#: 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 "Bron"
 
-#: 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 "Selecteer contacten uit het adresboek"
 
-#: 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 "Vind contact in"
 
@@ -1512,7 +1380,7 @@ msgid "Birthda_y:"
 msgstr "Geboortedat_um:"
 
 #: 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_tegorieën..."
@@ -1523,7 +1391,7 @@ msgstr "Samenwerking"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1343
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr "Contacten bewerken"
 
@@ -1532,7 +1400,7 @@ msgid "D_epartment:"
 msgstr "Afd_eling:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:195
+#: calendar/gui/dialogs/task-editor.c:196
 msgid "Details"
 msgstr "Details"
 
@@ -1589,14 +1457,14 @@ msgid "Wants to receive _HTML mail"
 msgstr "Bij voorkeur _HTML-berichten"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:652 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
+#: 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 "_Verwijderen"
 
@@ -1627,14 +1495,14 @@ msgstr "Homepage:"
 
 #: 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:187
+#: 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: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 "Bewerkbaar"
 
@@ -2659,48 +2527,48 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:159
+#: 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:104
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:459
 msgid "Book"
 msgstr "Boek"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:166
+#: 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 "Kaart"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:173
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
 msgid "Is New Card"
 msgstr "Is nieuwe kaart"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
 msgid "Writable Fields"
 msgstr "Beschrijfbare velden"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
 msgid "Changed"
 msgstr "Veranderd"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:836
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr "Categoriebewerker niet beschikbaar."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:844
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "This contact belongs to these categories:"
 msgstr "Dit contact behoort tot de categoriëen:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1018
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr "Contact opslaan als VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1064
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2708,7 +2576,7 @@ msgstr ""
 "Weet u zeker dat u deze\n"
 "contacten wilt verwijderen?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1067
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2716,11 +2584,11 @@ msgstr ""
 "Weet u zeker dat u dit\n"
 "contact wilt verwijderen?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1767
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2371
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kon geen widget vinden voor een veld: `%s'"
@@ -2864,28 +2732,28 @@ msgstr "Achtervoeg_sel:"
 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 "Lijst_naam:"
 
-#: 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 "Leden"
 
-#: 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 "Typ een emailadres of sleep een contact in de onderstaande lijst:"
 
-#: 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 "_Verberg de adressen bij het sturen van post naar deze lijst"
 
-#: 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 "Ve_rwijderen"
 
-#: 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 "Contactlijstbewerker"
 
@@ -2951,8 +2819,9 @@ msgstr ""
 "De veranderde naam of emailadres van dit contact bestaat reeds\n"
 "in deze map. Wilt u het toch toevoegen?"
 
+#. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:117
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Uitgebreid zoeken"
 
@@ -2972,7 +2841,7 @@ msgstr "%d kaarten"
 #: 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 "Zoekopdracht"
@@ -2985,109 +2854,110 @@ msgstr "Fout bij weergave boekvorm"
 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: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 "Fout bij aanpassen van kaart"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1160
+#: 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:1199
+#: 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 "Onbekende fout"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Opslagplaats offline"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:592
-#: shell/evolution-shell-component.c:1190
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr "Operatie niet toegestaan"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Kaart niet gevonden"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Kaart-ID bestaat reeds"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protocol niet ondersteund"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1176
+#: 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: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 "Geannuleerd"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr "Aanmelding mislukt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr "Aanmelding is vereist"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr "TLS is niet beschikbaar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr "Adresboek bestaat niet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Onbekende fout"
 
-#: 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 "Wilt u de wijzingen opslaan?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:77
 msgid "_Discard"
 msgstr "_Verwerpen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Fout bij toevoegen lijst"
 
-#: 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 "Fout bij toevoegen kaart"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:104
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Fout bij aanpassen ljist"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:114
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Fout bij verwijderen lijst"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:114
-#: addressbook/gui/widgets/e-addressbook-util.c:229
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Fout bij verwijderen kaart"
 
-#: 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"
@@ -3096,22 +2966,31 @@ msgstr ""
 "Bij het openen van %d kaarten worden %d nieuwe vensters geopend.\n"
 "Wilt u deze kaarten werkelijk allemaal openen?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:327
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr "Verplaats kaart naar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Kopieer kaart naar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:332
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Verplaats kaarten naar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Kopieer kaarten naar"
 
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "Meerdere Vkaarten"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "Vkaart voor %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
@@ -3121,13 +3000,13 @@ msgstr "Type"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-#: mail/importers/pine-importer.c:591
+#: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Adresboek"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:674
 #: addressbook/gui/widgets/e-addressbook-view.c:884
-#: addressbook/gui/widgets/e-addressbook-view.c:1864
+#: addressbook/gui/widgets/e-addressbook-view.c:1859
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Opslaan als VCard"
@@ -3204,15 +3083,15 @@ msgstr "Kopiëren"
 msgid "Paste"
 msgstr "Plakken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:10
-#: mail/mail-accounts.c:225 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 "Verwijderen"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:904
-#: calendar/gui/e-day-view.c:3674 calendar/gui/e-week-view.c:3504
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 msgid "Current View"
 msgstr "Huidige weergave"
 
@@ -3232,7 +3111,7 @@ 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"
 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:1344
+#: addressbook/gui/widgets/e-addressbook-view.c:1339
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3313,38 +3192,38 @@ msgstr "en één andere kaart."
 msgid "Save in addressbook"
 msgstr "Opslaan in het adresboek"
 
-#: 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 "Breedte"
 
-#: 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 "Hoogte"
 
-#: 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 "Heeft focus"
 
-#: addressbook/gui/widgets/e-minicard-label.c:123
+#: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Veld"
 
-#: addressbook/gui/widgets/e-minicard-label.c:130
+#: addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Veldnaam"
 
-#: addressbook/gui/widgets/e-minicard-label.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Tekst model"
 
-#: addressbook/gui/widgets/e-minicard-label.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Maximale veldnaam lengte"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:125
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
 msgstr "Kolombreedte"
 
@@ -3376,11 +3255,11 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:165
+#: addressbook/gui/widgets/e-minicard.c:169
 msgid "Selected"
 msgstr "Geselecteerd"
 
-#: addressbook/gui/widgets/e-minicard.c:172
+#: addressbook/gui/widgets/e-minicard.c:176
 msgid "Has Cursor"
 msgstr "Heeft cursor"
 
@@ -3576,228 +3455,229 @@ msgstr "Breedte:"
 msgid "_Font..."
 msgstr "_Lettertype..."
 
-#: calendar/cal-util/cal-component.c:1216
+#: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Afspraak zonder titel"
 
-#: calendar/cal-util/cal-recur.c:3983 calendar/gui/print.c:478
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
 msgid "1st"
 msgstr "1e"
 
-#: calendar/cal-util/cal-recur.c:3984 calendar/gui/print.c:478
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
 msgid "2nd"
 msgstr "2e"
 
-#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
 msgid "3rd"
 msgstr "3e"
 
-#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:478
 msgid "4th"
 msgstr "4e"
 
-#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:478
 msgid "5th"
 msgstr "5e"
 
-#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
 msgid "6th"
 msgstr "6e"
 
-#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
 msgid "7th"
 msgstr "7e"
 
-#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
 msgid "8th"
 msgstr "8e"
 
-#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:479
 msgid "9th"
 msgstr "9e"
 
-#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:479
 msgid "10th"
 msgstr "10e"
 
-#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
 msgid "11th"
 msgstr "11e"
 
-#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
 msgid "12th"
 msgstr "12e"
 
-#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
 msgid "13th"
 msgstr "13e"
 
-#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:480
 msgid "14th"
 msgstr "14e"
 
-#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:480
 msgid "15th"
 msgstr "15e"
 
-#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
 msgid "16th"
 msgstr "16e"
 
-#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
 msgid "17th"
 msgstr "17e"
 
-#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
 msgid "18th"
 msgstr "18e"
 
-#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:481
 msgid "19th"
 msgstr "19e"
 
-#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:481
 msgid "20th"
 msgstr "20e"
 
-#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
 msgid "21st"
 msgstr "21e"
 
-#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
 msgid "22nd"
 msgstr "22e"
 
-#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
 msgid "23rd"
 msgstr "23e"
 
-#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:482
 msgid "24th"
 msgstr "24ste"
 
-#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:482
 msgid "25th"
 msgstr "25e"
 
-#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:483
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
 msgid "26th"
 msgstr "26e"
 
-#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:483
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
 msgid "27th"
 msgstr "27e"
 
-#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
 msgid "28th"
 msgstr "28e"
 
-#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:483
 msgid "29th"
 msgstr "29e"
 
-#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:483
 msgid "30th"
 msgstr "30e"
 
-#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:484
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:484
 msgid "31st"
 msgstr "31e"
 
-#: 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 "Hoog"
 
-#: calendar/cal-util/cal-util.c:501 calendar/cal-util/cal-util.c:523
-#: calendar/gui/calendar-model.c:1694
-#: 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 "Normaal"
 
-#: 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 "Laag"
 
 #. 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 "Ongedefinieerd"
 
-#: calendar/conduits/calendar/calendar-conduit.c:204
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr "Meerdaagse gebeurtenissen splitsen:"
 
-#: 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 "Fout tijdens communiceren met kalenderserver"
 
-#: 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 "Kon kalendergegevens niet uit de pilot lezen"
 
-#: calendar/conduits/todo/todo-conduit.c:204
+#: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
 msgstr "Standaard prioriteit:"
 
-#: 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 "Kon actielijstgegevens niet uit de pilot lezen"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "Een Bonobo-control die een takenlijst toont."
+msgid "Calendar and Tasks"
+msgstr "Kalender en Taken"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Een voorbeeld Bonobo-control dat een kalender toont."
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configureer uw tijdzone, kalender en taaklijst hier "
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
 msgstr "Kalender en Taken"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 #, fuzzy
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Fabriek voor de Evolution opsteller."
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution kalender-samenvatting-component"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configureer uw tijdzone, kalender en taaklijst hier "
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Fabriek voor de Evolution takencomponent"
 
 #: 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 bekijker"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution component voor het afhandelen van de kalender."
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution kalender iTip/iMip bekijker"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 #, fuzzy
-msgid "Factory for the Evolution Calendar objects"
-msgstr "Fabriek voor het Evolution-samenvattingscomponent."
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Nieuwsbeheer"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr ""
-"Fabriek voor het centraliseren van kalendercomponent bewerkingsdialoogvenster"
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution Nieuwsbeheer"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Alarm notification service"
-msgstr "Alarmnotificatie-dienst"
-
-#: 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 "Fabriek voor de alarmmeldings-dienst"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
@@ -3838,17 +3718,17 @@ msgstr "Sluimertijd (minuten)"
 msgid "_Edit appointment"
 msgstr "_Afspraak bewerken"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "Geen beschrijving beschikbaar."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:742
-#: calendar/gui/alarm-notify/alarm-queue.c:766
-#: calendar/gui/tasks-control.c:457 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 "Waarschuwing"
 
-#: 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"
@@ -3860,7 +3740,7 @@ msgstr ""
 "u dit ingesteld. Evolution zal in plaats daarvan een\n"
 "normaal dialoogvenster weergeven als herinnering."
 
-#: 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 "
@@ -3877,7 +3757,7 @@ msgstr ""
 "\n"
 "Weet u zeker dat dit programma gestart moet worden?"
 
-#: 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 "Dit bericht niet meer weergeven voor dit programma."
 
@@ -3901,7 +3781,7 @@ msgstr "Omschrijving bevat"
 msgid "Comment contains"
 msgstr "Commentaar bevat"
 
-#: 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 "Niet passend"
 
@@ -3911,8 +3791,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"
 
@@ -3930,7 +3810,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"
 
@@ -3939,100 +3819,100 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Kalenderweergave mislukt.  Controleer uw ORBit en OAF instellingen."
 
-#: calendar/gui/calendar-component.c:71 calendar/gui/gnome-cal.c:1341
-#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1862
+#: 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 "Map met afspraken en gebeurtenissen"
 
-#: calendar/gui/calendar-component.c:76
+#: calendar/gui/calendar-component.c:75
 msgid "Public Calendar"
 msgstr "Publieke kalender"
 
-#: calendar/gui/calendar-component.c:77
+#: calendar/gui/calendar-component.c:76
 msgid "Public folder containing appointments and events"
 msgstr "Map met afspraken en gebeurtenissen"
 
-#: calendar/gui/calendar-component.c:81 calendar/gui/e-tasks.c:735
-#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:511
-#: calendar/importers/icalendar-importer.c:705
-#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1864
-#: my-evolution/e-summary-tasks.c:326 my-evolution/e-summary-tasks.c:344
+#: 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 "Taken"
 
-#: calendar/gui/calendar-component.c:82
+#: calendar/gui/calendar-component.c:81
 msgid "Folder containing to-do items"
 msgstr "Map met to-do items"
 
-#: calendar/gui/calendar-component.c:86
+#: calendar/gui/calendar-component.c:85
 msgid "Public Tasks"
 msgstr "Publieke taken"
 
-#: calendar/gui/calendar-component.c:87
+#: calendar/gui/calendar-component.c:86
 msgid "Public folder containing to-do items"
 msgstr "Map met to-do items"
 
-#: calendar/gui/calendar-component.c:739
+#: calendar/gui/calendar-component.c:730
 msgid "New appointment"
 msgstr "Nieuwe afspraak"
 
-#: calendar/gui/calendar-component.c:739
+#: calendar/gui/calendar-component.c:730
 msgid "_Appointment"
 msgstr "_Afspraak"
 
-#: calendar/gui/calendar-component.c:740
+#: calendar/gui/calendar-component.c:731
 msgid "Create a new appointment"
 msgstr "Maak een nieuwe afspraak"
 
-#: calendar/gui/calendar-component.c:744
+#: calendar/gui/calendar-component.c:735
 msgid "New meeting"
 msgstr "Nieuwe vergadering"
 
-#: calendar/gui/calendar-component.c:744
+#: calendar/gui/calendar-component.c:735
 msgid "_Meeting"
 msgstr "_Vergadering"
 
-#: calendar/gui/calendar-component.c:745
+#: calendar/gui/calendar-component.c:736
 msgid "Create a new meeting request"
 msgstr "Maak een nieuw bijeenkomstverzoek"
 
-#: calendar/gui/calendar-component.c:749
+#: calendar/gui/calendar-component.c:740
 msgid "New task"
 msgstr "Nieuwe Taak"
 
-#: calendar/gui/calendar-component.c:749
+#: calendar/gui/calendar-component.c:740
 msgid "_Task"
 msgstr "_Taak"
 
-#: calendar/gui/calendar-component.c:750
+#: calendar/gui/calendar-component.c:741
 msgid "Create a new task"
 msgstr "Nieuwe taak aanmaken"
 
-#: calendar/gui/calendar-component.c:754
+#: calendar/gui/calendar-component.c:745
 msgid "New All Day Appointment"
 msgstr "Nieuwe dag-omvattende afspraak"
 
-#: calendar/gui/calendar-component.c:754
+#: calendar/gui/calendar-component.c:745
 msgid "All _Day Appointment"
 msgstr "_Dag-omvattende afspraak"
 
-#: calendar/gui/calendar-component.c:755
+#: calendar/gui/calendar-component.c:746
 msgid "Create a new all-day appointment"
 msgstr "Maak een nieuwe dag-omvattende afspraak"
 
-#: 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 "Privé"
 
-#: 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 "Vertrouwelijk"
@@ -4057,37 +3937,37 @@ msgstr "E"
 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 "Vrij"
 
 #: 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:1184
+#: calendar/gui/e-meeting-time-sel.c:407
+#: shell/evolution-shell-component.c:1202
 msgid "Busy"
 msgstr "Bezig"
 
-#: calendar/gui/calendar-model.c:742 calendar/gui/calendar-model.c:1170
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: 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 "Niet gestart"
 
-#: 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 behandeling"
 
-#: 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:305
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/print.c:2316
+#: 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 "Voltooid"
 
-#: calendar/gui/calendar-model.c:1028
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4098,32 +3978,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:286
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1978
-#: mail/folder-browser.c:1730 mail/mail-account-gui.c:1254
-#: mail/mail-account-gui.c:1682 mail/mail-accounts.c:392
-#: mail/mail-config.glade.h:78
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:196
+#: 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 "Geen"
 
-#: calendar/gui/calendar-model.c:1696
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Herhalend"
 
-#: calendar/gui/calendar-model.c:1698
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Toegewezen"
 
-#: calendar/gui/calendar-model.c:1704 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:1704 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 "Nee"
@@ -4144,16 +4024,16 @@ msgstr "Week weergave"
 msgid "Month View"
 msgstr "Maand weergave"
 
-#: calendar/gui/comp-editor-factory.c:457
+#: calendar/gui/comp-editor-factory.c:456
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Fout tijdens communiceren met kalenderserver"
 
-#: calendar/gui/comp-editor-factory.c:468
+#: calendar/gui/comp-editor-factory.c:467
 msgid "Method not supported when opening the calendar"
 msgstr "Methode niet ondersteund tijdens het openen van de kalender"
 
-#: calendar/gui/comp-editor-factory.c:474
+#: calendar/gui/comp-editor-factory.c:473
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr "Operatie niet toegestaan"
@@ -4163,195 +4043,90 @@ msgstr "Operatie niet toegestaan"
 msgid "Could not open the folder in '%s'"
 msgstr "Kon de map in `%s' niet openen"
 
-#: calendar/gui/control-factory.c:163
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "De URI die de kalender zal tonen"
 
-#: calendar/gui/control-factory.c:170
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr "Het type weergaven"
 
-#: calendar/gui/dialogs/alarm-options.c:358
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Geluid Alarm Opties"
 
-#: calendar/gui/dialogs/alarm-options.c:367
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Bericht Alarm Opties"
 
-#: calendar/gui/dialogs/alarm-options.c:376
-msgid "Mail Alarm Options"
+#: calendar/gui/dialogs/alarm-options.c:438
+#, fuzzy
+msgid "Email Alarm Options"
 msgstr "Email Alarm Opties"
 
-#: calendar/gui/dialogs/alarm-options.c:385
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Programma Alarmopties"
 
-#: calendar/gui/dialogs/alarm-options.c:394
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Onbekende Alarmopties"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Alarm Repeat"
 msgstr "Alarmherhaling"
 
-#: 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 ""
-"Dit is een email herinnering, maar Evolution kan nog geen email "
-"herininneringen sturen. U zal de instellingen niet kunnen aanpassen voor "
-"deze herinnering."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Bericht"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "Berichtinhoud"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "Speel een geluid af:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "Herhaal het Alarm"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "Start een programma:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "Versturen"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr "Met deze parameters:"
 
-#: 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 "dagen"
 
-#: 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 "nogmaals"
 
-#: 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 "uren"
 
-#: 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 "minuten"
 
-#: calendar/gui/dialogs/alarm-page.c:313 calendar/gui/e-alarm-list.c:393
-#, c-format
-msgid "%d days"
-msgstr "%d dagen"
-
-#: calendar/gui/dialogs/alarm-page.c:316 calendar/gui/e-alarm-list.c:396
-msgid "1 day"
-msgstr "1 dag"
-
-#: calendar/gui/dialogs/alarm-page.c:321 calendar/gui/e-alarm-list.c:401
-#, c-format
-msgid "%d weeks"
-msgstr "%d weken"
-
-#: calendar/gui/dialogs/alarm-page.c:324 calendar/gui/e-alarm-list.c:404
-msgid "1 week"
-msgstr "1 week"
-
-#: calendar/gui/dialogs/alarm-page.c:329 calendar/gui/e-alarm-list.c:409
-#, c-format
-msgid "%d hours"
-msgstr "%d uren"
-
-#: calendar/gui/dialogs/alarm-page.c:332 calendar/gui/e-alarm-list.c:412
-msgid "1 hour"
-msgstr "1 uur"
-
-#: calendar/gui/dialogs/alarm-page.c:337 calendar/gui/e-alarm-list.c:417
-#, c-format
-msgid "%d minutes"
-msgstr "%d minuten"
-
-#: calendar/gui/dialogs/alarm-page.c:340 calendar/gui/e-alarm-list.c:420
-msgid "1 minute"
-msgstr "1 minuut"
-
-#: calendar/gui/dialogs/alarm-page.c:345 calendar/gui/e-alarm-list.c:425
-#, c-format
-msgid "%d seconds"
-msgstr "%d seconden"
-
-#: calendar/gui/dialogs/alarm-page.c:348 calendar/gui/e-alarm-list.c:428
-msgid "1 second"
-msgstr "1 seconde"
-
-#: 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 "Speel een geluid af"
-
-#: 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 "Toon een bericht"
-
-#: calendar/gui/dialogs/alarm-page.c:385 calendar/gui/e-alarm-list.c:465
-msgid "Send an email"
-msgstr "Verstuur een bericht"
-
-#: 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 "Start een programma"
-
-#: calendar/gui/dialogs/alarm-page.c:395 calendar/gui/e-alarm-list.c:475
-msgid "Unknown action to be performed"
-msgstr "Opdracht om uit te voeren onbekend"
-
-#: 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 "%s %s voor het begin van de afspraak"
-
-#: 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 "%s %s na het begin van de afspraak"
-
-#: 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 "%s bij het begin van de afspraak"
-
-#: 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 "%s %s voor het einde van de afspraak"
-
-#: 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 "%s %s na het einde van de afspraak"
-
-#: 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 "%s bij het einde van de afspraak"
-
-#: calendar/gui/dialogs/alarm-page.c:456 calendar/gui/e-alarm-list.c:536
-#, c-format
-msgid "%s at %s"
-msgstr "%s bij %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 "%s voor een onbekend triggertype"
-
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -4362,46 +4137,63 @@ msgstr "Algemeen"
 msgid "Date/Time:"
 msgstr "Datum/Tijd"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "Toon een bericht"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "Speel een geluid af"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Herinneringen"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "Start een programma"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "Verstuur een bericht"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:980 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 "Samenvatting:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_Opties..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "na"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "voor"
 
-#: 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(en)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "einde van afspraak"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "u(u)r(en)"
 
-#: 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 "minuten"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "begin van afspraak"
 
@@ -4450,8 +4242,8 @@ msgid "Days"
 msgstr "Dagen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr "Vrijdag"
 
@@ -4464,8 +4256,8 @@ msgid "Minutes"
 msgstr "Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr "Maandag"
 
@@ -4474,8 +4266,8 @@ msgid "S_un"
 msgstr "Z_on"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1051
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr "Zaterdag"
 
@@ -4488,8 +4280,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Toon week_nummers in datum navigator"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1052
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
 msgid "Sunday"
 msgstr "Zondag"
 
@@ -4506,8 +4298,8 @@ msgid "Task List"
 msgstr "Takenlijst"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr "Donderdag"
 
@@ -4524,8 +4316,8 @@ msgid "Time format:"
 msgstr "Tijdsformaat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr "Dinsdag"
 
@@ -4534,8 +4326,8 @@ msgid "W_eek starts:"
 msgstr "W_eek begint:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr "Woensdag"
 
@@ -4577,7 +4369,7 @@ msgid "_Fri"
 msgstr "_Vrij"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "_Algemeen"
 
@@ -4621,7 +4413,7 @@ msgstr "_Woe"
 msgid "before every appointment"
 msgstr "voor het begin van de afspraak"
 
-#: 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?"
@@ -4629,11 +4421,11 @@ msgstr ""
 "De gebeurtenis geselecteerd voor verwijdering is een bijeenkomst; wilt u een "
 "afmeldingsbericht sturen? "
 
-#: 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 "Weet u zeker dat u deze vergadering wilt annuleren en verwijderen?"
 
-#: 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?"
@@ -4641,11 +4433,11 @@ msgstr ""
 "De taak geselecteerd voor verwijdering is reeds toegewezen; wilt u een "
 "afmeldingsbericht sturen?"
 
-#: 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 "Weet u zeker dat u deze taak wilt annuleren en verwijderen?"
 
-#: 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?"
@@ -4653,7 +4445,7 @@ msgstr ""
 "De dagboek ingang geselecteerd voor verwijdering is gepubliceerd; wilt u een "
 "afmeldingsbericht sturen? "
 
-#: 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 "Weet u zeker dat u dit dagboek item wilt annuleren en verwijderen?"
 
@@ -4729,63 +4521,63 @@ msgstr " (Verloopt "
 msgid "Due "
 msgstr "Verloopdatum "
 
-#: calendar/gui/dialogs/comp-editor.c:322
+#: calendar/gui/dialogs/comp-editor.c:328
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Kon object niet vernieuwen!"
 
-#: calendar/gui/dialogs/comp-editor.c:325
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr "Object niet gevonden, niet bijgewerkt"
 
-#: 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 "U heeft niet de rechten om dit object bij te werken"
 
-#: calendar/gui/dialogs/comp-editor.c:331
+#: calendar/gui/dialogs/comp-editor.c:337
 #, fuzzy
 msgid "Could not update object"
 msgstr "Kon object niet vernieuwen!"
 
-#: calendar/gui/dialogs/comp-editor.c:777
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Afspraak Bewerken"
 
-#: calendar/gui/dialogs/comp-editor.c:782
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "Afspraak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:785
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "Taak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:788
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagboekelement - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:799
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "Geen samenvatting"
 
-#: 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 "Opslaan als..."
 
-#: 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 ""
 "De gemaakte veranderingen aan dit item worden verworpen indien een "
 "bijwerking via email arriveerd"
 
-#: calendar/gui/dialogs/comp-editor.c:1382
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr "Ophalen huidige versie mislukt!"
 
@@ -4856,92 +4648,87 @@ msgid "Recurrence"
 msgstr "Herhaling"
 
 #: calendar/gui/dialogs/event-editor.c:220
-#: calendar/gui/dialogs/event-editor.c:289
-#: calendar/gui/dialogs/event-editor.c:424
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:434
 msgid "Scheduling"
 msgstr "Bijeenkomst Plannen"
 
 #: calendar/gui/dialogs/event-editor.c:227
-#: calendar/gui/dialogs/event-editor.c:292
-#: calendar/gui/dialogs/event-editor.c:427 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:437 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Vergadering"
 
-#: calendar/gui/dialogs/event-page.c:644 calendar/gui/dialogs/task-page.c:554
+#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:554
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Begindatum"
 
-#: calendar/gui/dialogs/event-page.c:654
+#: calendar/gui/dialogs/event-page.c:610
 msgid "End date is wrong"
 msgstr "Einddatum is fout"
 
-#: calendar/gui/dialogs/event-page.c:677
+#: calendar/gui/dialogs/event-page.c:633
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "_Begintijd:"
 
-#: calendar/gui/dialogs/event-page.c:684
+#: calendar/gui/dialogs/event-page.c:640
 msgid "End time is wrong"
 msgstr "Eindtijd is fout"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
 msgstr "_Gebeurtenis voor de hele dag"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "_Bezig"
 
-#: 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 "Classificatie"
 
-#: 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 "Vertrouwelijk"
 
-#: 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 "Datum & Tijd"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "Vrij"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr "Geografische Locatie: "
 
-#: 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 "Open_baar"
 
-#: 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 "Toon Tijd Als"
 
-#: 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_menvatting:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "C_ontacten..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "_Eindtijd:"
@@ -4950,19 +4737,23 @@ msgstr "_Eindtijd:"
 msgid "_Start time:"
 msgstr "_Begintijd:"
 
-#: calendar/gui/dialogs/meeting-page.c:396
+#: 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 "Er moet een organisator ingesteld worden."
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr "Er is minstens één aanwezige nodig."
 
-#: calendar/gui/dialogs/meeting-page.c:575
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr "Die persoon bezoekt de bijeenkomst reeds!"
 
-#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr "_Overdragen Aan..."
 
@@ -5002,14 +4793,14 @@ msgid "Member"
 msgstr "Lid"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1104
+#: 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 "Status"
@@ -5024,55 +4815,83 @@ msgid "_Change Organizer"
 msgstr "Verander Organisator"
 
 #: 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 "Nod_ig Anderen Uit..."
 
-#: 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 "Wallis en Futuna Eilanden"
+
+#: calendar/gui/dialogs/recur-comp.c:77
+#, fuzzy
+msgid "All Instances"
+msgstr "College Station"
+
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Deze afspraak bevat herhalingen die Evolution niet kan bewerken."
 
-#: calendar/gui/dialogs/recurrence-page.c:824
-msgid "Recurrent date is wrong"
+#: calendar/gui/dialogs/recurrence-page.c:806
+#, fuzzy
+msgid "Recurrence date is invalid"
 msgstr "Herhalingsdatum is fout"
 
-#: calendar/gui/dialogs/recurrence-page.c:929
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr "op"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:977
 msgid "first"
 msgstr "eerste"
 
-#: calendar/gui/dialogs/recurrence-page.c:991 filter/filter-datespec.c:65
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr "tweede"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "third"
 msgstr "derde"
 
-#: calendar/gui/dialogs/recurrence-page.c:993
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "fourth"
 msgstr "vierde"
 
-#: calendar/gui/dialogs/recurrence-page.c:994
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "last"
 msgstr "laatste"
 
-#: calendar/gui/dialogs/recurrence-page.c:1017
+#: calendar/gui/dialogs/recurrence-page.c:1004
 msgid "Other Date"
 msgstr "Andere datum"
 
-#: calendar/gui/dialogs/recurrence-page.c:1045 filter/filter-datespec.c:68
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1182
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr "op de"
 
-#: calendar/gui/dialogs/recurrence-page.c:1367
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr "gebeurtenissen"
 
@@ -5136,23 +4955,23 @@ msgstr "we(e)k(en)"
 msgid "year(s)"
 msgstr "ja(a)r(en)"
 
-#: calendar/gui/dialogs/send-comp.c:55
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has been created. Send it?"
 msgstr "De vergaderingsgegevens zijn gamaakt. Verzenden?"
 
-#: 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 "De vergaderingsgegevens zijn veranderd. De actuele versie verzenden?"
 
-#: 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 "De taakopdracht informatie is gemaakt. Verzenden?"
 
-#: 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 "De taakgegevens zijn veranderd. De actuele versie verzenden?"
 
-#: calendar/gui/dialogs/task-details-page.c:398
+#: calendar/gui/dialogs/task-details-page.c:397
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Voltooid"
@@ -5167,36 +4986,30 @@ msgstr "% Voltooid:"
 msgid "Date Completed:"
 msgstr "Voltooiingsdatum:"
 
-#: 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 "Heeft Actie Nodig"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Voortgang"
 
-#: 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 "_Prioriteit:"
 
-#: 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:188
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "Basis"
 
-#: calendar/gui/dialogs/task-editor.c:202
-#: calendar/gui/dialogs/task-editor.c:247
-#: calendar/gui/dialogs/task-editor.c:373
+#: calendar/gui/dialogs/task-editor.c:203
+#: calendar/gui/dialogs/task-editor.c:251
+#: calendar/gui/dialogs/task-editor.c:385
 msgid "Assignment"
 msgstr "Opdracht"
 
@@ -5204,7 +5017,7 @@ msgstr "Opdracht"
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1034
+#: 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:"
@@ -5214,127 +5027,235 @@ msgstr "Omschrijving:"
 msgid "Sta_rt Date:"
 msgstr "Be_gindatum:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "C_ontacten..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Verloopdatum:"
 
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d dagen"
+
+#: 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 weken"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 week"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d uren"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 uur"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d minuten"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 minuut"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d seconden"
+
+#: 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 "Verstuur een bericht"
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr "Opdracht om uit te voeren onbekend"
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s voor het begin van de afspraak"
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s na het begin van de afspraak"
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s bij het begin van de afspraak"
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s voor het einde van de afspraak"
+
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s na het einde van de afspraak"
+
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s bij het einde van de afspraak"
+
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr "%s bij %s"
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s voor een onbekend triggertype"
+
 #: 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: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 "Geselecteerde objecten verwijderen"
 
-#: 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 "_Openen"
 
-#: calendar/gui/e-calendar-table.c:950
+#: calendar/gui/e-calendar-table.c:951
 msgid "_Save as..."
 msgstr "Op_slaan als..."
 
-#: 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 "_Afdrukken..."
 
-#: 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 "K_nippen"
 
-#: 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 "_Kopiëren"
 
-#: 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 "_Plakken"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:962
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Taak Toewijzen"
 
-#: calendar/gui/e-calendar-table.c:962
+#: calendar/gui/e-calendar-table.c:963
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Doorsturen als i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:963
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "Markeren als Voltooid"
 
-#: calendar/gui/e-calendar-table.c:964
+#: calendar/gui/e-calendar-table.c:965
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markeer de Taken als Voltooid"
 
-#: calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "_Verwijder de Geselecteerde Taken"
 
-#: 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 "Objecten worden ververst"
 
-#: 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 hier om een taak toe te voegen"
@@ -5373,7 +5294,7 @@ msgid "Start Date"
 msgstr "Begindatum"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:56 shell/e-shell.c:765
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Samenvatting"
@@ -5405,205 +5326,205 @@ 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 delingen"
 
 #. 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: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: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/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:613 calendar/gui/e-week-view.c:347
+#: 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:3653
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "Nieuwe _Afspraak"
 
-#: 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 "Gebeurtenis voor de hele dag"
 
-#: 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 "Nieuwe bijeenkomst"
 
-#: 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 "Nieuwe taak"
 
-#: 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 "Afdrukken..."
 
-#: 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 "Ga Naar _Vandaag"
 
-#: 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 "_Ga Naar Datum..."
 
-#: 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 "_Publiceer Beschikbaarheidsinformatie"
 
-#: 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 "_Instellingen..."
 
-#: 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 "_Opslaan Als..."
 
-#: 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 "_Bijeenkomst Plannen..."
 
-#: 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 "_Doorsturen als iKalender"
 
-#: 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 "Maak deze Gebeurtenis Verplaatsbaar"
 
-#: 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 "Verwijder deze Gebeurtenis"
 
-#: 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 "Verwijder alle Gebeurtenissen"
 
-#: calendar/gui/e-itip-control.c:637
+#: calendar/gui/e-itip-control.c:704
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja. (complexe herhaling)"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:716
 msgid "Every day"
 msgstr "Elke dag"
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:718
 #, c-format
 msgid "Every %d days"
 msgstr "Elke %d dagen"
 
-#: calendar/gui/e-itip-control.c:657
+#: calendar/gui/e-itip-control.c:724
 msgid "Every week"
 msgstr "Elke week"
 
-#: calendar/gui/e-itip-control.c:659
+#: calendar/gui/e-itip-control.c:726
 #, c-format
 msgid "Every %d weeks"
 msgstr "Elke %d weken"
 
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:729
 msgid "Every week on "
 msgstr "Elke week op"
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:731
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Elke %d weken op"
 
-#: calendar/gui/e-itip-control.c:672
+#: calendar/gui/e-itip-control.c:739
 msgid " and "
 msgstr " en "
 
-#: calendar/gui/e-itip-control.c:679
+#: calendar/gui/e-itip-control.c:746
 #, c-format
 msgid "The %s day of "
 msgstr "De %s dag van "
 
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:759
 #, c-format
 msgid "The %s %s of "
 msgstr "De %s %s van "
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:764
 msgid "every month"
 msgstr "elke maand"
 
-#: calendar/gui/e-itip-control.c:702
+#: calendar/gui/e-itip-control.c:769
 #, c-format
 msgid "every %d months"
 msgstr "elke %d maanden"
 
-#: calendar/gui/e-itip-control.c:708
+#: calendar/gui/e-itip-control.c:775
 msgid "Every year"
 msgstr "Elk jaar"
 
-#: calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every %d years"
 msgstr "Elke %d jaar"
 
-#: calendar/gui/e-itip-control.c:722
+#: calendar/gui/e-itip-control.c:789
 #, c-format
 msgid " a total of %d times"
 msgstr "een totaal van %d keer"
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:797
 msgid ", ending on "
 msgstr ", eindigend op "
 
-#: calendar/gui/e-itip-control.c:754
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr "<b>Begint:</b> "
 
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:831
 msgid "<b>Ends:</b> "
 msgstr "<b>Eindigt: <b>"
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:851
 msgid "<b>Completed:</b> "
 msgstr "<b>Voltooid:</b>"
 
-#: calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:881
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 msgid "iCalendar Information"
 msgstr "iCalendar Informatie"
 
 #. Title
-#: calendar/gui/e-itip-control.c:846
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr "iCalendar Fout"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/e-itip-control.c:928
-#: calendar/gui/e-itip-control.c:939 calendar/gui/e-itip-control.c:956
+#: 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 "Een onbekende persoon"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:963
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5611,345 +5532,345 @@ msgstr ""
 "<br> Bekijk de volgende informatie en kies daarna een actie uit het menu "
 "hieronder."
 
-#: calendar/gui/e-itip-control.c:978
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Geen</i>"
 
-#: calendar/gui/e-itip-control.c:988
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Location:"
 msgstr "Geografische Locatie: "
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:1007 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:392
+#: 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 "Geaccepteerd"
 
-#: calendar/gui/e-itip-control.c:1011 calendar/gui/itip-utils.c:395
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Voorlopig Geaccepteerd"
 
-#: calendar/gui/e-itip-control.c:1015 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:398 calendar/gui/itip-utils.c:424
+#: 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 "Geweigerd"
 
-#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-itip-control.c:1225
-#: 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:931 widgets/misc/e-charset-picker.c:60
+#: 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 "Onbekend"
 
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1100
-#: calendar/gui/e-itip-control.c:1126 calendar/gui/e-itip-control.c:1139
-#: calendar/gui/e-itip-control.c:1152 calendar/gui/e-itip-control.c:1165
+#: 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 "Kies een actie:"
 
-#: calendar/gui/e-itip-control.c:1073
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Verversen"
 
-#: calendar/gui/e-itip-control.c:1074 calendar/gui/e-itip-control.c:1105
-#: calendar/gui/e-itip-control.c:1128 calendar/gui/e-itip-control.c:1141
-#: calendar/gui/e-itip-control.c:1154 calendar/gui/e-itip-control.c:1167
-#: shell/e-shell.c:2092 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:1101
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr "Accepteren"
 
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Voorlopig accepteren"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Weigeren"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Verstuur Vrij/Bezet Informatie"
 
-#: calendar/gui/e-itip-control.c:1140
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Ververs antwoordstatus"
 
-#: calendar/gui/e-itip-control.c:1153
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Verstuur Laatste Informatie"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/itip-utils.c:412
-#: shell/evolution-shell-component.c:1162 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 "Annuleren"
 
-#: calendar/gui/e-itip-control.c:1247
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> heeft bijeenkomstgegevens beschikbaar gemaakt."
 
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Bijeenkomst Informatie"
 
-#: calendar/gui/e-itip-control.c:1253
+#: 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> verzoekt u bij de bijeenkomst aanwezig te zijn."
 
-#: calendar/gui/e-itip-control.c:1255
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> verzoekt u bij de bijeenkomst aanwezig te zijn."
 
-#: calendar/gui/e-itip-control.c:1256
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Vergadering Voorstel"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> wil graag aan een bestaande bijeenkomst bijdragen."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Vergadering Update"
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wil graag  de laatste bijeenkomstgegevens ontvangen."
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "VergaderingsUpdate Verzoek"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s<b> heeft geantwoord op een bijeenkomstverzoek."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Bijeenkomst Antwoord"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> heeft een bijeenkomst geannuleerd."
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Bijeenkomst Annulering"
 
-#: calendar/gui/e-itip-control.c:1289 calendar/gui/e-itip-control.c:1356
-#: calendar/gui/e-itip-control.c:1391
+#: 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> heeft een onleesbaar bericht gestuurd."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Fout Bijeenkomstbericht"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> heeft taakgegevens beschikbaar gemaakt."
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Taak Informatie"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1393
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> verzoekt u een taak uit te voeren."
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> verzoekt u een taak uit te voeren."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Taak Voorstel"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> wil graag iets toevoegen aan een bestaande taak."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Taak Update"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wil graag de laatste taakgegevens ontvangen."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Taak Update Verzoek"
 
-#: calendar/gui/e-itip-control.c:1340
+#: calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> heeft een taakopdracht beantwoord."
 
-#: calendar/gui/e-itip-control.c:1341
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Taak Antwoord"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> heeft een taak geannuleerd."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Taak Annulering"
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Fout Taakbericht"
 
-#: calendar/gui/e-itip-control.c:1376
+#: calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s<b> heeft vrij/bezet informatie gepubliceerd."
 
-#: calendar/gui/e-itip-control.c:1377
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Vrij/Bezet Informatie"
 
-#: calendar/gui/e-itip-control.c:1381
+#: calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> vraagt om uw beschikbaarheidsinformatie."
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Vrij/Bezet Verzoek"
 
-#: calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> heeft een verzoek om beschikbaarheidsinformatie beantwoord."
 
-#: calendar/gui/e-itip-control.c:1387
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Vrij/Bezet Antwoord"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Foutief Vrij/Bezet Bericht"
 
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1541
 msgid "The message does not appear to be properly formed"
 msgstr "Het bericht lijkt niet goed opgemaakt te zijn"
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "Het bericht bevat slechts niet ondersteunde aanvragen."
 
-#: calendar/gui/e-itip-control.c:1556 calendar/gui/e-itip-control.c:1562
+#: 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 "De bijlage bevat geen geldig kalenderbericht"
 
-#: calendar/gui/e-itip-control.c:1587
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "De bijlage heeft geen bekijkbaar kalenderobject"
 
-#: calendar/gui/e-itip-control.c:1807 calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1907 calendar/gui/e-itip-control.c:1999
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is ongeldig en kan niet worden bijgewerkt\n"
 
-#: calendar/gui/e-itip-control.c:1810 calendar/gui/e-itip-control.c:1902
+#: 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 "Er trad een fout op bij het downloaden van gegevens voor"
 
-#: calendar/gui/e-itip-control.c:1813 calendar/gui/e-itip-control.c:1905
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:2005
 msgid "Object could not be found\n"
 msgstr "Object kan niet worden gevonden\n"
 
-#: calendar/gui/e-itip-control.c:1816
+#: calendar/gui/e-itip-control.c:1916
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Kon de map in `%s' niet openen"
 
-#: calendar/gui/e-itip-control.c:1819
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Update Voltooid\n"
 
-#: calendar/gui/e-itip-control.c:1822
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "Calenderbestand kon niet bijgewerkt worden!\n"
 
-#: calendar/gui/e-itip-control.c:1851 calendar/gui/e-itip-control.c:1917
+#: 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 ""
 "Bezoekerstatus kan niet ververst worden omdat het object niet meer bestaat"
 
-#: calendar/gui/e-itip-control.c:1872
+#: calendar/gui/e-itip-control.c:1972
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Dit antwoord is niet van een geregistreerd staand persoon. Toevoegen in "
 "registratie?"
 
-#: calendar/gui/e-itip-control.c:1884
+#: calendar/gui/e-itip-control.c:1984
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Bezoekerstatus kon niet ververst worden vanwege een ongeldige status!\n"
 
-#: calendar/gui/e-itip-control.c:1908
+#: calendar/gui/e-itip-control.c:2008
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Kon de map in `%s' niet openen"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Bezoekerstatus ververst\n"
 
-#: calendar/gui/e-itip-control.c:1914
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "Aanwezigheidstatus kon niet worden bijgewerkt!\n"
 
-#: calendar/gui/e-itip-control.c:1949
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Verwijderen Voltooid"
 
-#: calendar/gui/e-itip-control.c:1979 calendar/gui/e-itip-control.c:2029
+#: calendar/gui/e-itip-control.c:2079 calendar/gui/e-itip-control.c:2129
 msgid "Item sent!\n"
 msgstr "Item Verzonden!\n"
 
-#: calendar/gui/e-itip-control.c:1981 calendar/gui/e-itip-control.c:2033
+#: calendar/gui/e-itip-control.c:2081 calendar/gui/e-itip-control.c:2133
 msgid "The item could not be sent!\n"
 msgstr "Dit item kon niet verzonden worden!\n"
 
-#: calendar/gui/e-itip-control.c:2106
+#: calendar/gui/e-itip-control.c:2206
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Selecteer Map"
 
-#: calendar/gui/e-itip-control.c:2113
+#: calendar/gui/e-itip-control.c:2213
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Selecteer Map"
@@ -5991,88 +5912,93 @@ msgstr "einddatum"
 msgid "date-start"
 msgstr "begindatum"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr "Voorzitters"
 
-#: 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 "Vereiste Deelnemers"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr "Optionele Deelnemers"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:83
 #, fuzzy
 msgid "Resources"
 msgstr "Hulpbron"
 
-#: 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 "Persoon"
 
-#: 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 "Groep"
 
-#: 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 "Hulpbron"
 
-#: 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 "Kamer"
 
-#: 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 "Voorzitter"
 
-#: 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 "Vereiste Deelnemer"
 
-#: 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 "Optionele Deelnemer"
 
-#: 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 "Niet-Deelnemer"
 
-#: 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:407
+#: 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 "Heeft Actie Nodig"
+
+#: 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 "Voorlopig"
 
-#: 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 "Overgedragen"
 
-#: 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 "In Uitvoer"
 
 #. 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"
@@ -6084,88 +6010,88 @@ 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 "Afwezig"
 
-#: calendar/gui/e-meeting-time-sel.c:410
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Geen informatie"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Opties"
 
-#: calendar/gui/e-meeting-time-sel.c:468
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "T_oon alleen kantooruren"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Toon Uitge_zoomd"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "_Actualiseer Vrij/Bezet"
 
-#: 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 "_Automatisch uitzoeken"
 
-#: 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 Mensen en Hulpbronnen"
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Alle _mensen en één Hulpbron"
 
-#: calendar/gui/e-meeting-time-sel.c:594
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "_Vereiste Mensen"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Vereiste mensen en één Hulpbr_on"
 
-#: calendar/gui/e-meeting-time-sel.c:630
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Aanvang _bijeenkomst:"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "_Einde bijeenkomst:"
 
-#: calendar/gui/e-tasks.c:356 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 "Bezig met openen taken op %s"
 
-#: calendar/gui/e-tasks.c:385 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kon de taken in `%s' niet laden"
 
-#: 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 "De methode die nodig is om `%s' te laden wordt niet ondersteund"
 
-#: calendar/gui/e-tasks.c:414 calendar/gui/gnome-cal.c:1531
+#: 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 "Kon de map in `%s' niet openen"
 
-#: calendar/gui/e-tasks.c:482 calendar/gui/gnome-cal.c:1735
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6186,7 +6112,7 @@ msgstr "Geselecteerde objecten verwijderen"
 msgid "Expunging"
 msgstr "Bezig met Schrappen"
 
-#: calendar/gui/e-week-view.c:3489
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Nieuwe _Afspraak..."
 
@@ -6293,56 +6219,57 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:250 calendar/gui/itip-utils.c:321
+#: 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 "Er moet een organisator ingesteld worden."
 
-#: calendar/gui/itip-utils.c:285
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "Er is minstens één bezoeker nodig"
 
-#: calendar/gui/itip-utils.c:364 calendar/gui/itip-utils.c:473
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 msgid "Event information"
 msgstr "Gebeurtenis informatie"
 
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:475
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 msgid "Task information"
 msgstr "Taak informatie"
 
-#: calendar/gui/itip-utils.c:368 calendar/gui/itip-utils.c:477
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Journal information"
 msgstr "Journaal informatie"
 
-#: calendar/gui/itip-utils.c:370 calendar/gui/itip-utils.c:494
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 msgid "Free/Busy information"
 msgstr "Vrij/Bezet informatie"
 
-#: calendar/gui/itip-utils.c:372
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Kalenderinformatie"
 
-#: calendar/gui/itip-utils.c:408
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr "Vernieuwd"
 
-#: calendar/gui/itip-utils.c:416
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr "Vernieuwen"
 
-#: calendar/gui/itip-utils.c:420
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr "Tegenvoorstel"
 
-#: calendar/gui/itip-utils.c:488
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vrij/Bezet informatie (%s tot %s)"
 
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "iCalendar informatie"
 
-#: calendar/gui/itip-utils.c:648
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "U moet een bezoeker zijn van het evenement."
 
@@ -6441,8 +6368,8 @@ msgid "Contacts: "
 msgstr "Contacten: "
 
 #: calendar/gui/print.c:2533 calendar/gui/print.c:2619
-#: calendar/gui/tasks-control.c:579 mail/mail-callbacks.c:2925
-#: my-evolution/e-summary.c:617
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:616
 msgid "Print Preview"
 msgstr "Afdrukvoorbeeld"
 
@@ -6458,7 +6385,7 @@ msgstr "Printerinstellingen"
 msgid "The URI of the tasks folder to display"
 msgstr "De URI van de te tonen takenmap"
 
-#: calendar/gui/tasks-control.c:465
+#: 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"
@@ -6470,92 +6397,54 @@ msgstr ""
 "\n"
 "De taken echt verwijderen?"
 
-#: calendar/gui/tasks-control.c:472
+#: calendar/gui/tasks-control.c:479
 msgid "Do not ask me again."
 msgstr "Dit bericht niet meer weergeven."
 
-#: calendar/gui/tasks-control.c:608
+#: calendar/gui/tasks-control.c:615
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Kaarten afdrukken"
 
-#: 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 heeft de taken in uw kalendermap automatisch verplaatst naar de "
-"nieuwe takenmap."
-
-#: 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 heeft getracht de taken in uw kalendermap te verplaatsen naar de "
-"nieuwe takenmap.\n"
-"Enkele van de taken konden niet verplaatst worden, dus dit proces kan de "
-"toekomst nogmaals geprobeerd worden."
-
-#: 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 ""
-"Kon '%s' niet openen; er worden geen taken uit uw kalendermap verplaatst "
-"naar de takenmap."
-
-#: 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 ""
-"De methode die nodig is om '%s' te laden, wordt niet ondersteund; er "
-"wordengeen taken verplaatst van de kalendermap naar de takenmap."
-
-#: 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 "ZMDWDVZ"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "Fabriek om iCalendar bestanden te importeren in Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Evolution kalender iTip/iMip bekijker"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "Importeert iCalendat bestanden in Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Evolution kalender iTip/iMip bekijker"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "Importeert vCalendar bestanden in Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Evolution kalender iTip/iMip bekijker"
 
-#: calendar/importers/icalendar-importer.c:169
-#, fuzzy, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr ""
-"Kan bericht %s uit folder %s niet verkrijgen\n"
-"  %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Kalenderbericht"
 
-#: calendar/importers/icalendar-importer.c:181
-#, fuzzy, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "Kon niet verbinden met de opslag: %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
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Herinnering"
 
-#: calendar/importers/icalendar-importer.c:698
+#: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Kalenderbericht"
 
-#: 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?"
@@ -6563,11 +6452,11 @@ msgstr ""
 "Evolution heeft Gnome kalender bestanden gevonden.\n"
 "Wilt u deze importeren in Evolution?"
 
-#: calendar/importers/icalendar-importer.c:730
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr "Gnome kalender"
 
-#: calendar/pcs/cal-backend-file.c:301
+#: calendar/pcs/cal-backend-file.c:311
 msgid "Can't save calendar data: Malformed URI."
 msgstr "Kan kalender gegevens niet bewaren: ongeldige URI."
 
@@ -8241,11 +8130,11 @@ msgstr "U mag geen sleutels importeren met deze sleutel"
 msgid "You may not export keys with this cipher"
 msgstr "U mag geen sleutels exporteren met deze sleutel"
 
-#: camel/camel-data-cache.c:137
+#: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
 msgstr "Kon cache pad niet creëren"
 
-#: camel/camel-data-cache.c:375
+#: camel/camel-data-cache.c:370
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Kon cache item: %s niet verwijderen: %s"
@@ -8286,11 +8175,13 @@ msgid "You must be working online to complete this operation"
 msgstr "U moet online werken om deze bewerking te voltooien"
 
 #: 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 "Faalde bij cachen bericht %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 "Faalde bij cachen bericht %s: %s"
@@ -8448,9 +8339,9 @@ msgstr ""
 "U heeft een wachtwoord nodig om de sleutel voor\n"
 "gebruiker \"%s\" te mogen gebruiken"
 
-#: 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 "Geannuleerd."
 
@@ -8475,7 +8366,7 @@ msgstr "Geen bestandsnaam opgegeven."
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Kan dit bericht niet versleutelen: er zijn geen ontvangers opgegeven"
 
-#: camel/camel-gpg-context.c:1122
+#: camel/camel-gpg-context.c:1125
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8483,25 +8374,25 @@ msgid ""
 "%.*s"
 msgstr "Faalde bij cachen bericht %s: %s"
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1131
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Faalde bij cachen bericht %s: %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
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Decoderen van bericht mislukt."
 
-#: 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
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Decoderen van bericht mislukt."
 
-#: camel/camel-gpg-context.c:1330
+#: camel/camel-gpg-context.c:1333
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Kan dit bestand niet verifiëren: kon geen tijdelijk bestand maken: %s"
@@ -8616,11 +8507,11 @@ msgstr "Kan bericht niet decoderen: Onbekende fout"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Kan bericht niet decoderen: Onbekende fout"
 
-#: camel/camel-multipart-signed.c:624
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr "Dit berichtdeel is digitaal gesigneerd"
 
-#: camel/camel-multipart-signed.c:678
+#: camel/camel-multipart-signed.c:682
 #, fuzzy
 msgid "parse error"
 msgstr "Onbekende fout"
@@ -8727,91 +8618,95 @@ msgstr "Het serverantwoord bevatte onvolledige authorisatiegegevens\n"
 msgid "Server response does not match\n"
 msgstr "Het serverantwoord is onbegrijpelijk\n"
 
-#: camel/camel-sasl-gssapi.c:40
+#: camel/camel-sasl-gssapi.c:48
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: camel/camel-sasl-gssapi.c:42
+#: camel/camel-sasl-gssapi.c:50
 #, fuzzy
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 "Deze optie zal bij het verbinden met de server gebruik maken van Kerberos-4-"
 "aanmelding."
 
-#: 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 "Fout aanmeldingsantwoord van server."
 
-#: camel/camel-sasl-gssapi.c:281
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "Faalde bij cachen bericht %s: %s"
+
+#: camel/camel-sasl-gssapi.c:299
 #, fuzzy
 msgid "Unsupported security layer."
 msgstr "Niet ondersteund type"
 
-#: 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 ""
 "Deze optie zal bij het verbinden met de server gebruik maken van Kerberos-4-"
 "aanmelding."
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -8898,32 +8793,32 @@ msgstr "URL '%s' heeft een padcomponent nodig"
 msgid "Resolving: %s"
 msgstr "Resolving \"%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 "Fout bij opzoeken naam: %s"
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Machine niet gevonden: %s machine niet gevonden"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Machine opzoeken faalde: %s onbekende reden"
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 #, fuzzy
 msgid "Resolving address"
 msgstr "Resolving \"%s\""
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Machine niet gevonden: %s machine niet gevonden"
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Machine opzoeken faalde: %s onbekende reden"
@@ -8995,134 +8890,134 @@ msgstr "Kan map niet verkrijgen: Ongeldige bewerking op deze opslag"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan map niet maken: Ongeldige bewerking op deze opslag"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 #, fuzzy
 msgid "Unable to get issuer's certificate"
 msgstr "Verifiëren van certificaten mislukt."
 
-#: 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 "Verifiëren van certificaten mislukt."
 
-#: 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 "Handtekeningbestand:"
 
-#: 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 "Certificaat nog niet geldig"
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 #, fuzzy
 msgid "Certificate has expired"
 msgstr "_Certificaat-ID:"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr "CRL nog niet geldig"
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr "CRL is verlopen"
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 #, fuzzy
 msgid "Error in CRL"
 msgstr "Fout bij laden %s"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 #, fuzzy
 msgid "Out of memory"
 msgstr "Afwezig"
 
-#: 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 "Zelf-gesigneerd certificaat in sleutelbos"
 
-#: 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 "Verifiëren van certificaten mislukt."
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr "Certificaat sleutelbos te groot"
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:610
 #, fuzzy
 msgid "Certificate Revoked"
 msgstr "_Certificaat-ID:"
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr "Ongeldige Certificaat Authoriteit (CA)"
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr "Pad lengte overschreden"
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
 #, fuzzy
 msgid "Invalid purpose"
 msgstr "Ongeldige argument"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 #, fuzzy
 msgid "Certificate untrusted"
 msgstr "_Certificaat-ID:"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 #, fuzzy
 msgid "Certificate rejected"
 msgstr "_Certificaat-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 "AKID/SKID komt niet overeen"
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr "AKID/Uitgever serienummer komt niet overeen"
 
-#: 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"
@@ -9135,15 +9030,15 @@ msgstr ""
 "Vingerafdruk:        %s\n"
 "Handtekening:        %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 "GOED"
 
-#: 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 "SLECHT"
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, fuzzy, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9161,7 +9056,7 @@ msgstr ""
 "Wil je het alsnog accepteren?"
 
 #. 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"
@@ -9176,35 +9071,35 @@ msgstr ""
 "\n"
 "Wilt u dit accepteren?"
 
-#: 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
 #, fuzzy, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr "_Certificaat-ID:"
 
-#: 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 "_Certificaat-ID:"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "kon URL %s niet verwerken"
@@ -9219,40 +9114,40 @@ msgstr "Fout bij laden %s"
 msgid "No such message %s in %s"
 msgstr "Dergelijk bericht %s bestaat niet in %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 "Controleer op nieuwe berichten in alle mappen"
 
-#: camel/camel-vee-store.c:272
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kon map: %s niet verwijderen: Ongeldige bewerking"
 
-#: camel/camel-vee-store.c:291
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kon map: %s niet verwijderen: map bestaat niet"
 
-#: camel/camel-vee-store.c:304
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kon de naam van de map: %s niet wijzigen: ongeldige bewerking"
 
-#: camel/camel-vee-store.c:312
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kon de naam van map: %s niet wijzigen naar: map bestaat niet"
 
 #: 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:2639
+#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr "Operatie geannuleerd"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2642
+#: camel/providers/imap/camel-imap-store.c:2645
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server verbrak onverwacht de verbinding: %s"
@@ -9275,16 +9170,16 @@ msgstr "Onverwacht antwoord van IMAP-server: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP-commando mislukt: %s"
 
-#: camel/providers/imap/camel-imap-command.c:462
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr "Het antwoord van de server eindigde te snel."
 
-#: 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 "Het antwoord van de IMAP-server bevatte geen %s informatie"
 
-#: 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 "De IMAP-server gaf onverwacht een 'OK' antwoord: %s"
@@ -9376,7 +9271,7 @@ msgstr "Controleren voor nieuwe email"
 msgid "Check for new messages in all folders"
 msgstr "Controleer op nieuwe berichten in alle mappen"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1133
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1176
 msgid "Folders"
 msgstr "Mappen"
 
@@ -9426,61 +9321,61 @@ msgstr "SMTP-server %s"
 msgid "IMAP service for %s on %s"
 msgstr "%s dienst voor %s op %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 "Verbinding geannuleerd"
 
-#: 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 "Kon niet verbinden met %s (poort %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 ""
 "Fout bij verbinden met de POP-server.\n"
 "Fout bij het versturen van het wachtwoord: %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 "Operatie niet ondersteund"
 
-#: 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 "Aanmelding mislukt"
 
-#: 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 ondersteunt het gevraagde aanmeldingstype %s niet"
 
-#: 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 "Geen ondersteuning voor aanmeldingstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1105
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVoer het IMAP-wachtwoord voor %s@%s in"
 
-#: camel/providers/imap/camel-imap-store.c:1119
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "U heeft geen wachtwoord ingevoerd"
 
-#: camel/providers/imap/camel-imap-store.c:1148
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9491,24 +9386,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1493
-#: camel/providers/imap/camel-imap-store.c:1635
+#: camel/providers/imap/camel-imap-store.c:1496
+#: camel/providers/imap/camel-imap-store.c:1638
 #, c-format
 msgid "No such folder %s"
 msgstr "Map `%s' bestaat niet."
 
-#: camel/providers/imap/camel-imap-store.c:1836
+#: 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 "Mapnaam kan geen enter-teken bevatten."
 
-#: camel/providers/imap/camel-imap-store.c:1848
+#: camel/providers/imap/camel-imap-store.c:1851
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Onbekende fout: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1884
+#: camel/providers/imap/camel-imap-store.c:1887
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "De map kan geen submappen bevatten"
 
@@ -9585,7 +9480,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 "Opslaglocatie %s is geen absoluut pad"
@@ -9656,7 +9551,7 @@ msgstr "Ongeldige berichtinhoud"
 
 #: 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"
@@ -9668,14 +9563,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 "Map `%s' bestaat niet."
 
 #: 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"
@@ -9701,8 +9596,8 @@ msgid "not a maildir directory"
 msgstr "geen maildir-directory"
 
 #: 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 "Kon map `%s' niet scannen: %s"
@@ -9724,10 +9619,10 @@ msgid "Checking for new messages"
 msgstr "Bezig met zoeken naar nieuwe berichten"
 
 #: 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 "Bezig met opslaan map"
 
@@ -9809,75 +9704,75 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Map `%s' is niet leeg. Niet verwijderd."
 
-#: 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 "Kon map: %s niet openen: %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 "Fatale email-interpreatiefout op positie %ld in map %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 map %s niet controleren: %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 "Kon bestand: %s niet openen: %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 "Kon tijdelijke postbus niet openen: %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 "Kon de bronmap %s niet sluiten: %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 "Kon de tijdelijke map niet sluiten: %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 "Kon de naam van de map niet wijzigen: %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 "Samenvatting en map niet gelijk, zelfs na synchronisatie"
 
-#: 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 "Onbekende fout: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:890
+#: camel/providers/local/camel-mbox-summary.c:812
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Kon de naam van de map niet wijzigen: %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 "Fout bij het schrijven naar tijdelijke postbus: %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 "Fout bij het schrijven naar tijdelijk postbus %s: %s"
@@ -9901,63 +9796,63 @@ msgstr "`%s' is geen directory."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kon MH-postbus map niet openen: %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 "Spoolmappen kunnen niet hernoemd worden"
 
-#: 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 "Opslag `%s' is geen normale directory"
 
-#: 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 "Map `%s/%s' bestaat niet."
 
-#: camel/providers/local/camel-spool-store.c:177
+#: camel/providers/local/camel-spool-store.c:180
 #, fuzzy, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "`%s' is geen normaal bestand."
 
-#: camel/providers/local/camel-spool-store.c:194
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr "Opslag ondersteunt geen Postvak In"
 
-#: 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 mail bestand %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 "Spoolmappen kunnen niet hernoemd worden"
 
-#: camel/providers/local/camel-spool-store.c:214
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr "Spoolmappen kunnen niet hernoemd worden"
 
-#: camel/providers/local/camel-spool-store.c:222
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr "Spoolmappen kunnen niet gewist worden"
 
-#: 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 "Kon tijdelijke map %s niet synchroniseren: %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 "Kon spoolmap: %s niet synchroniseren: %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"
@@ -10118,27 +10013,27 @@ msgstr ""
 "wachtwoord via het APOP-protocol. Deze optie zal niet werken voor alle "
 "gebruikers, zelfs niet op servers die beweren het te ondersteunen."
 
-#: 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 "Kon niet verbinden met %s (poort %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 ""
 "Fout bij verbinden met de POP-server.\n"
 "Fout bij het versturen van het wachtwoord: %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 "Kon niet verbinden met POP-server op %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 "
@@ -10147,28 +10042,28 @@ msgstr ""
 "Fout bij verbinden met de POP-server.\n"
 "Geen ondersteuning voor de ingestelde aanmeldingsmethode."
 
-#: 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' Inloggen mislukt: %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 niet inloggen bij POP server %s: SASL protocol fout"
 
-#: 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 "Kon niet verbinden met POP-server op %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:461
+#: camel/providers/pop3/camel-pop3-store.c:464
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sVoer het POP3-wachtwoord voor %s@%s in"
 
-#: 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
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -10177,7 +10072,7 @@ msgstr ""
 "Fout bij verbinden met de POP-server.\n"
 "Fout bij het versturen van het wachtwoord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:620
+#: camel/providers/pop3/camel-pop3-store.c:625
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Map `%s' bestaat niet."
@@ -10195,45 +10090,45 @@ msgstr ""
 "Het afleveren van post zal afgehandeld worden door het \"sendmail\" "
 "programma op het lokale systeem."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:109
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr "kon ontvangerslijst niet verwerken"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:140
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Kon verbinding met sendmail niet maken: %s: bericht niet verstuurd"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Kon sendmail niet starten: %s: bericht niet verstuurd"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Kon bericht niet versturen: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail stopte met signaal %s: bericht niet verstuurd."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:227
+#: camel/providers/sendmail/camel-sendmail-transport.c:240
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Kon %s niet uitvoeren: bericht niet verstuurd."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:232
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail stopte met staat %d: bericht niet verstuurd."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:246
+#: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:248
+#: camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "Mail delivery via the sendmail program"
 msgstr "Postaflevering via het sendmail programma"
 
@@ -10245,145 +10140,145 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Voor het versturen van email via een externe mailhub met SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr "Syntactische fout, opdracht niet herkend"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntactische fout in parameters of argumenten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr "Opdracht niet geïmplementeerd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr "Opdrachtparameter niet geïmplementeerd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr "Systeem-status, of systeem-help-antwoord"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr "Helpbericht"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr "Dienst is gereed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr "Dienst heeft transmissiekanaal gesloten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr "Dienst niet beschikbaar, transmissiekanaal gesloten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr "Postopdracht geslaagd, voltooid"
 
-#: 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 "Gebruiker niet lokaal; zal doorsturen naar <doorstuur-pad>"
 
-#: 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 "Postopdracht niet uitgevoerd: postbus niet beschikbaar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Opdracht niet uitgevoerd: postbus niet beschikbaar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr "Verzochte actie afgebroken: fout tijdens verwerken"
 
-#: 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 "Gebruiker niet lokaal; probeer <doorstuur-pad>"
 
-#: 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 "Opdracht niet uitgevoerd: onvoldoende ruimte op systeem"
 
-#: 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 "Postopdracht afgebroken: gebruikt teveel ruimte"
 
-#: 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 "Opdracht niet uitgevoerd: postbusnaam niet toegestaan"
 
-#: 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 postinvoer; eindig met <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr "Transactie mislukt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr "Veranderen van wachtwoord is vereist"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr "Aanmeldingsmechanisme te zwak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Versleuteling vereist voor gewenst aanmeldingsmechanisme"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr "Tijdelijke aanmeldingsfout"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "Aanmelding is vereist"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Fout bij QUIT-respons"
 
-#: 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 ""
 "Fout bij verbinden met de POP-server.\n"
 "Fout bij het versturen van het wachtwoord: %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 "Het bericht lijkt niet goed opgemaakt te zijn"
 
-#: 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 "Time-out tijdens RSET-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Fout bij DATA-respons"
 
-#: 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 ondersteunt het gevraagde aanmeldingstype %s niet"
 
-#: 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 "%sVoer het SMTP wachtwoord in voor %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10394,88 +10289,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:664
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Postaflevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan berichten niet versturen: afzender niet geldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:687 mail/mail-ops.c:613
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Bezig met versturen bericht"
 
-#: camel/providers/smtp/camel-smtp-transport.c:702
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan bericht niet versturen: Geen ontvangers gespecificeerd."
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan bericht niet versturen: een of meerdere ongeldige ontvangers"
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr "SMTP Begroeting"
 
-#: camel/providers/smtp/camel-smtp-transport.c:925
+#: camel/providers/smtp/camel-smtp-transport.c:924
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "Time-out tijdens RSET-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:947
+#: camel/providers/smtp/camel-smtp-transport.c:946
 #, fuzzy
 msgid "HELO response error"
 msgstr "Fout bij RSET-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr "SMTP Aanmelding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1019
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr "Fout bij aanmaken van SASL aanmeldingsobject"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1036
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: 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 "Time-out tijdens AUTH-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1057
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr "AUTH verzoek faalde"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1118
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr "Fout aanmeldingsantwoord van server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1143
+#: camel/providers/smtp/camel-smtp-transport.c:1142
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Time-out tijdens 'MAIL FROM'-verzoek: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1163
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 msgid "MAIL FROM response error"
 msgstr "Fout bij 'MAIL FROM'-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1187
+#: camel/providers/smtp/camel-smtp-transport.c:1186
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Time-out tijdens 'RCPT TO'-verzoek: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1209
+#: camel/providers/smtp/camel-smtp-transport.c:1208
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> mislukt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1250
+#: camel/providers/smtp/camel-smtp-transport.c:1247
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Time-out tijdens DATA-verzoek: %s: bericht niet verstuurd"
@@ -10483,69 +10378,69 @@ msgstr "Time-out tijdens DATA-verzoek: %s: bericht niet verstuurd"
 #. 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:1270
+#: camel/providers/smtp/camel-smtp-transport.c:1267
 msgid "DATA response error"
 msgstr "Fout bij DATA-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1311
-#: camel/providers/smtp/camel-smtp-transport.c:1334
+#: 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 ""
 "Time-out tijdens het versturen van DATA: bericht afgebroken: %s: bericht "
 "niet verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1354
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 msgid "DATA termination response error"
 msgstr "DATA terminatie foutmelding."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1377
+#: camel/providers/smtp/camel-smtp-transport.c:1374
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Time-out tijdens RSET-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1397
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 msgid "RSET response error"
 msgstr "Fout bij RSET-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1420
+#: camel/providers/smtp/camel-smtp-transport.c:1417
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Time-out tijdens AUTH-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1440
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 msgid "QUIT response error"
 msgstr "Fout bij QUIT-respons"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:102
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:105
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: 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:367 mail/mail-display.c:223
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr "bijlage"
 
-#: composer/e-msg-composer-attachment-bar.c:508
+#: composer/e-msg-composer-attachment-bar.c:503
 msgid "Remove selected items from the attachment list"
 msgstr "Verwijder het geselecteerde bestand uit de lijst van bijlages"
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Bestand bijvoegen..."
 
-#: composer/e-msg-composer-attachment-bar.c:539
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "Voeg een bestand bij het bericht"
 
@@ -10592,45 +10487,45 @@ msgstr "Klik hier voor het adresboek"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:511
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Antwoordadres:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:522
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Van:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:528
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Aan:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Geef de geadresseerden"
 
-#: composer/e-msg-composer-hdrs.c:546
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:547
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Geef de adressen die een kopie van het bericht moeten krijgen"
 
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:551
+#: 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."
@@ -10641,12 +10536,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:558
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:560
+#: composer/e-msg-composer-hdrs.c:549
 #, fuzzy
 msgid "Posting destination"
 msgstr "Geen omschrijving"
@@ -10657,12 +10552,12 @@ msgstr "Geen omschrijving"
 msgid "Attach file(s)"
 msgstr "Voeg een bestand toe als bijlage"
 
-#: composer/e-msg-composer.c:526
+#: composer/e-msg-composer.c:533
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Kon geen PGP handtekening-context maken"
 
-#: composer/e-msg-composer.c:805
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10671,30 +10566,30 @@ msgstr ""
 "Fout bij lezen bestand %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1168
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Bestand bestaat reeds, overschrijven?"
 
-#: composer/e-msg-composer.c:1186
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fout bij opslaan bestand: %s"
 
-#: composer/e-msg-composer.c:1209
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fout bij openen bestand: %s"
 
-#: composer/e-msg-composer.c:1244
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fout bij benaderen bestand: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Kon bericht niet van editor halen"
 
-#: composer/e-msg-composer.c:1259
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10703,7 +10598,7 @@ msgstr ""
 "Niet in staat te zoeken op bestand: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1266
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10712,7 +10607,7 @@ msgstr ""
 "Niet in staat om bestand: %s af te kappen\n"
 "%s"
 
-#: composer/e-msg-composer.c:1275
+#: composer/e-msg-composer.c:1285
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10721,7 +10616,7 @@ msgstr ""
 "Niet in staat te zoeken op bestand: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1284
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10730,7 +10625,7 @@ msgstr ""
 "Fout bij automatisch opslaan bericht: %s\n"
 " %s"
 
-#: 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?"
@@ -10739,7 +10634,7 @@ msgstr ""
 "gevonden.\n"
 "Wilt u dat deze hersteld worden?"
 
-#: composer/e-msg-composer.c:1540
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10750,32 +10645,33 @@ msgstr ""
 "\n"
 "Wilt u de wijzingen opslaan?"
 
-#: composer/e-msg-composer.c:1545
+#: composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "Veranderingen verwerpen"
 
-#: composer/e-msg-composer.c:1549
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Waarschuwing: Veranderd Bericht"
 
-#: composer/e-msg-composer.c:1581
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Bestand openen"
 
-#: composer/e-msg-composer.c:1939
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Signature:"
 msgstr "Bewaar handtekening"
 
-#: composer/e-msg-composer.c:1979 mail/mail-account-gui.c:1255
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr "Automatisch gegenereerd"
 
-#: composer/e-msg-composer.c:2158 composer/e-msg-composer.c:2757
+#: composer/e-msg-composer.c:2234 composer/e-msg-composer.c:2873
+#: composer/e-msg-composer.c:2874
 msgid "Compose a message"
 msgstr "Stel een nieuw bericht op"
 
-#: composer/e-msg-composer.c:2788
+#: composer/e-msg-composer.c:2905
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10783,7 +10679,7 @@ msgstr ""
 "Kon het venster Opstellen niet aanmaken:\n"
 "Kan adresselectie niet activeren."
 
-#: composer/e-msg-composer.c:2814
+#: composer/e-msg-composer.c:2931
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10794,7 +10690,7 @@ msgstr ""
 "Kon het venster voor het opstellen van het bericht niet maken:\n"
 "Niet in staat de HTML editor component te activeren."
 
-#: composer/e-msg-composer.c:2874
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10802,26 +10698,12 @@ msgstr ""
 "Kon het venster voor het opstellen van het bericht niet maken:\n"
 "Niet in staat de HTML editor component te activeren."
 
-#: composer/e-msg-composer.c:3890
+#: 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 ""
-"Aanmaken van het dialoogvenster voor het opstellen van een nieuw bericht is "
-"mislukt, want u heeft nog geen identiteitsgegevens geconfigureerd in het "
-"mail-component."
-
-#: composer/evolution-composer.c:432
-#, fuzzy
-msgid "Cannot initialize the Evolution composer."
-msgstr "Kan de berichtenopsteller van Evolution niet initialiseren."
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "De Evolution werkgroep suite"
@@ -10974,7 +10856,7 @@ 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?"
@@ -10982,11 +10864,15 @@ msgstr ""
 "Er bestaat al een bestand met die naam.\n"
 "Overschrijven?"
 
-#: e-util/e-passwords.c:345
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "Bestand overschrijven?"
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Onthoud dit wachtwoord"
 
-#: e-util/e-passwords.c:347
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Onthoud dit wachtwoord tot het einde van deze sessie"
 
@@ -11084,42 +10970,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 "seconden"
+#: 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 seconden"
+
+#: filter/filter-datespec.c:66
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 minuut"
 
 #: filter/filter-datespec.c:66
-msgid "minute"
-msgstr "minuut"
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "%d minuten"
 
 #: filter/filter-datespec.c:67
-msgid "hour"
-msgstr "uur"
+#, fuzzy
+msgid "1 hour ago"
+msgstr "1 uur"
+
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d uren"
+
+#: 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 " geleden"
 
 #: filter/filter-datespec.c:69
-msgid "week"
-msgstr "week"
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 week"
 
-#: filter/filter-datespec.c:69 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "weken"
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d weken"
 
 #: filter/filter-datespec.c:70
-msgid "month"
+#, fuzzy
+msgid "1 month ago"
 msgstr "maand"
 
-#: filter/filter-datespec.c:70 filter/filter.glade.h:23
-msgid "months"
-msgstr "maanden"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr " geleden"
 
 #: filter/filter-datespec.c:71
-msgid "year"
-msgstr "jaar"
+msgid "1 year ago"
+msgstr ""
 
-#: filter/filter-datespec.c:71 filter/filter.glade.h:33
-msgid "years"
-msgstr "jaren"
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr " geleden"
 
 #: filter/filter-datespec.c:176
 #, fuzzy
@@ -11140,13 +11058,7 @@ msgstr "nu"
 msgid "%d-%b-%Y"
 msgstr "%a %d %b %Y"
 
-#. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:298 filter/filter-datespec.c:301
-#, fuzzy, c-format
-msgid "%d %s ago"
-msgstr " geleden"
-
-#: filter/filter-datespec.c:417
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Selecteer een tijd om mee te vergelijken"
 
@@ -11164,7 +11076,7 @@ msgstr "Geef Bestandsnaam:"
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Spool `%s' bestaat niet of is geen normaal bestand"
 
-#: filter/filter-file.c:293
+#: filter/filter-file.c:298
 #, fuzzy
 msgid "Choose a file"
 msgstr "Kies een actie:"
@@ -11180,7 +11092,7 @@ msgid "You must specify a folder."
 msgstr "Geef Bestandsnaam:"
 
 #: filter/filter-folder.c:243 filter/vfolder-rule.c:408
-#: mail/mail-account-gui.c:1500 mail/mail-account-gui.c:1514
+#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
 msgid "Select Folder"
 msgstr "Selecteer Map"
 
@@ -11193,33 +11105,35 @@ msgstr ""
 "Fout in reguliere expressie '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:68
-#: mail/mail-config.glade.h:64
+#: 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 "Belangrijk"
 
 #. red
 #: filter/filter-label.c:122 mail/mail-config.c:69
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1280
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
 #: 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:124 mail/mail-config.c:71
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1282
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
 #: 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 "na"
@@ -11325,6 +11239,14 @@ msgstr "Een tijd relatief aan de huidige tijd"
 msgid "ago"
 msgstr "geleden"
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "maanden"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr "seconden"
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "alleen specifieke mappen"
@@ -11342,6 +11264,10 @@ msgstr "Een tijd die u specificeert"
 msgid "vFolder Sources"
 msgstr "VMap-bronnen"
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "weken"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "met alle actieve niet-lokale mappen"
@@ -11354,6 +11280,10 @@ msgstr "met alle lokale en actieve niet-lokale mappen"
 msgid "with all local folders"
 msgstr "met alle lokale folders"
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "jaren"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -11378,234 +11308,235 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "bevat"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopieer naar Map"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Ontvangstdatum"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Verzendingsdatum"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "bevat niet"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "eindigt niet op"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "bestaat niet"
+
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "bestaat niet"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "klinkt niet als"
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "begint niet met"
+
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "bestaat niet"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Klad"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "eindigt op"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Bestaat"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "bestaat"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Expressie"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "Antwoord"
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1778
+#: filter/libfilter-i18n.h:27
+msgid "is"
+msgstr "is"
+
+#: filter/libfilter-i18n.h:28
+msgid "is after"
+msgstr "is na"
+
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr "is voor"
+
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
+msgstr "is Gemarkeerd"
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "is groter dan"
+
+#: filter/libfilter-i18n.h:32
+msgid "is less than"
+msgstr "is kleiner dan"
+
+#: filter/libfilter-i18n.h:33
+msgid "is not"
+msgstr "is niet"
+
+#: filter/libfilter-i18n.h:34
+msgid "is not Flagged"
+msgstr "Is niet Gemarkeerd"
+
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Mailinglijst"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Berichtinhoud"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Berichtkop"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Verplaats naar Map"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Shellopdracht uitvoeren"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Speel een geluid af:"
 
-#: 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 "Gelezen"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Geadresseerden"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Overeenkomende Regex"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Beantwoord aan"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "is groter dan"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "is kleiner dan"
+
+#: 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:30 mail/mail-callbacks.c:1809
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "Afzender"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Stel Status in"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Shellopdracht uitvoeren"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Grootte (kB)"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "klinkt als"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Source-Account"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Specifieke kop"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "begint met"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Stop met Verwerken"
 
-#: filter/libfilter-i18n.h:38 mail/mail-format.c:909
+#: 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 "Onderwerp"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:61
 #, fuzzy
 msgid "Unset Status"
 msgstr "Stel Status in"
 
-#: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "bevat"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "bevat niet"
-
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr "eindigt niet op"
-
-#: filter/libfilter-i18n.h:43
-msgid "does not exist"
-msgstr "bestaat niet"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "does not return"
-msgstr "bestaat niet"
-
-#: filter/libfilter-i18n.h:45
-msgid "does not sound like"
-msgstr "klinkt niet als"
-
-#: filter/libfilter-i18n.h:46
-msgid "does not start with"
-msgstr "begint niet met"
-
-#: filter/libfilter-i18n.h:47
-msgid "ends with"
-msgstr "eindigt op"
-
-#: filter/libfilter-i18n.h:48
-msgid "exists"
-msgstr "bestaat"
-
-#: filter/libfilter-i18n.h:49
-msgid "is Flagged"
-msgstr "is Gemarkeerd"
-
-#: filter/libfilter-i18n.h:50
-msgid "is after"
-msgstr "is na"
-
-#: filter/libfilter-i18n.h:51
-msgid "is before"
-msgstr "is voor"
-
-#: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "is groter dan"
-
-#: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "is kleiner dan"
-
-#: filter/libfilter-i18n.h:54
-msgid "is not Flagged"
-msgstr "Is niet Gemarkeerd"
-
-#: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "is niet"
-
-#: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "is"
-
-#: filter/libfilter-i18n.h:57
-#, fuzzy
-msgid "returns greater than"
-msgstr "is groter dan"
-
-#: filter/libfilter-i18n.h:58
-#, fuzzy
-msgid "returns less than"
-msgstr "is kleiner dan"
-
-#: filter/libfilter-i18n.h:59
-#, fuzzy
-msgid "returns"
-msgstr "Burns"
-
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr "klinkt als"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "begint met"
+#: 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 "Regel"
 
-#: filter/rule-editor.c:241 filter/rule-editor.c:325
-#, c-format
-msgid "Rule name '%s' is not unique, choose another."
-msgstr ""
-
 #: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Regel Toevoegen"
@@ -11631,49 +11562,49 @@ msgstr "U moet deze vfolder een naam geven."
 msgid "You need to to specify at least one folder as a source."
 msgstr "U moet minstens één map als bron opgeven."
 
-#: filter/vfolder-rule.c:492
+#: filter/vfolder-rule.c:499
 #, fuzzy
 msgid "VFolder source"
 msgstr "VMap-bronnen"
 
-#: importers/elm-importer.c:95 mail/importers/elm-importer.c:103
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution is uw oude Elm mail aan het importeren"
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101 mail/importers/elm-importer.c:104
-#: mail/importers/netscape-importer.c:1237 mail/importers/pine-importer.c:114
+#: 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 "Importeren..."
 
 #: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103 mail/importers/elm-importer.c:106
-#: mail/importers/netscape-importer.c:1239 mail/importers/pine-importer.c:116
+#: 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 "Een ogenblik geduld aub"
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365 mail/importers/elm-importer.c:183
-#: mail/importers/netscape-importer.c:1794 mail/importers/pine-importer.c:330
+#: 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 "Importeren %s als %s"
 
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471 mail/importers/elm-importer.c:389
-#: mail/importers/netscape-importer.c:1906 mail/importers/pine-importer.c:439
+#: 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 "Bezig met doorzoeken %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 mail/importers/elm-importer.c:523
-#: mail/importers/netscape-importer.c:2104 mail/importers/pine-importer.c:586
+#: 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 mail/importers/elm-importer.c:544
+#: 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?"
@@ -11681,7 +11612,7 @@ msgstr ""
 "Evolution heeft Elm mailbestand gevonden\n"
 "Wilt u deze importeren naar Evolution?"
 
-#: importers/elm-importer.c:574 mail/importers/elm-importer.c:565
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -11693,12 +11624,12 @@ msgstr ""
 "Evolution heeft GnomeCard bestanden geovnden.\n"
 "Wilt u deze importeren naar Evolution?"
 
-#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:74
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioriteit: %s"
 
-#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:662
+#: 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"
@@ -11713,7 +11644,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:686
+#: 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"
@@ -11721,7 +11652,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:703
+#: 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"
@@ -11730,41 +11661,41 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1236
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importeert uw oude Netscape informatie"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1861
+#: 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 "Prullenbak"
 
-#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:2014
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Lokaal postbusbestand %s"
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
-#: mail/importers/netscape-importer.c:2025 mail/importers/pine-importer.c:534
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
 msgid "Scanning directory"
 msgstr "Map wordt gescant"
 
-#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2034
-#: shell/e-shell-startup-wizard.c:519
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr "Importeren wordt gestart"
 
-#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2109
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Instellingen:"
 
-#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2114
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Filters Bewerken"
 
-#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2138
+#: 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?"
@@ -11772,11 +11703,11 @@ msgstr ""
 "Evolution heeft Netscape mailbestanden gevonden.\n"
 "Wilt u deze importeren naar Evolution?"
 
-#: importers/pine-importer.c:100 mail/importers/pine-importer.c:113
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importeert uw oude Pine informatie"
 
-#: importers/pine-importer.c:663 mail/importers/pine-importer.c:613
+#: 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?"
@@ -11784,7 +11715,7 @@ msgstr ""
 "Evolution heeft Pine mailbestanden gevonden.\n"
 "Wilt u deze importeren naar Evolution?"
 
-#: importers/pine-importer.c:691 mail/importers/pine-importer.c:632
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 msgid "Pine"
 msgstr "Pine"
 
@@ -11793,65 +11724,68 @@ msgid "Composer Preferences"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-#, fuzzy
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Fabriek voor de Evolution takencomponent"
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:3
-#, fuzzy
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Fabriek voor de Evolution takencomponent"
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:4
 #, fuzzy
-msgid "Configuration control for the Evolution Mailer."
+msgid "Configure the fonts used by Evolution here"
 msgstr "Fabriek voor de Evolution opsteller."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:5
 #, fuzzy
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Fabriek voor de Evolution opsteller."
+msgid "Configure your email accounts here"
+msgstr "Creeer of bewerk een emailaccount of andere voorkeuren"
 
 #: 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 "Fabriek voor de Evolution takencomponent"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:8
 #, fuzzy
-msgid "Configure the fonts used by Evolution here"
-msgstr "Fabriek voor de Evolution opsteller."
+msgid "Evolution Mail component"
+msgstr "Evolution bericht-opsteller."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Creeer of bewerk een emailaccount of andere voorkeuren"
+msgid "Evolution Mail composer"
+msgstr "Evolution bericht-opsteller."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Evolution-component voor het afhandelen van post"
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Fabriek voor de Evolution takencomponent"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution mail composer."
-msgstr "Evolution bericht-opsteller."
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Mail configuratie interface"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Evolution post-samenvattingscomponent."
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution postmap-weergavecomponent."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Evolution postmap-weergavecomponent."
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Fabriek voor de Evolution takencomponent"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:14
 #, fuzzy
-msgid "Factory for the controls exported by the Evolution Mailer"
-msgstr ""
-"Fabriek voor de controls die door het Evolution adresboek worden geëxporteerd"
+msgid "Evolution Mail preferences control"
+msgstr "Evolution post-samenvattingscomponent."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:15
 #, fuzzy
@@ -11867,45 +11801,41 @@ msgstr "Accounts"
 msgid "Mail Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:18
-msgid "Mail configuration interface"
-msgstr "Mail configuratie interface"
-
-#: mail/component-factory.c:113
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Map die post bevat"
 
-#: mail/component-factory.c:114
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public Mail"
 msgstr "Openbaar"
 
-#: mail/component-factory.c:114
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "Map die post bevat"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Virtueal Afval"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Virtuele Afvalmap"
 
-#: mail/component-factory.c:143
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Deze map kan geen berichten bevatten."
 
-#: mail/component-factory.c:437
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Eigenschappen..."
 
-#: mail/component-factory.c:437
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Verander de eigenschappen van deze map"
 
-#: 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."
@@ -11913,74 +11843,61 @@ msgstr ""
 "Sommige van uw email-instellingen lijken ongeldig, controleer alstublieft of "
 "alles goed staat."
 
-#: mail/component-factory.c:988
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "Er is geen post-transportmethode ingesteld"
 
-#: 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 "Nieuw Bericht"
 
-#: mail/component-factory.c:1052
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "Bericht"
 
-#: mail/component-factory.c:1053
+#: mail/component-factory.c:1061
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Stel een nieuw bericht op"
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "New Message Post"
 msgstr "Volgend Bericht"
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "_Post Message"
 msgstr "Vorig Bericht"
 
-#: mail/component-factory.c:1062
+#: mail/component-factory.c:1070
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Nieuw Bericht"
 
-#: mail/component-factory.c:1090
-#, fuzzy
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Kan de Mail-component van Evolution niet initialiseren."
-
-#: mail/component-factory.c:1099
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Kan de mailconfiguratie-component van Evolution niet initialiseren."
-
-#: mail/component-factory.c:1105
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Kan de Map-info-component van Evolution niet initialiseren."
-
-#: mail/component-factory.c:1349 mail/component-factory.c:1379
+#: mail/component-factory.c:1353
 #, fuzzy
 msgid "Connecting..."
 msgstr "Verbinden met server..."
 
-#: mail/component-factory.c:1390
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Kan opslag niet registreren met shell"
 
-#: mail/folder-browser-ui.c:483
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenschappen voor \"%s\""
 
-#: mail/folder-browser-ui.c:485
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:920
+#: 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 "Kon tijdelijke directory niet maken: %s"
@@ -12025,141 +11942,141 @@ msgstr "%d verzonden"
 msgid "%d total"
 msgstr "%d totaal"
 
-#: mail/folder-browser.c:1167
+#: mail/folder-browser.c:1182
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Maak VMap Van Bericht"
 
-#: mail/folder-browser.c:1714
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "VMap op _Onderwerp"
 
-#: mail/folder-browser.c:1715
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "VMap op Afze_nder"
 
-#: mail/folder-browser.c:1716
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "VMap op _Geadresseerden"
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "VMap op Mailing_Lijst"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "Filter op Onderwerp"
 
-#: mail/folder-browser.c:1722
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "Filter op Afzen_der"
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "Filter op Geadresseerden"
 
-#: 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 "Filter op _Mailinglijst"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "B_ewerk als Nieuw Bericht..."
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "_Afdrukken"
 
-#: 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 "Afzender beantwoorden"
 
-#: 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 "Lijst Be_antwoorden"
 
-#: 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 "Iedereen Be_antwoorden"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: mail/folder-browser.c:1755
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Antwoord..."
 
-#: mail/folder-browser.c:1756
+#: mail/folder-browser.c:1771
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Markeer als Voltooid"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1772
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Markering Wissen"
 
 #. 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_keer als Gelezen"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1777
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Markeer als O_ngelezen"
 
-#: mail/folder-browser.c:1763
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "Markeer als _Belangrijk"
 
-#: mail/folder-browser.c:1764
+#: mail/folder-browser.c:1779
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Markeer Als _Onbelangrijk"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1784
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Herstellen"
 
-#: mail/folder-browser.c:1773
+#: mail/folder-browser.c:1788
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Verplaatsen naar Map..."
 
-#: 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 "_Kopiëren naar Map..."
 
-#: mail/folder-browser.c:1782
+#: mail/folder-browser.c:1797
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Afzender aan Adresboek Toevoegen"
 
-#: mail/folder-browser.c:1786
+#: mail/folder-browser.c:1801
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Filters Toepassen"
 
-#: mail/folder-browser.c:1790
+#: mail/folder-browser.c:1805
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Creeer Regel Van Bericht"
 
-#: mail/folder-browser.c:2049
+#: mail/folder-browser.c:2064
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VMap op Mailinglijst"
 
-#: mail/folder-browser.c:2051
+#: mail/folder-browser.c:2066
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter op Mailinglijst (%s)"
 
-#: mail/folder-browser.c:2052
+#: mail/folder-browser.c:2067
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VMap op Mailinglijst (%s)"
@@ -12172,22 +12089,37 @@ msgstr "Standaard"
 msgid "Getting Folder Information"
 msgstr "Bezig met Verkrijgen Mapinformatie"
 
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Evolution bericht-opsteller."
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "Fabriek voor het importeren van mbox bestanden naar Evolution"
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolution bericht-opsteller."
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Importeert mbox bestanden naar 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 bericht-opsteller."
 
 #: 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 ""
-"Fabriek voor het importeren van Outlook Express 4 berichten naar Evolution"
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Importeert Outlook Express 4 bestanden naar 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 bericht-opsteller."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -12233,58 +12165,58 @@ msgstr "U heeft niet alle informatie ingevuld die nodig is."
 msgid "Evolution Account Editor"
 msgstr "Evolution Accountbeheer"
 
-#: mail/mail-account-gui.c:752 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "Computernaam:"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Gebruikersnaam:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "_Pad:"
 
-#: mail/mail-account-gui.c:1877
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr "U kunt niet meerdere accounts met dezelfde naam maken."
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr "Weet u zeker dat u deze account wilt verwijderen?"
 
-#: mail/mail-accounts.c:230
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "Niet verwijderen"
 
-#: mail/mail-accounts.c:303 mail/mail-accounts.c:341
-#: mail/mail-composer-prefs.c:657 mail/mail-composer-prefs.c:675
+#: 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 "Uitzetten."
 
-#: mail/mail-accounts.c:303 mail/mail-accounts.c:343
-#: mail/mail-composer-prefs.c:657 mail/mail-composer-prefs.c:675
+#: 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 "Aanzetten"
 
 #. translators: default account indicator
-#: mail/mail-accounts.c:383
+#: mail/mail-accounts.c:433
 #, fuzzy
 msgid "[Default]"
 msgstr "Standaard"
 
-#: mail/mail-accounts.c:427 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:818
+#: 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 "Aangezet"
 
-#: mail/mail-accounts.c:432 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Accountnaam:"
 
-#: mail/mail-accounts.c:434 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
@@ -12330,11 +12262,11 @@ msgstr ""
 "En zijn aangepast."
 
 #. 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 "Dit bericht niet meer weergeven."
 
-#: 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"
@@ -12346,7 +12278,7 @@ msgstr ""
 "of ontvangen.\n"
 "Wilt u email nu configureren?"
 
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:211
 #, fuzzy
 msgid ""
 "You need to configure an account\n"
@@ -12355,7 +12287,7 @@ msgstr ""
 "U dient een identiteit te configuren\n"
 "voordat u post kunt versturen."
 
-#: mail/mail-callbacks.c:227
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -12363,7 +12295,7 @@ msgstr ""
 "U dient een identiteit te configuren\n"
 "voordat u post kunt versturen."
 
-#: mail/mail-callbacks.c:234
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -12372,7 +12304,7 @@ msgstr ""
 "voordat u email kunt versturen."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:256
+#: mail/mail-callbacks.c:254
 #, fuzzy
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
@@ -12381,11 +12313,11 @@ msgstr ""
 "U verstuurt een HTML-geformateerd bericht, maar de volgende ontvangers "
 "willen geen HTML emailtjes ontvangen:\n"
 
-#: mail/mail-callbacks.c:268
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "Toch versturen?"
 
-#: mail/mail-callbacks.c:289
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12393,7 +12325,7 @@ msgstr ""
 "Dit bericht heeft geen onderwerp.\n"
 "Weet u zeker dat u het wilt versturen?"
 
-#: mail/mail-callbacks.c:315
+#: 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."
@@ -12401,11 +12333,11 @@ msgstr ""
 "Omdat de contactenlijst waar u heen stuurt configureerd is voor verborgen "
 "adreslijsten zal dit bericht slechts Bcc dressen bevatten."
 
-#: mail/mail-callbacks.c:319
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr "Dit bericht bevat alleen Bcc-ontvangers."
 
-#: 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"
@@ -12415,12 +12347,12 @@ msgstr ""
 "toevoegen van een 'Apparently-To' kop.\n"
 "Toch versturen?"
 
-#: mail/mail-callbacks.c:458
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 "De geadresseerde moeten worden gespecificeerd om dit bericht te versturen."
 
-#: mail/mail-callbacks.c:713
+#: 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?"
@@ -12428,28 +12360,28 @@ msgstr ""
 "Kan de drafts map voor die account niet openen.\n"
 "Wilt u gebruik maken van de standaardmap?"
 
-#: mail/mail-callbacks.c:1178
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "een onbekende afzender"
 
-#: mail/mail-callbacks.c:1182
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Op %a %d-%m-%Y, om %H:%M schreef %%s:"
 
-#: mail/mail-callbacks.c:1689 mail/message-browser.c:143
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr "Verplaats bericht(en) naar"
 
-#: mail/mail-callbacks.c:1691 mail/message-browser.c:145
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr "Kopieer bericht(en) naar"
 
-#: mail/mail-callbacks.c:2335
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Weet u zeker dat u alle %d berichten wilt bewerken?"
 
-#: mail/mail-callbacks.c:2351
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12457,7 +12389,7 @@ msgstr ""
 "U kunt alleen berichten bewerken die opgeslagen zijn\n"
 "in de Kladmap."
 
-#: mail/mail-callbacks.c:2384
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12465,16 +12397,16 @@ msgstr ""
 "U kunt alleen berichten bewerken die opgeslagen zijn\n"
 "in de Kladmap."
 
-#: mail/mail-callbacks.c:2394
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Weet u zeker dat alle %d berichten wilt herversturen?"
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "Geen bericht geselecteerd"
 
-#: mail/mail-callbacks.c:2456
+#: mail/mail-callbacks.c:2465
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12483,7 +12415,7 @@ msgstr ""
 "Kan bericht niet verkrijgen: %s\n"
 "  %s"
 
-#: mail/mail-callbacks.c:2461
+#: mail/mail-callbacks.c:2470
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12492,15 +12424,15 @@ msgstr ""
 "%s bestaat reeds\n"
 "Wilt u het overschrijven?"
 
-#: mail/mail-callbacks.c:2502
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "Bericht Opslaan Als..."
 
-#: mail/mail-callbacks.c:2504
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "Berichten Opslaan Als..."
 
-#: mail/mail-callbacks.c:2672
+#: mail/mail-callbacks.c:2687
 #, fuzzy
 msgid ""
 "This operation will permanently erase all messages marked as\n"
@@ -12513,7 +12445,7 @@ msgstr ""
 "\n"
 "De berichten echt verwijderen?"
 
-#: mail/mail-callbacks.c:2758
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12522,67 +12454,56 @@ msgstr ""
 "Fout bij het laden van filterinformatie:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2766
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filters"
 
-#: mail/mail-callbacks.c:2808
+#: mail/mail-callbacks.c:2831
 #, c-format
 msgid "Page %d of %d"
 msgstr "Pagina %d van %d"
 
-#: mail/mail-callbacks.c:2864
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "Bericht Afdrukken"
 
-#: mail/mail-callbacks.c:2931
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "Afdrukken van bericht mislukt"
 
-#: mail/mail-callbacks.c:3121
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Weet u zeker dat alle %d berichten in een appart scherm wilt weergeven?"
 
-#: mail/mail-composer-prefs.c:226
-msgid ""
-"Please specify signature filename\n"
-"in Advanced section of signature settings."
-msgstr ""
-
-#: mail/mail-composer-prefs.c:246 mail/mail-composer-prefs.c:253
-#: mail/mail-composer-prefs.c:383 mail/mail-composer-prefs.c:438
-#, fuzzy
-msgid "[script]"
-msgstr "_Beveiliging"
-
-#: mail/mail-composer-prefs.c:251
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
 #, fuzzy
-msgid "Unnamed [script]"
-msgstr "Lijst van onbenoemden"
+msgid "Unnamed"
+msgstr "Ander contact"
 
-#: mail/mail-composer-prefs.c:327
+#: mail/mail-composer-prefs.c:335
 #, fuzzy
 msgid "You must specify a valid script name."
 msgstr "Geef Bestandsnaam:"
 
-#: mail/mail-composer-prefs.c:342 mail/mail-config.c:1218
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
 #, fuzzy
-msgid "Unnamed"
-msgstr "Ander contact"
+msgid "[script]"
+msgstr "_Beveiliging"
 
-#: mail/mail-composer-prefs.c:822
+#: mail/mail-composer-prefs.c:864
 #, fuzzy
 msgid "Language(s)"
 msgstr "Taal"
 
-#: mail/mail-composer-prefs.c:866
+#: mail/mail-composer-prefs.c:906
 #, fuzzy
 msgid "Add script signature"
 msgstr "Bewaar handtekening"
 
-#: mail/mail-composer-prefs.c:885
+#: mail/mail-composer-prefs.c:926
 #, fuzzy
 msgid "Signature(s)"
 msgstr "Bewaar handtekening"
@@ -12655,11 +12576,11 @@ msgstr ""
 "emailaccount. Geef een naam aan dit account in de ruimte hieronder. Deze "
 "naam zal alleen worden gebruikt als roepnaam."
 
-#: mail/mail-config.c:922
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Dienst wordt gecontroleerd"
 
-#: mail/mail-config.c:1000 mail/mail-config.c:1004
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 msgid "Connecting to server..."
 msgstr "Verbinden met server..."
 
@@ -12936,23 +12857,24 @@ msgstr "_Berichtweergave"
 
 #: mail/mail-config.glade.h:75
 #, fuzzy
+msgid "Message Fonts"
+msgstr "Bericht bevat"
+
+#: mail/mail-config.glade.h:76
+#, fuzzy
 msgid "Microsoft"
 msgstr "Micronesië"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Nieuwe Mail Notificatie"
 
-#: 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 "Optionele Informatie"
@@ -13203,122 +13125,127 @@ msgid "_Enable"
 msgstr "Aanzetten"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr ""
-
-#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Standaardwijze van doorsturen: "
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "_Volledige Naam:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "In HTML-berichten"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Identity"
 msgstr "Identiteit"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "Toon afbeeldingen als de afzender in het adresboek voorkomt"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Stel dit in als standaardaccount"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Markeer berichten als Gelezen na "
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Naam:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "_Nooit afbeeldingen van het internet ophalen"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Geluid afspelen bij binnekomst van nieuwe berichten"
 
-#: 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 ""
 "Waarschuw wanneer HTML berichten verstuurd worden naar contacten die dat "
 "niet willen"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Waarschuw wanneer een bericht verstuurd wordt zonder _onderwerp"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Berichten Ophalen"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Standaardwijze van doorsturen: "
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Restore defaults"
 msgstr " (standaard)"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Script:"
 msgstr "_Beveiliging"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Berichten versturen"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Toon Tijd Als"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "Bestand met ondertekening:"
 
+#: 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 "Gebruik een beveiligde verbinding (SSL)"
+msgid "_Terminal Font:"
+msgstr "Origineel contact:"
 
 #: mail/mail-config.glade.h:176
 #, fuzzy
-msgid "_Variable-width:"
-msgstr "Variabel"
+msgid "_Use secure connection (SSL):"
+msgstr "Gebruik een beveiligde verbinding (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 "_elke"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "color"
 msgstr " kleur"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "omschrijving"
 
@@ -13351,10 +13278,6 @@ msgstr ""
 "Er bestaat al een bestand met die naam.\n"
 "Overschrijven?"
 
-#: mail/mail-display.c:196
-msgid "Overwrite file?"
-msgstr "Bestand overschrijven?"
-
 #: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Bijlage Opslaan"
@@ -13391,38 +13314,38 @@ msgstr "Verbergen"
 msgid "External Viewer"
 msgstr "Extern Weergave Programma"
 
-#: mail/mail-display.c:1346
+#: mail/mail-display.c:1365
 #, fuzzy
 msgid "Downloading images"
 msgstr "Toon _Afbeeldingen"
 
-#: mail/mail-display.c:1523
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "Bezig met laden berichtinhoud"
 
-#: mail/mail-display.c:1860
+#: mail/mail-display.c:1879
 #, fuzzy
 msgid "Overdue:"
 msgstr "Verlopen taken:"
 
-#: mail/mail-display.c:1864
+#: mail/mail-display.c:1883
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:2215
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Open Link in Browser"
 
-#: mail/mail-display.c:2216
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Kopieer Link Locatie"
 
-#: mail/mail-display.c:2218
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Sla Link op als (FIXME)"
 
-#: mail/mail-display.c:2220
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Sla Figuur op als..."
 
@@ -13436,88 +13359,88 @@ msgstr "Bezig met doorzoeken %s"
 msgid "%s attachment"
 msgstr "%s bijlage"
 
-#: mail/mail-format.c:682 mail/mail-format.c:1337 mail/mail-format.c:1406
-#: mail/mail-format.c:1526 mail/mail-format.c:1650 mail/mail-format.c:1675
+#: 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 "Kon MIME bericht niet verwerken. Laat zien als source"
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:759 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr "Ongeldig Emailadres"
 
-#: mail/mail-format.c:887 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 "Van"
 
-#: mail/mail-format.c:891
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Antwoordadres"
 
-#: mail/mail-format.c:896 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Aan"
 
-#: mail/mail-format.c:901
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:906
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1449
+#: mail/mail-format.c:1451
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Dit bericht is digitaal ondertekend. Klik op het hangslotpictogram voor meer "
 "informatie."
 
-#: mail/mail-format.c:1477
+#: mail/mail-format.c:1479
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Kon geen PGP verificatie context maken"
 
-#: mail/mail-format.c:1485
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Dit bericht is digitaal ondertekend en is authentiek."
 
-#: mail/mail-format.c:1492
+#: mail/mail-format.c:1494
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Dit bericht is digitaal ondertekend, maar er kan niet worden aangetoond dat "
 "het authentiek is."
 
-#: mail/mail-format.c:1756
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Verwijzing naar FTP site (%s)"
 
-#: mail/mail-format.c:1767
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Verwijzing naar lokaal bestand (%s) geldig bij site \"%s\""
 
-#: mail/mail-format.c:1770
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Verwijzing naar lokaal bestand (%s)"
 
-#: mail/mail-format.c:1797
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Verwijzing naar externe gegevens (%s)"
 
-#: mail/mail-format.c:1803
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Verwijzing naar onbekende externe gegevens (\"%s\" type)"
 
-#: mail/mail-format.c:1805
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr "Misvormd extern-berichtgedeelte"
 
@@ -13690,7 +13613,7 @@ msgstr "Bezig met ophalen van %d bericht(en)"
 msgid "Saving %d messsage(s)"
 msgstr "Bezig met het opslaan van %d bericht(en)"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13699,7 +13622,7 @@ msgstr ""
 "Kon uitvoerbestand niet maken: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13708,11 +13631,11 @@ msgstr ""
 "Fout bij opslaan berichten in: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "Bezig met opslaan bijlage"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13721,58 +13644,54 @@ msgstr ""
 "Kan uitvoerbestand niet maken: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
-#: mail/mail-ops.c:2213
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbreken van %s"
 
-#: mail/mail-ops.c:2213
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Bezig met opnieuw verbinden met %s"
 
-#: mail/mail-search-dialogue.c:121 widgets/misc/e-search-bar.c:518
-msgid "_Search"
-msgstr "_Zoeken"
-
-#: mail/mail-search.c:142
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(Naamloos Bericht)"
 
-#: mail/mail-search.c:224
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "Naamloos Bericht"
 
-#: mail/mail-search.c:226
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "Leeg Bericht"
 
-#: mail/mail-search.c:274
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "Vind in bericht"
 
-#: mail/mail-search.c:277
+#: mail/mail-search.c:285
 msgid "Search"
 msgstr "Zoeken"
 
-#: mail/mail-search.c:303
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "Hoofdlettergevoelig"
 
-#: mail/mail-search.c:305
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr "Zoek doorgestuurde"
 
-#: mail/mail-search.c:325
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "Zoek:"
 
-#: mail/mail-search.c:328
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "Klopt:"
 
@@ -13824,21 +13743,21 @@ msgstr "Voer uw Wachtwoord in voor %s"
 msgid "Enter Password"
 msgstr "Voer Wachtwoord in"
 
-#: mail/mail-session.c:282
+#: mail/mail-session.c:280
 msgid "_Remember this password"
 msgstr "_Onthoud dit wachtwoord"
 
-#: mail/mail-session.c:283
+#: mail/mail-session.c:281
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Onthoud dit wachtwoord tot het einde van deze sessie"
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-signature-editor.c:80
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Kon handtekening-bestand niet opslaan."
 
-#: 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"
@@ -13848,38 +13767,38 @@ msgstr ""
 "\n"
 "Wilt u de wijzingen opslaan?"
 
-#: mail/mail-signature-editor.c:179
+#: mail/mail-signature-editor.c:229
 msgid "_Discard changes"
 msgstr ""
 
-#: mail/mail-signature-editor.c:183
+#: mail/mail-signature-editor.c:233
 msgid "Save signature"
 msgstr "Bewaar handtekening"
 
-#: mail/mail-signature-editor.c:328
+#: mail/mail-signature-editor.c:389
 #, fuzzy
 msgid "Edit signature"
 msgstr "Bewaar handtekening"
 
-#: mail/mail-signature-editor.c:366
+#: mail/mail-signature-editor.c:429
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "Bestand met _HTML-ondertekening:"
 
-#: mail/mail-signature-editor.c:369 my-evolution/e-summary-preferences.c:622
+#: mail/mail-signature-editor.c:432 my-evolution/e-summary-preferences.c:625
 msgid "Name:"
 msgstr "Naam:"
 
-#: mail/mail-tools.c:267
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Doorgestuurd bericht - %s"
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "Doorgestuurd bericht"
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "Doorgestuurd Bericht"
 
@@ -13906,7 +13825,7 @@ msgstr ""
 "    '%s'\n"
 "En zijn aangepast."
 
-#: mail/mail-vfolder.c:777 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "VMappen"
 
@@ -13914,25 +13833,25 @@ msgstr "VMappen"
 msgid "vFolders"
 msgstr "vMappen"
 
-#: mail/mail-vfolder.c:875
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Bewerk VMap"
 
-#: mail/mail-vfolder.c:893
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 "Poging tot aanpassen van vMap '%s' gedetecteerd terwijl deze niet bestaat."
 
-#: mail/mail-vfolder.c:946
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Nieuwe VMap"
 
-#: mail/message-browser.c:219
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(geen onderwerp)"
 
-#: mail/message-browser.c:221
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Bericht"
@@ -13973,31 +13892,31 @@ msgstr "Hoog"
 msgid "Highest"
 msgstr "Hoogste"
 
-#: 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 "Vandaag %l:%M %p"
 
-#: mail/message-list.c:1092
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Gisteren %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:2602
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "Bezig met genereren van berichtenlijst"
 
@@ -14102,12 +14021,12 @@ msgstr "Verloopdatum"
 msgid "_Flag:"
 msgstr "Bestandsnaam:"
 
-#: mail/subscribe-dialog.c:232
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Bezig met scannen van mappen onder %s op \"%s\""
 
-#: mail/subscribe-dialog.c:234
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Bezig met scannen van root-level mappen op \"%s\""
@@ -14122,29 +14041,25 @@ msgstr "Bezig met aanmelden bij map \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Bezig met afmelden van map \"%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 "Map"
 
-#: mail/subscribe-dialog.c:1427
+#: mail/subscribe-dialog.c:1389
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Opslaan in _map..."
 
-#: mail/subscribe-dialog.c:1549
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Geen server geselecteerd"
 
-#: mail/subscribe-dialog.c:1624
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Selecteer een server"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "All folders"
-msgstr "Alle mappen"
-
-#: 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
@@ -14153,53 +14068,49 @@ msgstr "Alle mappen"
 msgid "Close"
 msgstr "Sluiten"
 
-#: mail/subscribe-dialog.glade.h:6
-#, fuzzy
-msgid "Display Options"
-msgstr "Weergave-instellingen"
-
-#: mail/subscribe-dialog.glade.h:7
-msgid "Folders whose names begin with:"
-msgstr "Mappen waarvan de namen beginnen met:"
-
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:4
 msgid "Manage Subscriptions"
 msgstr "Beheer Postbusabonnementen..."
 
-#: 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 "Lijst Verversen"
 
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:6
 #, fuzzy
 msgid "S_elect server: "
 msgstr "Selecteer een service"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "Abonneren"
 
-#: mail/subscribe-dialog.glade.h:12
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "Afmelden"
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 #, fuzzy
-msgid "Configuration control for the Evolution Summary."
+msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Mappen met de Evolution Samenvatting"
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 #, fuzzy
-msgid "Configure the appearance of the Evolution Summary here"
-msgstr "Mappen met de Evolution Samenvatting"
+msgid "Evolution Summary"
+msgstr "Evolution bericht-opsteller."
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
 #, fuzzy
-msgid "Evolution Summary component."
+msgid "Evolution Summary component"
 msgstr "Evolution bericht-opsteller."
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
 #, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Fabriek voor de Evolution takencomponent"
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
+#, fuzzy
 msgid "Summary Preferences"
 msgstr "Samenvatting Instellingen"
 
@@ -23995,32 +23906,33 @@ msgstr "Zurich"
 msgid "Folder containing the Evolution Summary"
 msgstr "Mappen met de Evolution Samenvatting"
 
-#: my-evolution/e-summary-calendar.c:377 my-evolution/e-summary-calendar.c:397
+#: my-evolution/e-summary-calendar.c:380
 msgid "Appointments"
 msgstr "Afspraken"
 
-#: my-evolution/e-summary-calendar.c:378
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
 msgstr "Geen afspraken"
 
-#: 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 "Geen omschrijving"
 
-#: my-evolution/e-summary-mail.c:156
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "Samenvatting Post"
 
-#: 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 Mappen"
 
@@ -24032,19 +23944,19 @@ msgstr "Dictionary.com Woord van de Dag"
 msgid "Quotes of the Day"
 msgstr "Quotes van de Dag"
 
-#: my-evolution/e-summary-preferences.c:612
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr "Voeg een nieuwsbron toe"
 
-#: 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 "Geef the URL van de nieuwsbron die u wilt toevoegen"
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr "Fout bij downloaden van RDF"
 
-#: my-evolution/e-summary-rdf.c:447
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr "Nieuws Bron"
 
@@ -24064,11 +23976,11 @@ msgstr "_Toevoegen"
 msgid "Shown"
 msgstr "Sneeuwval"
 
-#: my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "Geen taken"
 
-#: my-evolution/e-summary-tasks.c:371
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(Geen Omschrijving)"
 
@@ -24076,11 +23988,11 @@ msgstr "(Geen Omschrijving)"
 msgid "My Weather"
 msgstr "Mijn Weer"
 
-#: my-evolution/e-summary-weather.c:269
+#: my-evolution/e-summary-weather.c:262
 msgid "There was an error downloading data for"
 msgstr "Er trad een fout op bij het downloaden van gegevens voor"
 
-#: my-evolution/e-summary-weather.c:490
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr "Weer"
 
@@ -24093,23 +24005,23 @@ msgstr "Weer"
 #. 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 "EHAM:EHEH:EHGG:EHLW:EHBK:EHRD:EHSB:EBAW:EBBR:EBLG:EBOS"
 
-#: 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 "Even geduld a.u.b..."
 
-#: 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 "Samenvatting Afdrukken"
 
-#: my-evolution/e-summary.c:624
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Afdrukken van Samenvatting mislukt"
 
@@ -25382,22 +25294,23 @@ msgid "_Weather"
 msgstr "_Weer"
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
-#, fuzzy
-msgid "Configuration control for Evolution folder settings."
-msgstr "Fabriek voor de Evolution opsteller."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Configure special folders and offline folder behavior here"
 msgstr ""
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "De Evolution shell."
+
 #: shell/GNOME_Evolution_Shell.server.in.in.h:3
 #, fuzzy
-msgid "Folder Settings"
-msgstr "Mail-instellingen"
+msgid "Evolution folder settings configuration control"
+msgstr "Fabriek voor de Evolution takencomponent"
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "The Evolution shell."
-msgstr "De Evolution shell."
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Mail-instellingen"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25416,7 +25329,7 @@ msgstr ""
 "Kan map niet overzetten:\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
 #, fuzzy, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "Openen in %s..."
@@ -25430,8 +25343,8 @@ msgstr "Als Verzonden Map"
 msgid "Drafts"
 msgstr "Klad"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:465
-#: shell/e-shell-view.c:469 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 "Inbox"
 
@@ -25443,11 +25356,11 @@ msgstr "Outbox"
 msgid "Sent"
 msgstr "Verzonden"
 
-#: shell/e-setup.c:147
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "Kon bestanden niet correct actualiseren"
 
-#: shell/e-setup.c:168
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -25458,7 +25371,7 @@ msgstr ""
 "%s\n"
 "Fout: %s"
 
-#: shell/e-setup.c:179
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -25470,39 +25383,6 @@ msgstr ""
 #: shell/e-setup.c:244
 #, c-format
 msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Evolution kon de directory niet aanmaken\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 ""
-"De map %s\n"
-"heeft niet de juiste rechten. Maak het alstublieft\n"
-"leesbaar en uitvoerbaar en herstart Evolution."
-
-#: 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 ""
-"Bestand %s\n"
-"moet verwijderd worden om Evolution correct te laten werken.\n"
-"Verwijder dit bestand en herstart Evolution."
-
-#: 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."
@@ -25511,7 +25391,7 @@ msgstr ""
 "Verplaats het om de installatie van de Evolution\n"
 "bestanden af te maken."
 
-#: shell/e-setup.c:300
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25551,49 +25431,49 @@ msgstr "Selecteer Map"
 msgid "Autocompletion Folders"
 msgstr "Voltooiingsdatum"
 
-#: shell/e-shell-folder-commands.c:141
+#: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
 msgstr "Kan map %s niet controleren: %s"
 
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
 #, fuzzy, c-format
 msgid "Cannot move folder: %s"
 msgstr ""
 "Kan map niet hernoemen:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:189
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr "Kan map niet over zichzelf zetten."
 
-#: shell/e-shell-folder-commands.c:191
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr "Kan een map niet over zichzelf kopiëren."
 
-#: 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 een map niet verplaatsen naar zijn eigen kinderen."
 
-#: 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 "specificeer een map om map \"%s\" naar te kopieeren:"
 
-#: shell/e-shell-folder-commands.c:324
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr "Kopieer naar Map"
 
-#: 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 "Specificeer een map om map \"%s\" naartoe te verplaatsen:"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "Verplaats naar Map"
 
-#: shell/e-shell-folder-commands.c:392
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25602,19 +25482,19 @@ msgstr ""
 "Kon map niet verwijderen:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:406
+#: shell/e-shell-folder-commands.c:405
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr ""
 "Kon map niet verwijderen:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:413
+#: shell/e-shell-folder-commands.c:412
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Verwijder \"%s\""
 
-#: shell/e-shell-folder-commands.c:486
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25623,26 +25503,26 @@ msgstr ""
 "Kan map niet hernoemen:\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 "Hernoem de \"%s\" map naar:"
 
-#: shell/e-shell-folder-commands.c:541
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr "Hernoemen map"
 
-#: 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 "De opgegeven mapnaam is niet geldig: %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 ""
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:586
 #, fuzzy, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25651,7 +25531,7 @@ msgstr ""
 "Kan map niet hernoemen:\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"
@@ -25660,12 +25540,12 @@ msgstr ""
 "Kan de gespecificeerde map niet aanmaken:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:307
+#: shell/e-shell-folder-creation-dialog.c:308
 #, fuzzy
 msgid "Create New Folder"
 msgstr "_Nieuwe map aanmaken..."
 
-#: 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 "(Naamloos)"
 
@@ -25687,7 +25567,7 @@ msgstr ""
 "U kunt \"Automatisch\" kiezen als u het niet weet; Evolution probeert het "
 "dan voor u uit te zoeken."
 
-#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:687
+#: 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 "Kies de informatie die u zou willen importeren:"
 
@@ -25700,7 +25580,7 @@ msgstr ""
 "Importeren %s\n"
 "Bezig met importeren item %d."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:351
 #, fuzzy
 msgid "Select importer"
 msgstr "Selecteer Map"
@@ -25711,7 +25591,7 @@ msgid "File %s does not exist"
 msgstr "Map %s bestaat niet"
 
 #: 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 Fout"
 
@@ -25742,12 +25622,12 @@ msgstr ""
 msgid "Error starting %s"
 msgstr "Fout bij laden %s"
 
-#: shell/e-shell-importer.c:556
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Fout bij laden %s"
 
-#: shell/e-shell-importer.c:573
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25756,31 +25636,31 @@ msgstr ""
 "Importeren %s\n"
 "Bezig met importeren item 1."
 
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Bestandsnaam:"
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Selecteer een bestand"
 
-#: shell/e-shell-importer.c:690
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Bestandstype:"
 
-#: shell/e-shell-importer.c:715
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "Importeer informatie en instellingen van oudere programma's"
 
-#: shell/e-shell-importer.c:719
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "Importeer een enkel bestand"
 
-#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:516
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25788,28 +25668,28 @@ msgstr ""
 "Even geduld...\n"
 "Bestaande instellingen worden nagezocht"
 
-#: shell/e-shell-importer.c:788
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Intelligent Importeren wordt gestart"
 
-#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:642
+#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "Van %s:"
 
-#: shell/e-shell-importer.c:1082
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Selecteer Map"
 
-#: shell/e-shell-importer.c:1083
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Selecteer een doelmap voor deze belangrijke data"
 
-#: 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 "Importeer"
 
-#: shell/e-shell-offline-handler.c:588
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "Verbindeingen ophangen...."
 
@@ -25833,32 +25713,40 @@ msgstr "Bezig met synchroniseren map"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:345
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "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 "Selecteer een server"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Bezig met openen map %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:346
+#: shell/e-shell-shared-folder-picker-dialog.c:380
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Bezig met openen map %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:351
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Openen in %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:431
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Kon de naam van de map niet wijzigen: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:484
+#: shell/e-shell-shared-folder-picker-dialog.c:518
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25880,10 +25768,16 @@ msgid "Folder name cannot contain the Return character."
 msgstr "Mapnaam kan geen enter-teken bevatten."
 
 #: shell/e-shell-utils.c:129
-msgid "Folder name cannot contain slashes."
-msgstr "Mapnaam mag geen slashes bevatten."
+#, fuzzy
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "Mapnaam kan geen enter-teken bevatten."
 
 #: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "Mapnaam kan geen enter-teken bevatten."
+
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' en '..' zijn gereserveerde mapnamen."
 
@@ -25926,49 +25820,49 @@ msgstr "Maak een nieuwe snelkoppeling"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Selecteer de map waar de snelkoppeling naar moet wijzen:"
 
-#: shell/e-shell-view-menu.c:776
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr "Werk Online"
 
-#: 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 "Werk Offline"
 
-#: 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 "Werk zonder netwerk"
 
-#: shell/e-shell-view.c:232
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "(Geen map weergegeven)"
 
-#: shell/e-shell-view.c:1996
+#: shell/e-shell-view.c:2045
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1998
+#: shell/e-shell-view.c:2047
 msgid "(None)"
 msgstr "(Geen)"
 
-#: shell/e-shell-view.c:2041
+#: shell/e-shell-view.c:2091
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution is nu verbonden met het netwerk.  Klik op deze knop om zonder "
 "netwerkverbinding te werken"
 
-#: shell/e-shell-view.c:2048
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution is in bezig offline te gaan."
 
-#: shell/e-shell-view.c:2054
+#: shell/e-shell-view.c:2104
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution is nu offline. Klik op deze knop on online te gaan werken."
 
-#: shell/e-shell.c:176
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25980,12 +25874,12 @@ msgstr ""
 "De fout van het activeringssysteem is:\n"
 "%s"
 
-#: shell/e-shell.c:756
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan de lokale opslag niet opzetten -- %s"
 
-#: shell/e-shell.c:1829
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25997,19 +25891,19 @@ msgstr ""
 "gestopt. U zult Evolution opnieuw moeten starten om die informatie\n"
 "weer te kunnen benaderen."
 
-#: shell/e-shell.c:2094
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Ongeldige argumenten"
 
-#: shell/e-shell.c:2096
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "Kan niet registreren op OAF"
 
-#: shell/e-shell.c:2098
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "Configuratiedatabase niet gevonden"
 
-#: shell/e-shell.c:2100 shell/e-storage.c:576
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Generieke fout"
 
@@ -26143,59 +26037,59 @@ msgstr "Snelkoppelingen"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:574
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "Geen fout"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr "Een folder met die naam bestaat reeds"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr "Het gespecificeerde foldertype is niet geldig"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "I/O fout"
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr "Niet genoeg ruimte vrij om de folder te maken"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr "De map is niet leeg"
 
-#: shell/e-storage.c:588
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr "De opgegeven folder is niet gevonden"
 
-#: shell/e-storage.c:590
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr "Functie niet geïmplementeerd voor deze opslag"
 
-#: shell/e-storage.c:594
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr "Operatie niet ondersteund"
 
-#: shell/e-storage.c:596
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr "Het gespecificeerde type word niet ondersteund door deze opslag"
 
-#: shell/e-storage.c:598
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr "De opgegeven folder kan niet worden veranderd of verwijderd"
 
-#: shell/e-storage.c:600
+#: shell/e-storage.c:596
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Kan de map niet verplaatsen naar een van zijn eigen kinderen"
 
-#: shell/e-storage.c:602
+#: shell/e-storage.c:598
 msgid "Cannot create a folder with that name"
 msgstr "Kan geen map met die naam maken"
 
-#: shell/e-storage.c:604
+#: shell/e-storage.c:600
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
@@ -26209,11 +26103,11 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% voltooid)"
 
-#: shell/evolution-folder-selector-button.c:101
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<klik hier om een map te selecteren>"
 
-#: shell/evolution-shell-component-utils.c:123
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -26224,7 +26118,7 @@ msgstr ""
 "\n"
 "Onbekende fout."
 
-#: shell/evolution-shell-component-utils.c:126
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -26237,7 +26131,7 @@ msgstr ""
 "De fout van het componentensysteem is:\n"
 "%s"
 
-#: shell/evolution-shell-component-utils.c:133
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -26250,63 +26144,63 @@ msgstr ""
 "De fout van het activeringssysteem is:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1164
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "CORBA fout"
 
-#: shell/evolution-shell-component.c:1166
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Onderbroken"
 
-#: shell/evolution-shell-component.c:1168
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Ongeldige argument"
 
-#: shell/evolution-shell-component.c:1170
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "Heeft al een eigenaar"
 
-#: shell/evolution-shell-component.c:1172
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Geen eigenaar"
 
-#: shell/evolution-shell-component.c:1174
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Niet gevonden"
 
-#: shell/evolution-shell-component.c:1176
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Niet ondersteund type"
 
-#: shell/evolution-shell-component.c:1178
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Niet ondersteund schema"
 
-#: shell/evolution-shell-component.c:1180
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Niet ondersteunde bewerking"
 
-#: shell/evolution-shell-component.c:1182
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Interne fout"
 
-#: shell/evolution-shell-component.c:1186
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Bestaat"
 
-#: shell/evolution-shell-component.c:1188
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "Ongeldige URI"
 
-#: shell/evolution-shell-component.c:1192
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Heeft submappen"
 
-#: shell/evolution-shell-component.c:1194
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Geen ruimte over"
 
-#: shell/evolution-shell-component.c:1196
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "Oude eigenaar is gestorven"
 
@@ -26327,10 +26221,6 @@ msgstr "Klik op OK om deze verbindingen te verbreken en offline te gaan"
 msgid "The following connections are currently active:"
 msgstr "De volgende verbindingen zijn op 't moment actief:"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "dialog1"
-msgstr ""
-
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 #, fuzzy
 msgid "C_alendar:"
@@ -26479,25 +26369,26 @@ msgstr "Dit bericht niet meer weergeven."
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan gegevens importeren van de volgende bestanden:"
 
-#: shell/main.c:109 shell/main.c:501
+#: 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 is bezig met afsluiten ..."
 
-#: shell/main.c:214
+#. 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.2.x version instead (1.2.2)\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"
@@ -26507,48 +26398,53 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:235
+#: shell/main.c:290
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution"
 
-#: shell/main.c:243
+#: shell/main.c:298
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Dit bericht niet meer weergeven."
 
-#: shell/main.c:330
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan geen toegang verkrijgen tot de Evolution shell."
 
-#: shell/main.c:339
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan de Ximian Evolution-schil niet initialiseren: %s"
 
-#: shell/main.c:471
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Splash screen niet tonen"
 
-#: shell/main.c:473
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "Beginnen in offline modus"
 
-#: shell/main.c:475
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "Beginnen in online modus"
 
-#: shell/main.c:477
+#: shell/main.c:535
+#, fuzzy
+msgid "Forcibly shut down all evolution components"
+msgstr "Fabriek voor de Evolution kalendercomponent."
+
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr "Zend de debug uitvoor van alle componenten naar een bestand"
 
-#: shell/main.c:480
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr ""
 
-#: shell/main.c:505
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26558,7 +26454,6 @@ msgstr ""
 "  Gebruik %s --help voor meer informatie.\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 "Fout bij laden standaard adresboek."
@@ -26568,14 +26463,50 @@ msgstr "Fout bij laden standaard adresboek."
 msgid "Input File"
 msgstr "Invoer Bestand"
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "Uitvoer Bestand"
-
 #: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Geen bestandsnaam opgegeven."
 
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "Bestand bijvoegen..."
+
+#: 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 "Omschrijving bevat"
+
+#: 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 "Knip de geselecteerde berichten"
+
+#. 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 "Kon de naam van de map niet wijzigen: %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 "Kopieer Contact(en) naar een Andere Map..."
@@ -26664,7 +26595,7 @@ msgstr "Huidige contact weergeven"
 #: 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 "_Acties"
 
@@ -26782,7 +26713,7 @@ msgid "Print this item"
 msgstr "Item afdrukken"
 
 #: 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 "Opslaan"
 
@@ -26809,7 +26740,7 @@ msgstr "Bewaar dit item op de harde schijf"
 #: 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 "_Bestand"
 
@@ -27065,7 +26996,7 @@ msgstr "Toon Discussiebomen"
 msgid "_Expunge"
 msgstr "_Wissen"
 
-#: 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 "_Map"
 
@@ -27487,7 +27418,7 @@ msgstr "Ge_citeerd"
 msgid "_Resend..."
 msgstr "He_rnoemen..."
 
-#: 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 "_Gereedschap"
 
@@ -27502,12 +27433,12 @@ msgstr "Dit venster sluiten"
 #: 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 "_Sluiten"
 
 #: 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 "Weerga_ve"
 
@@ -27689,7 +27620,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Bewaar dit item en sluit het dialoogvenster"
 
-#: 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 "_Help"
 
@@ -27874,128 +27805,118 @@ msgstr "_Pilot Instellingen..."
 
 #: ui/evolution.xml.h:27
 #, fuzzy
-msgid "Pilot Con_duit Settings..."
-msgstr "_Pilot Instellingen..."
-
-#: ui/evolution.xml.h:28
-#, fuzzy
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "_Nieuwe map aanmaken..."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "Versturen en Ontvangen"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Post in de wachtrij versturen en nieuwe post ophalen"
 
-#: ui/evolution.xml.h:31
-#, fuzzy
-msgid "Set up Pilot conduit configuration"
-msgstr "Postconfiguratie"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Postconfiguratie"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr "Toon informatie over Ximian Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Bug-Report Insturen"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "_Bug Report Insturen"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Report insturen met Bug Buddy."
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "Verander"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "Toont de mappenbalk"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Toont de snelkoppelingenbalk"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr "Schakel offline werken aan of uit"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "Toon de geselecteerde map"
 
-#: 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 "_Over Ximian Evolution..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "Kopiëren..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Mappenbalk"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Map"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "_Ga naar Map..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr "_Importeer..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "Verplaatsen..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "_Nieuw"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "_Nieuwe Map"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Remove Other User's Folder"
 msgstr "_Nieuwe map aanmaken..."
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "He_rnoemen..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "_Versturen en Ontvangen"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "_Snelkoppelingsbalk"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Snelkoppeling"
@@ -28081,9 +28002,8 @@ msgstr "Op Categorie:"
 msgid "_Tasks"
 msgstr "_Taak"
 
-#. 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 "GMT"
 
@@ -28128,12 +28048,12 @@ msgstr "Defineer Bekijkmogelijkheid"
 
 #. 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 "MDWDVZZ"
 
 #. 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"
 
@@ -28235,11 +28155,12 @@ msgstr "Karakterencodering"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:190
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr "Zoekopdracht-editor"
 
-#: widgets/misc/e-filter-bar.c:212
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "Bewaar Zoekopdracht"
 
@@ -28274,46 +28195,436 @@ msgstr "Vraag"
 msgid "Message"
 msgstr "Bericht"
 
-#: widgets/misc/e-search-bar.c:524
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "_Zoeken"
+
+#: widgets/misc/e-search-bar.c:537
 #, fuzzy
 msgid "_Find Now"
 msgstr "Zoek Nu"
 
-#: widgets/misc/e-search-bar.c:525
+#: widgets/misc/e-search-bar.c:538
 #, fuzzy
 msgid "_Clear"
 msgstr "Wissen"
 
-#: widgets/misc/e-search-bar.c:826
+#: widgets/misc/e-search-bar.c:833
 msgid "Item ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:833
+#: widgets/misc/e-search-bar.c:840
 msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:840
+#: widgets/misc/e-search-bar.c:847
 #, fuzzy
 msgid "Text"
 msgstr "Test"
 
-#: widgets/misc/e-search-bar.c:918
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "Wissen"
 
-#: widgets/misc/e-search-bar.c:920
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Zoek 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 "De Persoonlijke Adresboekserver"
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Evolution adresboek minikaartbekijker"
 
 #: 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 "De Persoonlijke Kalenderserver; kalender fabriek"
+#, fuzzy
+msgid "Evolution Calendar local file backend"
+msgstr "Evolution kalender-samenvatting-component"
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Evolution adresboek minikaartbekijker"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Fabriek om LDIF bestanden te importeren in Evolution."
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Importeert LDIF bestanden in Evolution."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Fabriek om vCard bestanden te importeren in Evolution."
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Importeert vCard bestanden in Evolution."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "Een Bonobo control dat een adresboek weergeeft."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Een Bonobo control dat een adresboek weergeeft."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Een voorbeeld Bonobo control dat een adresboek weergeeft."
+
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr "Configuratie control voor  de Evolution adresboek opslag."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Control dat een Evolution minikaart adresboek weergeeft."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Component voor het afhandelen van contacten."
+
+#~ msgid "Factory for the controls exported by the Evolution Addressbook"
+#~ msgstr ""
+#~ "Fabriek voor de controls die door het Evolution adresboek worden "
+#~ "geëxporteerd"
+
+#~ msgid "1234"
+#~ msgstr "1234"
+
+#~ msgid "380"
+#~ msgstr "380"
+
+#~ msgid "666"
+#~ msgstr "666"
+
+#~ msgid "<- _Remove"
+#~ msgstr "<- _Verwijderen"
+
+#~ msgid "<< Fewer Options"
+#~ msgstr "<< Minder opties"
+
+#~ msgid "DN Customization"
+#~ msgstr "DN Aanpassen"
+
+#~ msgid "Mappings"
+#~ msgstr "Koppelingen"
+
+#~ msgid "Objectclasses"
+#~ msgstr "Objectclassen"
+
+#~ msgid "Objectclasses Used in Evolution:"
+#~ msgstr "Objectklassen gebruikt in Evolution:"
+
+#~ msgid "Objectclasses Used on Server:"
+#~ msgstr "Objectklassen gebruikt op de server:"
+
+#~ msgid ""
+#~ "Please select an Evolution attribute and an\n"
+#~ "LDAP attribute to associate with it."
+#~ msgstr ""
+#~ "Kies een Evolution attribuut en een LDAP \n"
+#~ "attribuut om het mee te associeëren."
+
+#~ msgid "R_estore Defaults"
+#~ msgstr "Zet op _standaardwaarden"
+
+#~ msgid "Re_store Defaults"
+#~ msgstr "Zet op _standaardwaarden"
+
+#~ msgid "_Add ->"
+#~ msgstr "_Toevoegen ->"
+
+#~ msgid "_Add Mapping"
+#~ msgstr "Koppeling _Toevoegen"
+
+#, fuzzy
+#~ msgid "_Add to DN"
+#~ msgstr "Actie Toevoegen"
+
+#~ msgid "_Always"
+#~ msgstr "_Altijd"
+
+#~ msgid "_Delete Mapping"
+#~ msgstr "_Verwijder koppeling"
+
+#, fuzzy
+#~ msgid "_Distinguished Name (DN):"
+#~ msgstr "Distinguished name (DN)"
+
+#~ msgid "_Don't use SSL/TLS"
+#~ msgstr "Geen SSL/TLS gebruiker"
+
+#~ msgid "_Edit Mapping"
+#~ msgstr "_Koppeling bewerken"
+
+#~ msgid "_Evolution attribute:"
+#~ msgstr "_Evolution attribuut:"
+
+#~ msgid "_If necessary "
+#~ msgstr "_Indien noodzakelijk"
+
+#~ msgid "_LDAP attribute:"
+#~ msgstr "_LDAP attribuut"
+
+#~ msgid "_LDAP attributes:"
+#~ msgstr "_LDAP attributen"
+
+#~ msgid "_More Options >>"
+#~ msgstr "_Meer opties >>"
+
+#~ msgid "_Restore Defaults"
+#~ msgstr "_Standaard instellingen"
+
+#, fuzzy
+#~ msgid "account-druid"
+#~ msgstr "Account %d"
+
+#~ msgid "account-editor"
+#~ msgstr "Contactlijstbewerker"
+
+#~ msgid "dn-customization-tab"
+#~ msgstr "dn-aanpassings-tab"
+
+#~ msgid "mappings-tab"
+#~ msgstr "koppelingen-tab"
+
+#~ msgid "objectclasses-tab"
+#~ msgstr "objectclassen tab"
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr "Factory voor de naamselectie-interface van het Adresboek"
+
+#~ msgid "Edit Contact List"
+#~ msgstr "Contactenlijst bewerken"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Lijst van andere contacten"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d niet weergegeven)"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Een Bonobo-control die een takenlijst toont."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Een voorbeeld Bonobo-control dat een kalender toont."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Fabriek voor de Evolution opsteller."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Evolution component voor het afhandelen van de kalender."
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Calendar objects"
+#~ msgstr "Fabriek voor het Evolution-samenvattingscomponent."
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr ""
+#~ "Fabriek voor het centraliseren van kalendercomponent "
+#~ "bewerkingsdialoogvenster"
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Alarmnotificatie-dienst"
+
+#, fuzzy
+#~ msgid ""
+#~ "Evolution does not yet support email notification for reminders.  You "
+#~ "will not be able to edit the options for this reminder."
+#~ msgstr ""
+#~ "Dit is een email herinnering, maar Evolution kan nog geen email "
+#~ "herininneringen sturen. U zal de instellingen niet kunnen aanpassen voor "
+#~ "deze herinnering."
+
+#~ msgid ""
+#~ "Evolution has taken the tasks that were in your calendar folder and "
+#~ "automatically migrated them to the new tasks folder."
+#~ msgstr ""
+#~ "Evolution heeft de taken in uw kalendermap automatisch verplaatst naar de "
+#~ "nieuwe takenmap."
+
+#~ 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 heeft getracht de taken in uw kalendermap te verplaatsen naar "
+#~ "de nieuwe takenmap.\n"
+#~ "Enkele van de taken konden niet verplaatst worden, dus dit proces kan de "
+#~ "toekomst nogmaals geprobeerd worden."
+
+#~ msgid ""
+#~ "Could not open `%s'; no items from the calendar folder will be migrated "
+#~ "to the tasks folder."
+#~ msgstr ""
+#~ "Kon '%s' niet openen; er worden geen taken uit uw kalendermap verplaatst "
+#~ "naar de takenmap."
+
+#~ msgid ""
+#~ "The method required to load `%s' is not supported; no items from the "
+#~ "calendar folder will be migrated to the tasks folder."
+#~ msgstr ""
+#~ "De methode die nodig is om '%s' te laden, wordt niet ondersteund; er "
+#~ "wordengeen taken verplaatst van de kalendermap naar de takenmap."
+
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Fabriek om iCalendar bestanden te importeren in Evolution"
+
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Importeert iCalendat bestanden in Evolution"
+
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Importeert vCalendar bestanden in Evolution"
+
+#, fuzzy
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr ""
+#~ "Kan bericht %s uit folder %s niet verkrijgen\n"
+#~ "  %s"
+
+#, fuzzy
+#~ msgid "Can't call getFolderAtPath on storage: %s"
+#~ msgstr "Kon niet verbinden met de opslag: %s"
+
+#~ msgid ""
+#~ "Could not create composer window, because you have not yet\n"
+#~ "configured any identities in the mail component."
+#~ msgstr ""
+#~ "Aanmaken van het dialoogvenster voor het opstellen van een nieuw bericht "
+#~ "is mislukt, want u heeft nog geen identiteitsgegevens geconfigureerd in "
+#~ "het mail-component."
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "Kan de berichtenopsteller van Evolution niet initialiseren."
+
+#~ msgid "minute"
+#~ msgstr "minuut"
+
+#~ msgid "hour"
+#~ msgstr "uur"
+
+#~ msgid "week"
+#~ msgstr "week"
+
+#~ msgid "year"
+#~ msgstr "jaar"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Fabriek voor de Evolution takencomponent"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Fabriek voor de Evolution takencomponent"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Fabriek voor de Evolution opsteller."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Fabriek voor de Evolution opsteller."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Evolution-component voor het afhandelen van post"
+
+#, fuzzy
+#~ msgid "Factory for the controls exported by the Evolution Mailer"
+#~ msgstr ""
+#~ "Fabriek voor de controls die door het Evolution adresboek worden "
+#~ "geëxporteerd"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "Kan de Mail-component van Evolution niet initialiseren."
+
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "Kan de mailconfiguratie-component van Evolution niet initialiseren."
+
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Kan de Map-info-component van Evolution niet initialiseren."
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Fabriek voor het importeren van mbox bestanden naar Evolution"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importeert mbox bestanden naar Evolution"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr ""
+#~ "Fabriek voor het importeren van Outlook Express 4 berichten naar Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importeert Outlook Express 4 bestanden naar Evolution"
+
+#, fuzzy
+#~ msgid "Unnamed [script]"
+#~ msgstr "Lijst van onbenoemden"
+
+#, fuzzy
+#~ msgid "_Variable-width:"
+#~ msgstr "Variabel"
+
+#~ msgid "All folders"
+#~ msgstr "Alle mappen"
+
+#, fuzzy
+#~ msgid "Display Options"
+#~ msgstr "Weergave-instellingen"
+
+#~ msgid "Folders whose names begin with:"
+#~ msgstr "Mappen waarvan de namen beginnen met:"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Mappen met de Evolution Samenvatting"
+
+#, fuzzy
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Fabriek voor de Evolution opsteller."
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Evolution kon de directory niet aanmaken\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 ""
+#~ "De map %s\n"
+#~ "heeft niet de juiste rechten. Maak het alstublieft\n"
+#~ "leesbaar en uitvoerbaar en herstart Evolution."
+
+#~ msgid ""
+#~ "File %s\n"
+#~ "should be removed to allow Evolution to work correctly.\n"
+#~ "Please remove this file and restart Evolution."
+#~ msgstr ""
+#~ "Bestand %s\n"
+#~ "moet verwijderd worden om Evolution correct te laten werken.\n"
+#~ "Verwijder dit bestand en herstart Evolution."
+
+#~ msgid "Folder name cannot contain slashes."
+#~ msgstr "Mapnaam mag geen slashes bevatten."
+
+#~ msgid "Output File"
+#~ msgstr "Uitvoer Bestand"
+
+#, fuzzy
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "_Pilot Instellingen..."
+
+#, fuzzy
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "Postconfiguratie"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "De Persoonlijke Adresboekserver"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "De Persoonlijke Kalenderserver; kalender fabriek"
 
 #~ msgid ""
 #~ "Could not start the Evolution Mailer Assistant interface\n"
@@ -28463,9 +28774,6 @@ msgstr "De Persoonlijke Kalenderserver; kalender fabriek"
 #~ msgid "Factory for the Addressbook's address displayer"
 #~ msgstr "Fabriek voor de naam selectie interface van het Adresboek"
 
-#~ msgid "Factory for the Addressbook's address popup"
-#~ msgstr "Fabriek voor de naam selectie interface van het Adresboek"
-
 #~ msgid "Factory for the sample Addressbook control"
 #~ msgstr "Fabriek voor het voorbeeld Adresboekcontrol"
 
@@ -28507,10 +28815,6 @@ msgstr "De Persoonlijke Kalenderserver; kalender fabriek"
 #~ msgid "Add Signature"
 #~ msgstr "Bewaar handtekening"
 
-#, fuzzy
-#~ msgid "Factory for Evolution Summary's configuration control."
-#~ msgstr "Fabriek voor de Evolution takencomponent"
-
 #~ msgid "Marquette"
 #~ msgstr "Marquette"
 
@@ -28566,9 +28870,6 @@ msgstr "De Persoonlijke Kalenderserver; kalender fabriek"
 #~ msgid "Copy selected messages"
 #~ msgstr "Kopieer geselecteerde berichten"
 
-#~ msgid "Cut selected messages"
-#~ msgstr "Knip de geselecteerde berichten"
-
 #, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "Verwijderen"
@@ -28610,9 +28911,6 @@ msgstr "De Persoonlijke Kalenderserver; kalender fabriek"
 #~ "Importeerfunctie niet klaar.\n"
 #~ "Wacht 5 seconden en probeer het opnieuw."
 
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Evolution Import Assistent"
-
 #, fuzzy
 #~ msgid "_Preferences..."
 #~ msgstr "Samenvatting Instellingen"
@@ -28767,9 +29065,6 @@ msgstr "De Persoonlijke Kalenderserver; kalender fabriek"
 #~ msgid "Command"
 #~ msgstr "Bedrijf"
 
-#~ msgid "Evolution News Editor"
-#~ msgstr "Evolution Nieuwsbeheer"
-
 #~ msgid "Are you sure you want to delete this news account?"
 #~ msgstr "Weet u zeker dat u dit nieuws-account wilt verwijderen?"
 
@@ -28847,9 +29142,6 @@ msgstr "De Persoonlijke Kalenderserver; kalender fabriek"
 #~ "Ongeldige opaque trace-informatie:\n"
 #~ "%s"
 
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr "Evolution kalender-samenvatting-component"
-
 #~ msgid "Factory for the Calendar Summary component."
 #~ msgstr "Fabriek voor het Kalender Samenvattings component."
 
@@ -29044,9 +29336,6 @@ msgstr "De Persoonlijke Kalenderserver; kalender fabriek"
 #~ msgid "Are you sure you want to remove the \"%s\" folder?"
 #~ msgstr "Weet u zeker dat u de \"%s\" map wilt verwijderen?"
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "Bewerk Adresboek"
-
 #~ msgid "A_uthenticate with server using:"
 #~ msgstr "Aanmelding bij server middels:"
 
@@ -29426,9 +29715,6 @@ msgstr "De Persoonlijke Kalenderserver; kalender fabriek"
 #~ msgid "Mail Summary"
 #~ msgstr "Berichten Samenvatting"
 
-#~ msgid "Factory for the Evolution notes component."
-#~ msgstr "Fabriek voor de Evolution kalendercomponent."
-
 #~ msgid "Factory for the Notes control"
 #~ msgstr "Fabriek voor Notitiebeheer."
 
@@ -29801,10 +30087,6 @@ msgstr "De Persoonlijke Kalenderserver; kalender fabriek"
 #~ msgstr "Ve_rwijderen"
 
 #, fuzzy
-#~ msgid "Al_l stations:"
-#~ msgstr "College Station"
-
-#, fuzzy
 #~ msgid "All _folders:"
 #~ msgstr "Alle mappen"
 
diff --git a/po/nn.po b/po/nn.po
index a18b5a166c..885add5480 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-1.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-30 06:10+0100\n"
 "Last-Translator: Roy-Magne Mo <rmo@sunnmore.net>\n"
 "Language-Team: \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 "Fabrikk for � importere LDIF-filer inn i Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "KDeelop-installering"
+
+#: 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 "Importerar LDIF-filer inn i Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Kan ikkje initialisera lokale variablar"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Fabrikk for � importere VCard-filer inn i Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Kan ikkje initialisera lokale variablar"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importerar VCard-filer inn i 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 "Arkiver som"
 
 #: 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 "Namn"
 
 #: 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 "Prim�r"
 
@@ -56,16 +68,17 @@ msgstr "Prim"
 
 #: 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 "Firma"
 
@@ -75,12 +88,12 @@ msgid "Bus"
 msgstr "Frm"
 
 #: 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 "Ring tilbake"
 
 #: 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"
 
@@ -91,12 +104,13 @@ msgstr "Frm"
 #: 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 "Heim"
 
 #: 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 "Organisasjon"
@@ -107,18 +121,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 "Mobil"
 
 #: 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 "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 "Firma-fax"
@@ -128,13 +142,13 @@ msgid "Bus Fax"
 msgstr "Frm-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 "Heime-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 "Firma 2"
 
@@ -143,43 +157,43 @@ msgid "Bus 2"
 msgstr "Frm 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 "Heim 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 "Anna"
 
 #: 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 "Alternativ 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 "Persons�kjar"
 
 #: 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"
@@ -190,15 +204,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"
@@ -222,6 +236,7 @@ msgid "Dep"
 msgstr "Avd"
 
 #: 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"
@@ -231,6 +246,7 @@ msgid "Off"
 msgstr "Ktr"
 
 #: 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 "Tittel"
@@ -245,6 +261,7 @@ msgid "Prof"
 msgstr "Yrke"
 
 #: 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 "Sjef"
@@ -258,6 +275,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: 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 "Kallenamn"
@@ -267,16 +285,19 @@ msgid "Nick"
 msgstr "Kallenamn"
 
 #: 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 "Ektefelle"
 
 #: 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 "Merknad"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr "Kalendar URI"
 
@@ -294,302 +315,394 @@ 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 "Kalender"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
 msgid "Anniversary"
 msgstr "Merkedag"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Mrkdag"
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "F�dselsdag"
 
-#: 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 "Kategoriar"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Etternamn"
 
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:335
+#, fuzzy
+msgid "ECard"
+msgstr "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 "Kontaktliste utan namn"
 
-#: addressbook/backend/ebook/e-card.c:2683
-msgid "Multiple VCards"
-msgstr "Fleire VKort"
+#: 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 "Fullt namn"
 
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
-msgstr "VKort for %s"
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "_Adresse:"
+
+#: addressbook/backend/ebook/e-card.c:1328
+#, fuzzy
+msgid "Address Label"
+msgstr "_Adressekort"
+
+#: addressbook/backend/ebook/e-card.c:1335
+#, fuzzy
+msgid "Phone"
+msgstr "Ponce"
+
+#: addressbook/backend/ebook/e-card.c:1349
+#, fuzzy
+msgid "Birth date"
+msgstr "F�dselsdag"
+
+#: 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 "Organisasjon"
+
+#: 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:1431 mail/mail-format.c:935
+#, fuzzy
+msgid "Mailer"
+msgstr "E-post"
+
+#: addressbook/backend/ebook/e-card.c:1445
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "_Ledig/Oppteken 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 "Slett kontakt?"
+
+#: addressbook/backend/ebook/e-card.c:1480
+#, fuzzy
+msgid "Category List"
+msgstr "Kategori er"
+
+#: 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 "Alternativ adresse"
+
+#: 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 "Lim inn"
+
+#: addressbook/backend/ebook/e-card.c:1540
+#, fuzzy
+msgid "Use Score"
+msgstr "Poengsum"
 
-#: 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 "Kunne ikkje initialisere 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 "S�kjer ..."
 
-#: addressbook/backend/pas/pas-backend-file.c:366
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr "Lastar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:687
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+#, fuzzy
+msgid "Using Distinguished Name (DN)"
+msgstr "Liste_namn:"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "E-postadresse:"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 msgid "Reconnecting to LDAP server..."
 msgstr "Koplar til LDAP-tenar att ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1230
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr "Legg til kort til LDAP-tenar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1336
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr "Fjernar kort fr� LDAP-tenar ..."
 
-#: 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 "Endrar kort fr� LDAP-tenar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2889
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "Mottek LDAP-s�keresultat ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2998
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 msgid "Error performing search"
 msgstr "Feil ved s�k"
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Standard synkroniseringsaddresse:"
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Mark�r kunne ikkje lastast\n"
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EBook vart ikkje lasta\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 "Klarte ikkje � starte wombat-tenar."
 
-#: 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 "Klarte ikkje � starte 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 "Klarte ikkje � lese addresseblokka i programmet til piloten"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Ein Bonobo-kontroll for ein addresse sprett-opp."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Ein bonobo-kontroll for vising av addresser."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Ein eksempel Bonobo-kotroll som viser ein addressebok."
-
-#: 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 "Kontroll som viser eit Evolution addressebok minikort."
-
-#: 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 "Katalogtenarar"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolutions addressebok minikortlesar"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Rediger adressebok"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Evolutionkomponent for handsaming av kontakter."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Gpilotd adressekomponent"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Fabrikk for Minikortkontrolle i addresseboka"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Fabrikke for sprettopp-vindauget til addresseboka"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Fabrikk for addressevisaren til addresseboka"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolutions addressebok minikortlesar"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
-msgid "Factory for the Addressbook's address popup"
-msgstr "Fabrikke for sprettopp-vindauget til addresseboka"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolutions addressebok minikortlesar"
 
-#: 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 "Evolutions addressebok minikortlesar"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "Factory for the sample Addressbook control"
-msgstr "Fabrikk for ein eksemple adressebokkontroll"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolutions addressebok minikortlesar"
 
-#: 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 "Kontakter"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:76
 msgid "Folder containing contact information"
 msgstr "Mappe som inneheld kontaktinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP Server"
 msgstr "LDAP-tenar"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP server containing contact information"
 msgstr "LDAP-tenar som inneheld kontaktinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public Contacts"
 msgstr "Kontakter"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public folder containing contact information"
 msgstr "Mappe som inneheld kontaktinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Ny 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
 msgid "Create a new contact"
 msgstr "Opprett ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:569
 msgid "Create a new contact list"
 msgstr "Opprett ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-config.c:197
+#: addressbook/gui/component/addressbook-config.c:206
 msgid "Failed to connect to LDAP server"
 msgstr "Klarte ikkje � kople til LDAP-tenar"
 
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 msgid "Failed to authenticate with LDAP server"
 msgstr "Ikkje i stand til � autentisere mot IMAP-tenar"
 
-#: 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 "Denne tenaren st�r ikkje LDAPv3 skjemainformasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1176
+#: addressbook/gui/component/addressbook-config.c:1215
 msgid "Error retrieving schema information"
 msgstr "Feil ved henting av skjemainformasjon"
 
-#: 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 "LDAP var ikkje tatt med i denne versjonen av Evolution"
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr "Kontonamn"
 
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr "Tenarnamn"
 
-#: 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 "Klarte ikkje � initialisere gnome-vfs"
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "LDAP var ikkje tatt med i denne versjonen av Evolution"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
 msgid "Other Contacts"
 msgstr "Andre kontakter"
 
-#: addressbook/gui/component/addressbook.c:474
-msgid "Unable to open addressbook"
-msgstr "Ikkje i stand � opne adresseboka"
-
-#: 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"
@@ -597,53 +710,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 "Ikkje i stand � opne adresseboka"
+
+#: 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 "Ikkje i stand til � autentisere mot IMAP-tenar"
 
-#: 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 "Oppgi passord for %s (brukar %s)"
 
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:813
 msgid "Name begins with"
 msgstr "Namnet byrjar med"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:814
 msgid "Email begins with"
 msgstr "E-post byrjar med"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategori er"
 
 #. 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 "Nokon felt inneheld"
 
-#: addressbook/gui/component/addressbook.c:786
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "Avansert ..."
 
-#: 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"
@@ -651,7 +767,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"
@@ -659,25 +775,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 "Nokon kategori"
 
-#: addressbook/gui/component/addressbook.c:1132
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -686,135 +802,123 @@ 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 "(ingen)"
 
-#: 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 "Prim�r e-post"
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Vel ei handling"
 
-#: 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 "Lag ny 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 "Legg til addresser for eksisterande kontakt �%s�"
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Sp�r adresseboka ..."
 
-#: 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 "Rediger kontaktinformasjon"
 
-#: 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 "Legg til kontakter"
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Flett e-postadresser"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Sl� av sp�rjingar"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Sl� p� sp�rjingar (Farleg!)"
 
 #: 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 "Vel modemtype ..."
 
-#: addressbook/gui/component/ldap-config.glade.h:2
-msgid "1234"
-msgstr "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
 msgid "1:00"
 msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "2:30"
 msgstr "2:30"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
-msgid "380"
-msgstr "380"
-
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "5:00"
 msgstr "5:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
-msgid "666"
-msgstr "666"
-
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "<- _Remove"
-msgstr "Fje_rn"
+msgid "Add LDAP Server"
+msgstr "LDAP-tenar"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "&lt;&lt; Ferre val"
-
-#: 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 "Addressebokkjelder"
 
-#: 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 "Alltid"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Anonymously"
 msgstr "Anonymt"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
-msgid "Associated LDAP Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:18
-msgid "Attribute"
-msgstr "Attributt"
-
-#: 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"
@@ -823,79 +927,61 @@ msgid ""
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
 msgstr "Koplar til"
 
-#: 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 "Ingen informasjon"
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "S_lett"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "Liste_namn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid "Edit LDAP Server"
+msgstr "LDAP-tenar"
+
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Email Address:"
 msgstr "E-postadresse:"
 
-#: 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 kjem til � bruke denne e-postaddressa for � autentisere deg "
 "ovanfor tenaren"
 
-#: 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 kjem til � bruke denne e-postaddressa for � autentisere deg "
 "ovanfor tenaren"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Finished"
 msgstr "Ferdig"
 
-#: 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 "Allment"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "LDAP Attribute"
-msgstr "LDAP-attributt"
-
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "LDAP Configuration Assistant"
 msgstr "Konfigurasjonsassistent for LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#, fuzzy
-msgid "Mappings"
-msgstr "Margar"
-
-#: 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 "Aldri"
 
-#: 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"
@@ -905,72 +991,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 "Ein"
 
-#: 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 "Forvald"
-
-#: addressbook/gui/component/ldap-config.glade.h:50
-#, fuzzy
-msgid "Re_store Defaults"
-msgstr "Forvald"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:34
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "S�kes_kop:"
 
 #. 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 "S�ker"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
-msgid "Select"
-msgstr "Vel"
-
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Valde:"
 
-#: 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"
@@ -981,7 +1029,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"
@@ -990,54 +1038,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 "Tenarinformasjon"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr " Koplar til tenar ..."
 
-#: 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 "Ust�tta skjema"
 
-#: 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"
@@ -1045,7 +1086,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"
@@ -1054,7 +1095,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"
@@ -1062,17 +1103,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"
@@ -1082,27 +1123,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 "
@@ -1112,7 +1153,7 @@ msgstr ""
 "Namnet blir brukt til � identifisere kontoen din. Det er kun til for "
 "visningsf�rem�l."
 
-#: 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"
@@ -1120,87 +1161,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 "E-postadresse:"
 
-#: 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 "_Legg til"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-#, fuzzy
-msgid "_Add ->"
-msgstr "_Legg til"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-#, fuzzy
-msgid "_Add Mapping"
-msgstr "Legg til handling"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-#, fuzzy
-msgid "_Add to DN"
-msgstr "Legg til handling"
-
-#: addressbook/gui/component/ldap-config.glade.h:112
-msgid "_Always"
-msgstr "_Alltid"
-
-#: addressbook/gui/component/ldap-config.glade.h:113
-#, fuzzy
-msgid "_Delete Mapping"
-msgstr "S_lett alle"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Vis"
 
-#: 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
@@ -1210,208 +1210,149 @@ msgstr ""
 msgid "_Edit"
 msgstr "R_edig�r"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-#, fuzzy
-msgid "_Edit Mapping"
-msgstr "R_edig�r avtale"
-
-#: 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 "_Val"
-
-#: 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
-#, fuzzy
-msgid "_Restore Defaults"
-msgstr "Forvald"
-
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "_Search base:"
 msgstr "S�ke_base:"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "_Tenarnamn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "L�g grense (minutt):"
 
-#: 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 "contact-list-editor"
-
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "cards"
 msgstr "Ingen kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Koplar til %s p� nytt"
 
-#: 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 "Allment"
 
-#: 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 "S�ker"
 
-#: 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 "Gpilotd adressekomponent"
 
-#: 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 "Fjern alle"
 
 #. 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 "Fjern"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
-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 "Rediger kontaktinformasjon"
 
-#: 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 "Sende HTML e-post?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:405
-msgid "Edit Contact List"
-msgstr "Rediger kontaktliste"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:423
-msgid "Unnamed Contact List"
-msgstr "Kontaktliste utan namn"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:440
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d ikkje vist)"
-
-#: 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 "Kontakt utan namn"
 
-#: 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 "Kjelde"
+
+#: 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 "Avsendar inneheld"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Find"
+msgstr "Finn:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "Vel namn"
 
-#: 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 "Slett kontakt?"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:5
 msgid "Show Contacts"
 msgstr "Vis kontakter"
 
-#: 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 "_Kategori:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr "_Mapper:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "A_ssistant's name:"
 msgstr "Namn p� a_ssistent:"
 
-#: 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 "M_erkedag"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Birthda_y:"
 msgstr "F�dsels_dag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
-msgstr "Kontakter ..."
-
 #: 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_tegoriar ..."
@@ -1422,7 +1363,7 @@ msgstr "Samarbeid"
 
 #. 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 "Kontaktredigering"
 
@@ -1431,7 +1372,7 @@ msgid "D_epartment:"
 msgstr "Avd_eling:"
 
 #: 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 "Detaljar"
 
@@ -1470,1143 +1411,1193 @@ msgstr "Organi_sasjon:"
 msgid "P_rofession:"
 msgstr "Y_rke:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr "Telefontypar"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "S_pouse:"
 msgstr "E_ktefelle"
 
-#: 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 "Vil motta _HTML-post"
 
-#: 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 "_Slett"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "_Jobb-tittel:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr "Na_mn p� sjef:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "Kalle_namn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "K_ontor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Public Calendar URL:"
 msgstr "_Offentleg kalendar-URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Web page address:"
 msgstr "_Nettsideaddresse"
 
-#: 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 "Skru p�"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr "USA"
 
-#: 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 "Algerie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "American Samoa"
 msgstr "Amerikansk 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 "Antarktis"
 
-#: 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 og 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 "Austerrike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Azerbaijan"
 msgstr "Aserbadjan"
 
-#: 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 "Kviterussland"
 
-#: 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 "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 og 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 Island"
 
-#: 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 "Britisk Indisk sj�territorium"
 
-#: 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 "Kambodsja"
 
-#: 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 "Canada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cape Verde"
 msgstr "Cape 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 "Cayman Islands"
 
-#: 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 "Den Sentralafrikanske republikken"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Chad"
 msgstr "Tjad"
 
-#: 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 "Kina"
 
-#: 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 Island"
 
-#: 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) Islands"
 
-#: 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 "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 "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 Islands"
 
-#: 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 "Cote d'Ivoire"
 
-#: 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 "Krotia"
 
-#: 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 "Kypros"
 
-#: 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 "Tjekkisk republikk"
 
-#: 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 "Danmark"
 
-#: 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 "Dominikanske republikk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr "Aust-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 "Egypt"
 
-#: 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 "Ekvatorial 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 "Estland"
 
-#: 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 "Falklands�yane"
 
-#: 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�r�yane"
 
-#: 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 "Finland"
 
-#: 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 "Frankrike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "French Guiana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "French Polynesia"
 
-#: 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 "Fransk s�rleg territoriar"
 
-#: 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 "Tyskland"
 
-#: 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 "Hellas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Gr�nland"
 
-#: 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 And McDonald Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr "Den heilage sj�"
 
-#: 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 "Ungarn"
 
-#: 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 "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 "Irland"
 
-#: 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 "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 "Japansk"
 
-#: 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 "Jordan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kasakstan"
 
-#: 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 "Korea, Republic of"
 
-#: 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 "Kirgistan"
 
-#: 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 "Latvia"
 
-#: 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 "Libanon"
 
-#: 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 "Litauen"
 
-#: 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 "Luxembourg"
 
-#: 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 "Makedonia"
 
-#: 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 "Maldivane"
 
-#: 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 Islands"
 
-#: 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 "Mauritania"
 
-#: 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 "Mexico"
 
-#: 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
 #, fuzzy
 msgid "Moldova, Republic Of"
 msgstr "Korea, Republic of"
 
-#: 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 "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 "Marokko"
 
-#: 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 "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 "Nederland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Netherlands Antilles"
 msgstr "Nederlandske antillar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "New Caledonia"
 msgstr "New 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 "Ny Zealand"
 
-#: 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 "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 Island"
 
-#: 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 "Northern Mariana Islands"
 
-#: 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 "Noreg"
 
-#: 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 "Palestina"
 
-#: 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 New 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 "Peru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Philippines"
 msgstr "Fillipinene"
 
-#: 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 "Polen"
 
-#: 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 "Romania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Russian Federation"
 msgstr "Russland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: 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 And 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 And The Grena-dines"
 
-#: 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 And 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 "Seychellene"
 
-#: 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 "Singapore"
 
-#: 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 "Slovakia"
 
-#: 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 "Slovenia"
 
-#: 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 Islands"
 
-#: 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 "S�r-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 "South Georgia And The South Sandwich Islands"
 
-#: 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 "Spania"
 
-#: 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 "St. 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 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 "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 "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 "Svalbard og 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 "Swaziland"
 
-#: 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 "Sverige"
 
-#: 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 "Sveits"
 
-#: 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 "Tajikistan"
 
-#: 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 "Tanzania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Thailand"
 msgstr "Thailand"
 
-#: 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 og 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 "Tyrkia"
 
-#: 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 "Turks And Caicos Islands"
 
-#: 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 "Ukrainia"
 
-#: 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 "Forente Arabiske Emirater"
 
-#: 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 "Storbritannia"
 
-#: 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 "United States Minor Outlying Islands"
 
-#: 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 "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
 #, fuzzy
 msgid "Virgin Islands, British"
 msgstr "U.S. Virgin Islands"
 
-#: 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 "U.S. Virgin Islands"
 
-#: 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 And Futuna Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Western Sahara"
 msgstr "Western 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 "Jemen"
 
-#: 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 "Zimbabwe"
 
-#: 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 "Bod�"
+
+#: 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 "Bil"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
+msgid "Is New Card"
 msgstr ""
-"Er du sikker p� at du vil\n"
-" slette denne kontakta?"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "Slett kontakt?"
+#: 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 "Tjad"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr "Kategoriredigering ikkje tilgjengeleg."
 
-#: 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 "Lagre kontakt som VKort"
 
-#: 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 ""
+"Er du sikker p� at du vil\n"
+" slette denne kontakta?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Er du sikker p� at du vil\n"
+" slette denne kontakta?"
+
+#: 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 "Rediger full"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Fullt namn"
-
-#: 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 ""
+"Feil ved lesing a fil:\n"
+"%1"
+
 #. 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:221
+#: addressbook/gui/contact-editor/e-contact-save-as.c:206
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2615,150 +2606,147 @@ msgstr ""
 "%s eksisterar allereide\n"
 "Vil du skrive over?"
 
-#: 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 "Skriv over fil?"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresse _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Sjekk adresse"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_Land:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr "_Stad:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Postboks:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Stat/provins:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_ZIP/Postnummer:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Check Full Name"
 msgstr "Sjekk fullt namn"
 
-#: 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 "Jr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Fr�ken"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Hr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Fru."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Fr."
 
-#: 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 "_F�renamn:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Etternamn:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Mellomnamn:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "E_tterstaving:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Tittel:"
 
-#: 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 "Liste_namn:"
 
-#: 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 "Medlemar"
 
-#: 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 "Fje_rn"
 
-#: 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 "Ny liste"
+
 #. 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 "Redigering av kontakter"
 
-#: 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 "Lagre liste som VCard"
 
@@ -2810,266 +2798,287 @@ 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 "Avansert s�k"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr "S�k"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr "1 kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:152
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr "%d kort"
 
-#: 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 ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
+#: 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 "Feil ved endringa av kort"
 
-#: 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 "Vellukka"
 
-#: 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 "Ukjend feil"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 #, fuzzy
 msgid "Repository offline"
 msgstr "depot i vcs"
 
-#: 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 "Nekta tilgang"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Fann ikkje kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Kort-id eksisterar allereide"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protokollen er ikkje st�tta"
 
-#: 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 "Avbroten"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr "Autentisering feila"
 
-#: 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 "Adresseboka finst ikkje"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Anna feil"
 
-#: 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 "Vil du lagre endringar?"
 
-#: 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 "Feil ved tillegging av liste"
 
-#: 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 "Feil ved tilleggjing av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:91
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Feil ved fjerning av liste"
 
-#: 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 "Feil ved fjerning av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
-#, fuzzy
-msgid "Display Cards?"
-msgstr "Vis"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-#, fuzzy
-msgid "Display Cards"
-msgstr "Vis"
-
-#: 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 "Flytt kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Kopi�r kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:353
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Flytt kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:355
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Kopi�r kort til"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "Fleire VKort"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "VKort 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
+msgid "Type"
+msgstr "Type"
+
+#: 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 "Adressebok"
 
-#: 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 "Lagre som VKort"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "New Contact..."
 msgstr "Ny kontakt ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "New Contact List..."
 msgstr "Ny kontaktliste ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Go to Folder..."
 msgstr "G� til mappe ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Import..."
 msgstr "Import�r ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Search for Contacts..."
 msgstr "S�k etter kontakter ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Kjelde:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot-innstillingar"
 
-#: 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 "Vidaresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:815
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
-#: 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 "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr "Skriv ut konvolutt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_Kopier til mappe ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Move to folder..."
 msgstr "Flytt til mappe ..."
 
-#: 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 "Klipp ut"
 
-#: 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 "Kopier"
 
-#: 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 "Lim inn"
 
-#: 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 "Slett"
 
-#: 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 "_Aktiv visning"
@@ -3078,7 +3087,7 @@ msgstr "_Aktiv 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: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,�,�,�"
 
@@ -3086,11 +3095,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"
@@ -3158,20 +3167,61 @@ msgstr "Alternativ telefon"
 msgid "Primary Phone"
 msgstr "Prim�r 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 "og %d andre kort."
 
-#: 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 "Lagre i addressebok"
 
-#: 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 "Breidd:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+#, fuzzy
+msgid "Height"
+msgstr "H�gd:"
+
+#: 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 "Etternamn"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+#, fuzzy
+msgid "Text Model"
+msgstr "Tekststorle_ik"
+
+#: 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"
@@ -3180,28 +3230,48 @@ 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 "Adrar"
+
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "Valde:"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Sort�r oppg�ver"
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Kort-visning"
 
-#: 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 "Vekesvisning"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr "Skriv ut konvolutt"
 
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1130
 msgid "Print cards"
 msgstr "Skriv ut kort"
 
-#: 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 "Skriv ut kort"
 
@@ -3274,7 +3344,6 @@ msgid "Include:"
 msgstr "Inkluder:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Liggjande"
 
@@ -3294,17 +3363,16 @@ msgstr "Margar"
 msgid "Number of columns:"
 msgstr "Tal p� kolonnar:"
 
-#: 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 "Val"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Retning"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "Side"
 
@@ -3320,9 +3388,7 @@ msgstr "Papir"
 msgid "Paper source:"
 msgstr "Papirkjelde:"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "St�ande"
 
@@ -3382,43 +3448,167 @@ msgstr "_Skrifttype ..."
 msgid "Untitled appointment"
 msgstr "Avtale utan namn"
 
-#: 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 "H�g"
 
-#: 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 "Vanleg"
 
-#: 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 "Lav"
 
 #. 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 "Udefinert"
 
-#: 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 "Feil ved kommunikasjon mot kalendartenaren"
 
-#: 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
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -3428,93 +3618,78 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "Default Priority:"
 msgstr "_Prioritet:"
 
-#: 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 "Innstillingar for kalendar og oppg�ver"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Calendar."
-msgstr "�ydelagd oppsettfil."
-
-#: 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 "Tilgjengelege lenkjer:"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Evolutionkomponent for handtere kalendaren."
+msgid "Evolution Calendar and Tasks"
+msgstr "Innstillingar for kalendar og oppg�ver"
 
-#: 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"
-msgstr "�ydelagd oppsettfil."
+msgid "Evolution Calendar and Tasks component"
+msgstr "Kan ikkje initialisera lokale variablar"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 #, fuzzy
-msgid "Factory for the calendar iTip view control"
+msgid "Evolution Calendar configuration control"
 msgstr "�ydelagd oppsettfil."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 #, fuzzy
-msgid "Factory for the sample Calendar control"
-msgstr "�ydelagd oppsettfil."
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Tilgjengelege lenkjer:"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 #, fuzzy
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "�ydelagd oppsettfil."
+msgid "Evolution Calendar viewer"
+msgstr "Tilgjengelege lenkjer:"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 #, fuzzy
-msgid "Factory to create a component editor factory"
-msgstr "�ydelagd oppsettfil."
+msgid "Evolution Calendar/Task editor"
+msgstr "Tilgjengelege lenkjer:"
 
-#: 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 "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 "Tilgjengelege lenkjer:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Starting:"
 msgstr "Startar:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Ending:"
 msgstr "Slutt:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
 msgid "invalid time"
 msgstr "ugyldig tid"
 
-#: 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 p� %s"
@@ -3538,11 +3713,17 @@ msgstr "L�g grense (minutt):"
 msgid "_Edit appointment"
 msgstr "R_edig�r avtale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "Inga skildring tilgjengeleg"
 
-#: 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 "�tvaring"
+
+#: 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"
@@ -3550,13 +3731,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 "�tvaring"
-
-#: 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 "
@@ -3567,17 +3742,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 "Ikkje sp�r igjen"
 
-#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
-#, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "Kunne ikkje initiere Bonobo"
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize gnome-vfs"
+msgstr "Klarte ikkje � initialisere gnome-vfs"
 
-#: 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 ""
@@ -3597,37 +3771,37 @@ msgstr "Skildring inneheld"
 msgid "Comment contains"
 msgstr "Merknad inneheld"
 
-#: 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 "Ikkje truffe"
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:404
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%1 bit %2 %3"
 
 #. 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 "%d. %a %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 "%d. %a %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"
 
@@ -3636,67 +3810,168 @@ 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 "Kalender"
+
+#: calendar/gui/calendar-component.c:71
+msgid "Folder containing appointments and events"
+msgstr "Mappe inneheld avtaler og hendingar"
+
+#: calendar/gui/calendar-component.c:75
+#, fuzzy
+msgid "Public Calendar"
+msgstr "_Offentleg kalendar-URL:"
+
+#: calendar/gui/calendar-component.c:76
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Mappe inneheld avtaler og hendingar"
+
+#: 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 "Oppg�ver"
+
+#: calendar/gui/calendar-component.c:81
+msgid "Folder containing to-do items"
+msgstr "Mappe inneheld huskeliste"
+
+#: calendar/gui/calendar-component.c:85
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Skriv ut kort"
+
+#: calendar/gui/calendar-component.c:86
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Mappe inneheld huskeliste"
+
+#: calendar/gui/calendar-component.c:730
+#, fuzzy
+msgid "New appointment"
+msgstr "Ny avtale"
+
+#: calendar/gui/calendar-component.c:730
+#, fuzzy
+msgid "_Appointment"
+msgstr "Avtale"
+
+#: calendar/gui/calendar-component.c:731
+msgid "Create a new appointment"
+msgstr "Lag ein ny avtale"
+
+#: calendar/gui/calendar-component.c:735
+#, fuzzy
+msgid "New meeting"
+msgstr "Nettverksinnstillingar"
+
+#: calendar/gui/calendar-component.c:735
+#, fuzzy
+msgid "_Meeting"
+msgstr "M�te"
+
+#: calendar/gui/calendar-component.c:736
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Opprett ei ny oppg�ve"
+
+#: calendar/gui/calendar-component.c:740
+#, fuzzy
+msgid "New task"
+msgstr "Ny oppg�ve"
+
+#: calendar/gui/calendar-component.c:740
+msgid "_Task"
+msgstr "_Oppg�ve"
+
+#: calendar/gui/calendar-component.c:741
+msgid "Create a new task"
+msgstr "Opprett ei ny oppg�ve"
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Ny avtale"
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Ny _avtale"
+
+#: calendar/gui/calendar-component.c:746
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Lag ein ny avtale"
+
+#: 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 "Konfidensiell"
 
-#: 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 "Offentleg"
 
-#: 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 "V"
 
-#: 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 "Ledig"
 
-#: 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 "Oppteke"
 
-#: 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 "Ikkje starta"
 
-#: 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 "Under arbeid"
 
-#: 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 "Ferdig"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3704,153 +3979,67 @@ msgid ""
 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
+#: 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:1723
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Repeterande"
 
-#: calendar/gui/calendar-model.c:1725
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: 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 "Ja"
 
-#: 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 "Nei"
 
-#: calendar/gui/calendar-view-factory.c:148
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Dagsvisning"
 
-#: calendar/gui/calendar-view-factory.c:151
+#: calendar/gui/calendar-view-factory.c:121
 msgid "Work Week View"
 msgstr "Arbeidsvekevisning"
 
-#: calendar/gui/calendar-view-factory.c:154
+#: calendar/gui/calendar-view-factory.c:124
 msgid "Week View"
 msgstr "Vekesvisning"
 
-#: calendar/gui/calendar-view-factory.c:157
+#: calendar/gui/calendar-view-factory.c:127
 msgid "Month View"
 msgstr "M�nadsvising"
 
-#: 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 "Mappe inneheld avtaler og hendingar"
-
-#: calendar/gui/component-factory.c:76
+#: calendar/gui/comp-editor-factory.c:456
 #, fuzzy
-msgid "Public Calendar"
-msgstr "_Offentleg kalendar-URL:"
-
-#: calendar/gui/component-factory.c:77
-#, fuzzy
-msgid "Public folder containing appointments and events"
-msgstr "Mappe inneheld avtaler og hendingar"
-
-#: 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 "Oppg�ver"
-
-#: calendar/gui/component-factory.c:82
-msgid "Folder containing to-do items"
-msgstr "Mappe inneheld huskeliste"
-
-#: calendar/gui/component-factory.c:86
-#, fuzzy
-msgid "Public Tasks"
-msgstr "Skriv ut kort"
-
-#: calendar/gui/component-factory.c:87
-#, fuzzy
-msgid "Public folder containing to-do items"
-msgstr "Mappe inneheld huskeliste"
-
-#: calendar/gui/component-factory.c:750
-#, fuzzy
-msgid "New appointment"
-msgstr "Ny avtale"
-
-#: calendar/gui/component-factory.c:750
-#, fuzzy
-msgid "_Appointment"
-msgstr "Avtale"
-
-#: calendar/gui/component-factory.c:751
-msgid "Create a new appointment"
-msgstr "Lag ein ny avtale"
-
-#: calendar/gui/component-factory.c:755
-#, fuzzy
-msgid "New meeting"
-msgstr "Nettverksinnstillingar"
-
-#: calendar/gui/component-factory.c:755
-#, fuzzy
-msgid "_Meeting"
-msgstr "M�te"
-
-#: calendar/gui/component-factory.c:756
-#, fuzzy
-msgid "Create a new meeting request"
-msgstr "Opprett ei ny oppg�ve"
-
-#: calendar/gui/component-factory.c:760
-#, fuzzy
-msgid "New task"
-msgstr "Ny oppg�ve"
-
-#: calendar/gui/component-factory.c:760
-msgid "_Task"
-msgstr "_Oppg�ve"
-
-#: calendar/gui/component-factory.c:761
-msgid "Create a new task"
-msgstr "Opprett ei ny oppg�ve"
-
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "New All Day Appointment"
-msgstr "Ny avtale"
+msgid "Error while opening the calendar"
+msgstr "Feil ved kommunikasjon mot kalendartenaren"
 
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "All _Day Appointment"
-msgstr "Ny _avtale"
+#: 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 "Lag ein ny avtale"
+msgid "Permission denied to open the calendar"
+msgstr "Nekta tilgang"
 
-#: calendar/gui/control-factory.c:123
+#: calendar/gui/control-factory.c:119
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr ""
@@ -3858,196 +4047,95 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/control-factory.c:167
+#: calendar/gui/control-factory.c:165
 #, fuzzy
 msgid "The URI that the calendar will display"
 msgstr "Viser korleis datoverdiar vert viste."
 
-#: calendar/gui/control-factory.c:174
+#: calendar/gui/control-factory.c:172
 #, fuzzy
 msgid "The type of view to show"
 msgstr "Endra namnet p� denne mappa"
 
-#: calendar/gui/dialogs/alarm-options.c:359
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Val for lydlarm"
 
-#: calendar/gui/dialogs/alarm-options.c:368
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Eigenskapar meldingsalarm"
 
-#: calendar/gui/dialogs/alarm-options.c:377
-msgid "Mail Alarm Options"
+#: calendar/gui/dialogs/alarm-options.c:438
+#, fuzzy
+msgid "Email Alarm Options"
 msgstr "Eigenskapar for e-postalam"
 
-#: calendar/gui/dialogs/alarm-options.c:386
+#: calendar/gui/dialogs/alarm-options.c:447
 #, fuzzy
 msgid "Program Alarm Options"
 msgstr "Programplasseringar"
 
-#: calendar/gui/dialogs/alarm-options.c:395
+#: calendar/gui/dialogs/alarm-options.c:456
 #, fuzzy
 msgid "Unknown Alarm Options"
 msgstr "Kjende program"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Alarm Repeat"
 msgstr "Alarmen repeterar"
 
-#: 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 "Melding som skal visast"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "Meldingskropp"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "Spel lyd:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "Repeter alarmen"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "K�yr 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 desse argumenta:"
 
-#: 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 "dagar"
 
-#: 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 "Oppdater kvart"
 
-#: 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 "timar"
 
-#: 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 "minutt"
 
-#: calendar/gui/dialogs/alarm-page.c:319
-#, c-format
-msgid "%d days"
-msgstr "%d dagar"
-
-#: calendar/gui/dialogs/alarm-page.c:322
-msgid "1 day"
-msgstr "1 dag"
-
-#: calendar/gui/dialogs/alarm-page.c:327
-#, c-format
-msgid "%d weeks"
-msgstr "%d veker"
-
-#: calendar/gui/dialogs/alarm-page.c:330
-msgid "1 week"
-msgstr "1 veke"
-
-#: calendar/gui/dialogs/alarm-page.c:335
-#, c-format
-msgid "%d hours"
-msgstr "%d timar"
-
-#: calendar/gui/dialogs/alarm-page.c:338
-msgid "1 hour"
-msgstr "1 time"
-
-#: calendar/gui/dialogs/alarm-page.c:343
-#, c-format
-msgid "%d minutes"
-msgstr "%d minutt"
-
-#: calendar/gui/dialogs/alarm-page.c:346
-msgid "1 minute"
-msgstr "1 minutt"
-
-#: calendar/gui/dialogs/alarm-page.c:351
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekund"
-
-#: 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 "Spel ein lyd"
-
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
-msgstr "Vis ei melding"
-
-#: calendar/gui/dialogs/alarm-page.c:391
-msgid "Send an email"
-msgstr "Send ein e-post"
-
-#: calendar/gui/dialogs/alarm-page.c:395
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
-msgstr "K�yr eit program"
-
-#: calendar/gui/dialogs/alarm-page.c:401
-msgid "Unknown action to be performed"
-msgstr "Ukjent handling som skal utf�rast"
-
-#: calendar/gui/dialogs/alarm-page.c:413
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "%s %s f�r byrjing p� avtalen"
-
-#: calendar/gui/dialogs/alarm-page.c:416
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "%s %s etter byrjinga p� avtalen"
-
-#: calendar/gui/dialogs/alarm-page.c:421
-#, fuzzy, c-format
-msgid "%s at the start of the appointment"
-msgstr "&Slett avtale"
-
-#: calendar/gui/dialogs/alarm-page.c:430
-#, fuzzy, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "&Slett avtale"
-
-#: calendar/gui/dialogs/alarm-page.c:433
-#, fuzzy, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "&Slett avtale"
-
-#: calendar/gui/dialogs/alarm-page.c:438
-#, fuzzy, c-format
-msgid "%s at the end of the appointment"
-msgstr "&Slett avtale"
-
-#: 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 ""
-
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -4058,46 +4146,63 @@ msgstr "Enkel"
 msgid "Date/Time:"
 msgstr "Dato/tid:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "Vis ei melding"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "Spel ein lyd"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "P�minning"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "K�yr eit program"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "Send ein e-post"
+
+#: 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 "Samandrag:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_Val ..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "etter"
 
-#: 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(ar)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "slutt p� avtale"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "time/timar"
 
-#: 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 "minutt"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "byrjing p� avtale"
 
@@ -4121,7 +4226,7 @@ msgstr "30 minutt"
 msgid "60 minutes"
 msgstr "60 minutt"
 
-#: 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"
@@ -4148,7 +4253,8 @@ msgid "Days"
 msgstr "Dagar"
 
 #: 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 "Fredag"
 
@@ -4161,7 +4267,8 @@ msgid "Minutes"
 msgstr "Minutt"
 
 #: 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 "M�ndag"
 
@@ -4171,7 +4278,8 @@ msgid "S_un"
 msgstr "Su_n"
 
 #: 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 "Laurdag"
 
@@ -4184,7 +4292,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Vis veke_nummer i datonavigat�ren"
 
 #: 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 "S�ndag"
 
@@ -4203,7 +4312,8 @@ msgid "Task List"
 msgstr "_Oppg�veliste"
 
 #: 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 "Torsdag"
 
@@ -4220,7 +4330,8 @@ msgid "Time format:"
 msgstr "Tidsformat:"
 
 #: 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 "Tysdag"
 
@@ -4229,7 +4340,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 "Onsdag"
 
@@ -4272,7 +4384,7 @@ msgid "_Fri"
 msgstr "_Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "_Generelt"
 
@@ -4318,163 +4430,167 @@ msgstr "_Ons"
 msgid "before every appointment"
 msgstr "&Slett avtale"
 
-#: 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 "Er du sikker p� at du vil sletta denne metoden?"
 
-#: 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 "Er du sikker p� at du vil sletta denne klassen?"
 
-#: 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 "Er du sikker p� at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 #, fuzzy
 msgid "This event has been deleted."
 msgstr "Inga hending valt."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Denn oppg�va har vorte sletta."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 #, fuzzy
 msgid "This journal entry has been deleted."
 msgstr "Denne mappa kan ikkje slettast."
 
-#: 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
 #, fuzzy
 msgid "This event has been changed."
 msgstr "Passordet ditt er endra."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 #, fuzzy
 msgid "This task has been changed."
 msgstr "Passordet ditt er endra."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 #, fuzzy
 msgid "This journal entry has been changed."
 msgstr "Passordet ditt er endra."
 
-#: 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 "Ukjend feil"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr " til "
 
-#: 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 " (Ferdig "
 
-#: 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 "Ferdig "
 
-#: 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 " (Ferdig"
 
-#: 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 "Ferdig"
 
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:328
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: 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 "Kunne ikkje laga kio-jobb.\n"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Redig�r avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "Oppg�ve - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppf�ring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "Ikkje noko samandrag"
 
-#: 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 "Lagre som ..."
 
-#: 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 "Ikkje stand til � f� tak i noverande versjon!"
 
@@ -4535,88 +4651,101 @@ msgstr "Deleg�r til:"
 msgid "Enter Delegate"
 msgstr "Tast inn delegat"
 
-#: 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 "Avtale"
 
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "P�minning"
 
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Repetering"
 
-#: 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 "K�yreplan ..."
 
-#: 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 "M�te"
 
-#: 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
+#, fuzzy
+msgid "Start date is wrong"
+msgstr "Start-dato"
+
+#: 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 "_Start-tid:"
+
+#: 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 "_Oppteke"
 
-#: 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 "Klassifisering"
 
-#: 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_fidensielt"
 
-#: 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 og tid"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "_Ledig"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr "_Plassering:"
 
-#: 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 "_Offentleg"
 
-#: 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_mandrag:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Kontaktar ..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "_Slutt-tid:"
@@ -4625,19 +4754,23 @@ msgstr "_Slutt-tid:"
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: 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 "_Deleg�r til ..."
 
@@ -4677,16 +4810,11 @@ msgid "Member"
 msgstr "Medlem"
 
 #: 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 "Rolle"
-
 #: 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
@@ -4694,13 +4822,6 @@ msgstr "Rolle"
 msgid "Status"
 msgstr "Status"
 
-#: 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"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4711,108 +4832,88 @@ msgid "_Change Organizer"
 msgstr "_Endre organisator"
 
 #: 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 "_Inviter andre ..."
 
-#: 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/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."
+msgid "This and Future Instances"
+msgstr "Wallis And Futuna Islands"
 
-#: 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:77
+#, fuzzy
+msgid "All Instances"
+msgstr "Alliance"
 
-#: 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 "p�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:977
 #, fuzzy
 msgid "first"
 msgstr "liste"
 
-#: 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 "Anna"
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:980
 #, fuzzy
 msgid "fourth"
 msgstr "Nord"
 
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:981
 #, fuzzy
 msgid "last"
 msgstr "liste"
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1004
 #, fuzzy
 msgid "Other Date"
 msgstr "Alternativ faks"
 
-#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1270
+#: calendar/gui/dialogs/recurrence-page.c:1169
 #, fuzzy
 msgid "on the"
 msgstr "M�nad"
 
-#: calendar/gui/dialogs/recurrence-page.c:1455
+#: calendar/gui/dialogs/recurrence-page.c:1354
 #, fuzzy
 msgid "occurrences"
 msgstr "gong(ar)"
@@ -4882,22 +4983,27 @@ msgstr "veke(r)"
 msgid "year(s)"
 msgstr "�r"
 
-#: 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 "Ferdig "
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -4908,43 +5014,40 @@ msgstr "prosent ferdig"
 msgid "Date Completed:"
 msgstr "Dato ferdig"
 
-#: 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 "Vel ikon"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Framgang"
 
-#: 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 "_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:206
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "Enkel"
 
-#: 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 "Tildeling"
 
-#: 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 "Skildring:"
 
@@ -4952,139 +5055,236 @@ msgstr "Skildring:"
 msgid "Sta_rt Date:"
 msgstr "Sta_rt-dato:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Kontaktar ..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "Forfalls_dato:"
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d dagar"
+
+#: 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 veker"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 veke"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d timar"
+
+#: 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 minutt"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 minutt"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekund"
+
+#: 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 ein e-post"
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr "Ukjent handling som skal utf�rast"
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s f�r byrjing p� avtalen"
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s etter byrjinga p� avtalen"
+
+#: calendar/gui/e-alarm-list.c:495
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
+msgstr "&Slett avtale"
+
+#: calendar/gui/e-alarm-list.c:504
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "&Slett avtale"
+
+#: calendar/gui/e-alarm-list.c:507
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "&Slett avtale"
+
+#: calendar/gui/e-alarm-list.c:512
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr "&Slett avtale"
+
+#: 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: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 "Slettar valde objekt"
 
-#: 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 "_Opne"
 
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:951
 #, fuzzy
 msgid "_Save as..."
 msgstr "Lagre som ..."
 
-#: 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 "S_kriv ut"
 
-#: 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 "Kl_ipp ut"
 
-#: 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 "_Kopier"
 
-#: 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 "_Lim inn"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:962
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Tildel oppg�ve"
 
-#: calendar/gui/e-calendar-table.c:1000
+#: calendar/gui/e-calendar-table.c:963
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Fort framover"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "_Merk som komplett"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:965
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk oppg�ver som ferdig"
 
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "Slett _den valde oppg�ver"
 
-#: 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 "Oppdaterar objekt"
 
-#: 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 "Trykk her for � leggje til ei oppg�ve"
@@ -5093,8 +5293,8 @@ msgstr "Trykk her for � leggje til ei oppg�ve"
 msgid "Alarms"
 msgstr "Alarmar"
 
-#: 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 "Ferdig"
 
@@ -5123,8 +5323,8 @@ msgid "Start Date"
 msgstr "Start-dato"
 
 #: 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 "Samandrag"
 
@@ -5132,19 +5332,15 @@ msgstr "Samandrag"
 msgid "Task sort"
 msgstr "Sort�r oppg�ver"
 
-#: 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 ""
 
 #. 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 ""
 
@@ -5159,145 +5355,224 @@ 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 minutt oppdeling"
 
 #. 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 "Ny _avtale"
 
-#: 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 "Ny h_eildagshending"
 
-#: 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 "M�te"
 
-#: 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 "Ny oppg�ve"
 
-#: 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 "Skriv ut ..."
 
-#: 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 "G� _til idag"
 
-#: 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 "_G� til dato ..."
 
-#: 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 "Informasjon"
 
-#: 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 "_Innstillingar for e-post ..."
 
-#: 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 "_Lagre som ..."
 
-#: 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 "K�yreplan ..."
 
-#: 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 "Fort framover"
 
-#: 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 "Se&nd avtale"
 
-#: 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 "Erstatt denne f�rekomsten?"
 
-#: 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 "Slettar klassen"
 
-#: calendar/gui/e-itip-control.c:615
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Yes. (Complex Recurrence)"
+msgstr "Repetering"
+
+#: calendar/gui/e-itip-control.c:716
+#, fuzzy
+msgid "Every day"
+msgstr "Kvar"
+
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "Every %d days"
+msgstr "%d dagar"
+
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Every week"
+msgstr "Kvar"
+
+#: calendar/gui/e-itip-control.c:726
+#, fuzzy, c-format
+msgid "Every %d weeks"
+msgstr "%d veker"
+
+#: 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 veker"
+
+#: 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 "Ein _m�nad"
+
+#: 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 "Kvar"
+
+#: 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 "Sluttar: <b>"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:851
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Ferdig "
 
-#: 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 "Informasjon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:913
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Skriv ut alle"
 
-#: 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 "Ein ukjent person"
 
 #. 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."
@@ -5305,298 +5580,299 @@ msgstr ""
 "<br> Sj� gjennom den f�lgjande informasjon, og velj ei handling fr� menyen "
 "under."
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Location:"
 msgstr "_Plassering:"
 
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-itip-control.c:1073
 #, fuzzy
 msgid "Status:"
 msgstr "_Status:"
 
-#: 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 "Akseptert"
 
-#: 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 "Mellombels"
 
-#: 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 "Avsl�tt"
 
-#: 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 "Ukjend"
 
-#: 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 "Vel ei handling:"
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Oppdater"
 
-#: 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 "Godta"
 
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:1175
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Mellombels"
 
-#: calendar/gui/e-itip-control.c:957
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Avsl�"
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:1200
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Informasjon"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Opdat�r status p� svar"
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:1226
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Informasjon"
 
-#: 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 "Avbryt"
 
-#: 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 "generer avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1321
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Personleg informasjon"
 
-#: 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> sp�r etter deg for � stille opp p� eit m�te."
 
-#: 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> sp�r etter deg for � stille opp p� eit m�te."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "M�teframlegg"
 
-#: 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> �nskjar � leggje til ei eksisterande oppg�ve."
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "M�teoppdatering"
 
-#: 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 "generer avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1339
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "M�teoppdatering"
 
-#: 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 "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "M�tesvar"
 
-#: 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 "<b>%s</b> har kansellert ei oppg�ve."
 
-#: calendar/gui/e-itip-control.c:1136
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "M�tekansellering"
 
-#: 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> har kansellert ei oppg�ve."
 
-#: calendar/gui/e-itip-control.c:1144
+#: calendar/gui/e-itip-control.c:1363
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "&Finn i melding ..."
 
-#: 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 "generer avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Oppg�veinformasjon"
 
-#: 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 "Pr�v �%s --help� for meir informasjon\n"
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1395
 #, fuzzy, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "Pr�v �%s --help� for meir informasjon\n"
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Oppg�veframlegg"
 
-#: 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> �nskjar � leggje til ei eksisterande oppg�ve."
 
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Oppg�veoppdatering"
 
-#: 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 "Dette er ei f�rehandsvising av det valte bakgrunnsbiletet."
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Oppg�veoppdateringsforep�rjing"
 
-#: 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 "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Oppg�vesvar"
 
-#: 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> har kansellert ei oppg�ve."
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Oppg�vekansellering"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1430
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Skriv ut alle"
 
-#: 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 "Skriv avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Fri/ledig-informasjon"
 
-#: 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 "Pr�v �%s --help� for meir informasjon\n"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Fri/ledig foresp�rsel"
 
-#: 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 "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Fri/Oppteke svar"
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1465
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Private meldingar"
 
-#: 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 "Meldinga ser ikkje ut til � vere skikkeleg forma"
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1604
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Meldinga har ingen sendar"
 
-#: 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 "Vedlegg inneheld ikkje ei gyldig kalendarmelding."
 
-#: calendar/gui/e-itip-control.c:1441
+#: calendar/gui/e-itip-control.c:1666
 #, fuzzy
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegg inneheld ikkje ei gyldig kalendarmelding."
 
-#: 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 "Kunne ikkje lagra adresseboka."
 
-#: 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 ""
@@ -5604,28 +5880,28 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1919
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Ferdig"
 
-#: 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 ""
@@ -5633,34 +5909,34 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: 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
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Ferdig"
 
-#: 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 "Dato"
 
-#: 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 "Vel mappe"
 
-#: calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:2213
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Vel mappe"
@@ -5702,186 +5978,192 @@ msgstr "sluttdato"
 msgid "date-start"
 msgstr "start-dato"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:80
 #, fuzzy
 msgid "Chair Persons"
 msgstr "Bil-telefon"
 
-#: 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 "Tenarinformasjon"
 
-#: calendar/gui/e-meeting-model.c:86
+#: calendar/gui/e-meeting-model.c:82
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Personleg informasjon"
 
-#: calendar/gui/e-meeting-model.c:87
+#: calendar/gui/e-meeting-model.c:83
 #, fuzzy
 msgid "Resources"
 msgstr "Ressurs"
 
-#: 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 "Individuell"
 
-#: 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 "Gruppe"
 
-#: 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 "Ressurs"
 
-#: 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 "Rom"
 
-#: 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 "Teikn"
 
-#: 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 "Tenarinformasjon"
 
-#: 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
 #, fuzzy
 msgid "Optional Participant"
 msgstr "Personleg informasjon"
 
-#: 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 "Ikkje-deltakar"
 
-#: 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 "Vel ikon"
+
+#: 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 "Mellombels"
 
-#: 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 "Delegert"
 
-#: 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 "Under prossering"
 
 #. 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 "Ute av kontoret"
 
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Val"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Vis kun _arbeidstid"
 
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:481
 #, fuzzy
 msgid "Show _Zoomed Out"
 msgstr "Forminsk"
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:499
 #, fuzzy
 msgid "_Update Free/Busy"
 msgstr "Oppdateringsfrekvens"
 
-#: 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 "_Autoplukk"
 
-#: 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
 #, fuzzy
 msgid "_All People and Resources"
 msgstr "Alle filer og katalogar"
 
-#: 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
 #, fuzzy
 msgid "Meeting _start time:"
 msgstr "&Helsingstekst:"
 
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "M�t_e slutttid:"
 
-#: 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 "Leitar etter tilleggsmodular"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/e-tasks.c:393
+#: calendar/gui/e-tasks.c:401
 #, fuzzy, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden %1 er ikkje st�tta."
 
-#: 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 ""
@@ -5889,7 +6171,7 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: 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"
@@ -5898,26 +6180,26 @@ msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: calendar/gui/e-tasks.c:540
+#: calendar/gui/e-tasks.c:554
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Fullf�ringsdato"
 
-#: calendar/gui/e-tasks.c:563
+#: calendar/gui/e-tasks.c:577
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Slettar valde objekt"
 
-#: calendar/gui/e-tasks.c:656
+#: calendar/gui/e-tasks.c:672
 #, fuzzy
 msgid "Expunging"
 msgstr "Forventar %1"
 
-#: calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Ny _avtale ..."
 
-#: calendar/gui/gnome-cal.c:1530
+#: calendar/gui/gnome-cal.c:1503
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
@@ -5925,18 +6207,17 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: 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 "Metoden %1 er ikkje st�tta."
 
-#. 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 p� %s"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar 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:1772
+#: calendar/gui/gnome-cal.c:1764
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5952,7 +6233,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 "Feil ved opning"
@@ -6018,326 +6299,181 @@ msgstr "Oktober"
 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 ""
 
-#: 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 "Informasjon"
 
-#: 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 "Informasjon om oppg�ve"
 
-#: 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 "Personleg informasjon"
 
-#: 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 "Informasjon"
 
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:394
 #, fuzzy
 msgid "Calendar information"
 msgstr "Informasjon"
 
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:430
 #, fuzzy
 msgid "Updated"
 msgstr "Oppdater"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:438
 #, fuzzy
 msgid "Refresh"
 msgstr "Frisk opp liste"
 
-#: 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 "Informasjon"
 
-#: calendar/gui/itip-utils.c:598
+#: calendar/gui/itip-utils.c:525
 #, fuzzy
 msgid "iCalendar information"
 msgstr "Informasjon"
 
-#: 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 "Kunne ikkje initialisere Bonobo"
-
-#: calendar/gui/main.c:99
-#, fuzzy
-msgid "Could not create the component editor factory"
-msgstr ""
-"Kunne ikkje laga mellombels fil\n"
-"%1:\n"
-"%2"
-
-#: 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 "Sun"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "M�n"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "Tys"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "Lau"
 
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Vald dag (%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 "Vald veke (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr "Vald m�nad (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr "Vald �r (%Y)"
 
-#: calendar/gui/print.c:2249
+#: calendar/gui/print.c:2267
 msgid "Task"
 msgstr "Oppg�ve"
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Prioritet:"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2358
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent ferdig: %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 "Kategoriar %s"
 
-#: calendar/gui/print.c:2375
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr "Kontaktar: "
 
-#: calendar/gui/print.c:2430
-msgid "Print Calendar"
-msgstr "Skriv ut kalendar"
-
-#: 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 "F�rehandsvising av utskrift"
 
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "Skriv ut element"
 
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "Utskriftoppsett"
 
-#: 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 "Viser korleis datoverdiar vert viste."
 
-#: 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"
@@ -6345,84 +6481,54 @@ 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 "Ikkje sp�r igjen"
 
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:615
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Skriv ut kort"
 
-#: 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 "MTOTFLS"
 
-#: 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 "Fabrikk for � importere VCard-filer inn i Evolution."
+msgid "Evolution Calendar intelligent importer"
+msgstr "Tilgjengelege lenkjer:"
 
-#: 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 "Importerar VCard-filer inn i Evolution."
+msgid "Evolution iCalendar importer"
+msgstr "Tilgjengelege lenkjer:"
 
-#: 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 "Importerar VCard-filer inn i Evolution."
+msgid "Evolution vCalendar importer"
+msgstr "Tilgjengelege lenkjer:"
 
-#: calendar/importers/icalendar-importer.c:168
-#, fuzzy, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr "Mottek meldingar fr� %1"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Kalendermelding"
 
-#: calendar/importers/icalendar-importer.c:180
-#, fuzzy, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
+#: 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 "P�minning"
 
-#: calendar/importers/icalendar-importer.c:697
+#: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Kalendermelding"
 
-#: calendar/importers/icalendar-importer.c:722
+#: calendar/importers/icalendar-importer.c:663
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6431,11 +6537,15 @@ msgstr ""
 "Evolution har funne Pine e-postfiler.\n"
 "Vil du importere desse inn i Evolution?"
 
-#: 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 ""
@@ -8089,32 +8199,42 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillehavet/Yap"
 
-#: camel/camel-cipher-context.c:170
+#: camel/camel-cipher-context.c:178
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: camel/camel-cipher-context.c:210
+#: camel/camel-cipher-context.c:218
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:262
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "Knapp (ikkje st�tta av KControl)"
 
-#: camel/camel-cipher-context.c:296
+#: camel/camel-cipher-context.c:304
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: camel/camel-data-cache.c:169
+#: camel/camel-cipher-context.c:342
+#, fuzzy
+msgid "You may not import keys with this cipher"
+msgstr "Den oppgitte fila finst ikkje"
+
+#: camel/camel-cipher-context.c:374
+#, fuzzy
+msgid "You may not export keys with this cipher"
+msgstr "Den oppgitte fila finst ikkje"
+
+#: camel/camel-data-cache.c:133
 #, fuzzy
 msgid "Unable to create cache path"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/camel-data-cache.c:443
+#: camel/camel-data-cache.c:370
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr ""
@@ -8155,95 +8275,104 @@ msgstr "Lagrar mappe �%s�"
 msgid "You must be working online to complete this operation"
 msgstr "Kan ikkje gjera LIST-operasjon ferdig"
 
-#: 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 "Kunne ikkje leggja til melding:\n"
+
+#: 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 "Kunne ikkje leggja til melding:\n"
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr ""
+"Kan ikkje laga heimekatalog\n"
+"Feil: %1"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Synkroniserar mapper"
 
-#: 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 ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: 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 ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:1097
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Kan ikkje 'chown' 'spool'-katalogen"
 
-#: camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:1106
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Kan ikkje laga 'spool'-katalog"
 
-#: camel/camel-filter-driver.c:966
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Hentar melding %d (%d%%)"
 
-#: camel/camel-filter-driver.c:970
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Kan ikkje opne melding"
 
-#: 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 "Kunne ikkje leggja til melding:\n"
 
-#: 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 "Synkroniser mapper"
 
-#: camel/camel-filter-driver.c:1058
+#: camel/camel-filter-driver.c:1213
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1228
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Klarte ikkje � dekode melding."
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ugyldig(e) argument"
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ugyldig(e) argument"
 
-#: camel/camel-filter-search.c:514
-#, fuzzy, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Kunne ikkje leggja til melding:\n"
-
-#: camel/camel-filter-search.c:550
-#, fuzzy, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Kunne ikkje leggja til melding:\n"
-
-#: 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 ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, fuzzy, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8252,7 +8381,7 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8261,11 +8390,11 @@ msgstr ""
 "Feil ved lesing av fil:\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 ""
@@ -8298,7 +8427,7 @@ msgstr "Flyttar melding"
 msgid "Copying messages"
 msgstr "Melding"
 
-#: camel/camel-gpg-context.c:697
+#: camel/camel-gpg-context.c:724
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8306,71 +8435,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 "Avbroten."
 
-#: 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 "Uventa svar fr� POP-tenaren: %s"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:814
 #, fuzzy
 msgid "No data provided"
 msgstr "G� til side"
 
-#: 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 "Kunne ikkje leggja til melding:\n"
 
-#: 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 "Kunne ikkje leggja til melding:\n"
 
-#: 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 "Klarte ikkje � dekode melding."
 
-#: 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 "Klarte ikkje � dekode melding."
 
-#: 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 "Kunne ikkje laga katalog\n"
@@ -8398,23 +8528,22 @@ msgstr ""
 msgid "Could not lock '%s'"
 msgstr "Kunne ikkje starta %1."
 
-#. 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 ""
@@ -8424,12 +8553,12 @@ msgstr ""
 msgid "Could not check mail file %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
 #, fuzzy, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
 #, fuzzy, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
@@ -8437,45 +8566,45 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: 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
 #, fuzzy, c-format
 msgid "Could not create pipe: %s"
 msgstr "Kunne ikkje laga katalog\n"
 
-#: camel/camel-movemail.c:200
+#: camel/camel-movemail.c:199
 #, fuzzy, c-format
 msgid "Could not fork: %s"
 msgstr "Kunne ikkje starta %1."
 
-#: 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 "(Ukjend feil)"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
 #, fuzzy, c-format
 msgid "Error reading mail file: %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
 #, fuzzy, c-format
 msgid "Error writing mail temp file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: 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 ""
@@ -8494,26 +8623,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 "Anna feil"
 
-#: 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 "Klarte ikkje � laste %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 ""
@@ -8561,60 +8690,130 @@ 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 "Kunne ikkje leggja til melding:\n"
+
+#: camel/camel-sasl-gssapi.c:299
+#, fuzzy
+msgid "Unsupported security layer."
+msgstr "Vel modemtype ..."
+
+#: 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"
@@ -8664,7 +8863,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 ""
@@ -8684,35 +8883,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 "Sl�r opp: %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 "Feil i namneoppslag: %s"
 
-#: 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 "Sl�r opp addresse"
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 msgid "Host lookup failed: host not found"
 msgstr "Namneoppslag feila: vert ikkje funnen"
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 msgid "Host lookup failed: unknown reason"
 msgstr "Namneoppslag feila: ukjend grunn"
 
@@ -8724,12 +8923,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
 #, fuzzy, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8738,181 +8937,181 @@ msgstr ""
 "Klarte ikkje � lage katalog %d:\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 "Oppgi ditt OpenPGP-passord"
 
-#: 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 "Den oppgjevne fila finst ikkje."
 
-#: 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 "Den faste katalogen som er spesifisert for %1 finst ikkje."
 
-#: 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 "Kunne ikkje lasta biletet '%1'\n"
 
-#: 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 "Klarte ikkje � dekode melding."
 
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
 #, fuzzy
 msgid "Failed to verify certificates."
 msgstr "�tvaring ved &tilbaketrekte sertifikat"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Klarar ikkje � opprette mappe: Ugyldig operasjon p� dette lageret"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 #, fuzzy
 msgid "Unable to get issuer's certificate"
 msgstr "�tvaring ved &tilbaketrekte sertifikat"
 
-#: 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 "�tvaring ved &tilbaketrekte sertifikat"
 
-#: 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 "Signaturfil:"
 
-#: 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 "_Sertifikat-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 "Feil ved asting av %s"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 #, fuzzy
 msgid "Out of memory"
 msgstr "Ute av kontoret"
 
-#: 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 "�tvaring ved &tilbaketrekte sertifikat"
 
-#: 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 "_Sertifikat-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 "Ugyldig argument"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 #, fuzzy
 msgid "Certificate untrusted"
 msgstr "_Sertifikat-ID:"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 #, fuzzy
 msgid "Certificate rejected"
 msgstr "_Sertifikat-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"
@@ -8921,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
 #, fuzzy, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8947,7 +9146,7 @@ msgstr ""
 "Vil du akseptere likevel?"
 
 #. 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"
@@ -8962,35 +9161,35 @@ msgstr ""
 "\n"
 "Vil du akseptere likevel?"
 
-#: 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 "_Sertifikat-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 "_Sertifikat-ID:"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Klarter ikkje � tolke URL fr� �%s�"
@@ -9007,40 +9206,40 @@ msgstr ""
 msgid "No such message %s in %s"
 msgstr "Inga slik melding %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 "Berre sjekk for ny e-post."
 
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:261
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-vee-store.c:319
+#: camel/camel-vee-store.c:280
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-vee-store.c:340
+#: camel/camel-vee-store.c:301
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Leitar etter tilleggsmodular"
 
 #: 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 "Operasjonen vart avbroten"
 
 #: 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 ""
@@ -9063,54 +9262,54 @@ msgstr "Slett e-post fr� tenaren"
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando feila: %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 ""
 
-#: 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
 #, fuzzy, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: camel/providers/imap/camel-imap-folder.c:240
+#: camel/providers/imap/camel-imap-folder.c:241
 #, fuzzy, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 "Leitar etter endra meldingar"
 
-#: 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 "Klarte ikkje � dekode melding."
 
-#: 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"
@@ -9119,24 +9318,24 @@ msgstr ""
 "Klarar ikkje � hente melding: %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 "Ingen slik melding"
 
-#: 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 "Denne meldinga er ikkje tilgjengeleg."
 
-#: 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 ""
 
@@ -9169,7 +9368,7 @@ msgstr "Ser etter ny e-post"
 msgid "Check for new messages in all folders"
 msgstr "Berre sjekk for ny e-post."
 
-#: 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 "Mapper"
 
@@ -9199,7 +9398,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 "Passord"
 
@@ -9217,59 +9416,58 @@ msgstr "IMAP-tenar %s"
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-teneste 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 "Tilknytning avbroten"
 
-#: 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 "Klarte ikkje � kople 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
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 "Operasjonen vart stoppa"
 
-#: 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 forhandlinga feila"
 
-#: 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-tenaren %s s�ttar ikkje den �nska autentiseringstypa %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
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentisering:"
 
-#: 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 "Du tasta ikkje inn eit passord."
 
-#: 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"
@@ -9279,13 +9477,13 @@ msgstr ""
 "Ikkje i stand til � autentisere mot IMAP-tenar.\n"
 "%s\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 "Vidaresendt melding"
 
-#: 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\""
@@ -9293,12 +9491,12 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: 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 "Ukjend feil"
 
-#: 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 ""
 
@@ -9379,8 +9577,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 ""
@@ -9392,23 +9590,23 @@ msgstr "er ei vanleg fil"
 
 #: 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 "Leitar etter tilleggsmodular"
 
-#: 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
 #, fuzzy, c-format
 msgid "Local mail file %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: 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 ""
@@ -9416,12 +9614,12 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 ""
@@ -9429,7 +9627,7 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
@@ -9439,7 +9637,7 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "Could not save summary: %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 ""
 
@@ -9453,14 +9651,14 @@ msgstr "Kunne ikkje leggja til melding:\n"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Mottek meldingar fr� %1"
 
-#: 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
 #, fuzzy, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9473,14 +9671,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 "Mappa �%s� eksisterar ikkje."
 
 #: 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
 #, fuzzy, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9493,25 +9691,25 @@ 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
 #, fuzzy, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 ""
@@ -9519,31 +9717,31 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-maildir-summary.c:539
+#: camel/providers/local/camel-maildir-summary.c:541
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Berre sjekk for ny e-post."
 
-#: camel/providers/local/camel-maildir-summary.c:640
+#: camel/providers/local/camel-maildir-summary.c:644
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Melding"
 
-#: 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 "Lagrar mappe"
 
-#: 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 "Leitar etter tilleggsmodular"
 
-#: 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 ""
@@ -9551,30 +9749,30 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:278
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Feil ved opning"
 
-#: 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
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr "Mottek meldingar fr� %1"
 
-#: 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 ""
 
@@ -9614,7 +9812,7 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 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 ""
@@ -9622,19 +9820,19 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: 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 "Leitar etter tilleggsmodular"
 
-#: 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 ""
@@ -9642,8 +9840,8 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: 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
 #, fuzzy, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
@@ -9651,47 +9849,47 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: 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
 #, fuzzy, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:621
+#: camel/providers/local/camel-mbox-summary.c:549
 #, fuzzy, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:632
+#: camel/providers/local/camel-mbox-summary.c:560
 #, fuzzy, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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
 #, fuzzy, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjend feil"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 ""
@@ -9711,60 +9909,60 @@ msgstr "Mottek meldingar fr� %1"
 msgid "`%s' is not a directory."
 msgstr "�%s� er ikkje ein katalog"
 
-#: 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 "Kan ikkje opna katalogen %1"
 
-#: 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 "Denne mappa kan ikkje fjernast."
 
-#: 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 "er ei vanleg fil"
 
-#: 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 "Fila finst ikkje\n"
 
-#: 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� er ikkje ei vanleg fil."
 
-#: 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 ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: 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 "Denne mappa kan ikkje fjernast."
 
-#: camel/providers/local/camel-spool-store.c:213
+#: camel/providers/local/camel-spool-store.c:217
 #, fuzzy
 msgid "Spool folders cannot be renamed"
 msgstr "Denne mappa kan ikkje fjernast."
 
-#: camel/providers/local/camel-spool-store.c:221
+#: camel/providers/local/camel-spool-store.c:225
 #, fuzzy
 msgid "Spool folders cannot be deleted"
 msgstr "Denne mappa kan ikkje slettast."
 
-#: 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 ""
@@ -9772,13 +9970,13 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 ""
@@ -9859,44 +10057,44 @@ msgid "Retrieving POP summary"
 msgstr "Mottek meldingar fr� %1"
 
 #: 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 "Operasjonen vart avbroten"
 
-#: 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 "Leitar etter tilleggsmodular"
 
-#: camel/providers/pop3/camel-pop3-folder.c:306
+#: camel/providers/pop3/camel-pop3-folder.c:308
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Sentrer dei valte elementa"
 
-#: camel/providers/pop3/camel-pop3-folder.c:401
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, fuzzy, c-format
 msgid "No message with uid %s"
 msgstr "Lag meldingar og sl� saman"
 
 #. 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 "Mottek meldingar fr� %1"
 
-#: 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 "Kan ikkje setja blokkstorleik for band."
 
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Kjende program"
@@ -9916,7 +10114,7 @@ msgstr "&La e-posten liggja p� tenaren."
 msgid "Delete after %s day(s)"
 msgstr "Slett denne adressa"
 
-#: 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"
 
@@ -9937,66 +10135,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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\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 "
 "mechanism."
 msgstr "Autentisering:"
 
-#: 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-kommando feila: %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 "Kunne ikkje starta underprosess."
 
-#: 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 "Oppgi ditt OpenPGP-passord"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:614
+#: camel/providers/pop3/camel-pop3-store.c:625
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Inga slik 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"
 
@@ -10006,50 +10204,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 "Klarter ikkje � tolke URL fr� �%s�"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, fuzzy, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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
 #, fuzzy, c-format
 msgid "Could not send message: %s"
 msgstr "Vidaresendt melding fr� %1"
 
-#: 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"
 
@@ -10057,142 +10255,142 @@ 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
 #, fuzzy
 msgid "Help message"
 msgstr "Lagra melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr "Teneste klar"
 
-#: 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 "Ingen passord oppgitt."
 
-#: 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
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Feil svar p� 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 "Meldinga ser ikkje ut til � vere skikkeleg forma"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Feil svar p� 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 "Autentisering:"
 
-#: 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 "Oppgi ditt OpenPGP-passord"
@@ -10219,12 +10417,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 "Sen melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:703
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
@@ -10233,66 +10431,66 @@ msgstr ""
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Meldinga har ingen sendar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "M�te"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 #, fuzzy
 msgid "HELO response error"
 msgstr "Feil svar p� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentisering:"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Feil svar p� RSET: %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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
@@ -10300,83 +10498,83 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 #. 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 "Feil svar p� 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
 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 "Feil svar p� 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Feil svar p� 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 "vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:520
+#: composer/e-msg-composer-attachment-bar.c:503
 #, fuzzy
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern det valte programmet fr� lista"
 
-#: composer/e-msg-composer-attachment-bar.c:551
+#: composer/e-msg-composer-attachment-bar.c:533
 #, fuzzy
 msgid "Add attachment..."
 msgstr "Vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:552
+#: composer/e-msg-composer-attachment-bar.c:534
 #, fuzzy
 msgid "Attach a file to the message"
 msgstr "Kunne ikkje lagra melding(ar)."
 
-#: 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 "Leitar etter tilleggsmodular"
 
-#: 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 "er ei vanleg fil"
@@ -10395,11 +10593,15 @@ msgid "MIME type:"
 msgstr "MIME-type:"
 
 #: 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
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
@@ -10411,46 +10613,46 @@ msgstr "Legg adresse til adresseboka"
 #. * 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 "Svar-til:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:411
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Fr�:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:432
+#: composer/e-msg-composer-hdrs.c:532
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn p� meldinga."
 
-#: 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."
@@ -10459,27 +10661,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 "Ingen skildring"
 
-#: 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 "Legg ved fil"
 
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:533
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10488,53 +10691,56 @@ msgstr ""
 "Feil ved lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1160
-msgid "Warning!"
-msgstr "�tvaring:"
-
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Fila eksisterar, skriv over?"
 
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1193
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1207
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil ved lasting av fil %s"
 
-#: composer/e-msg-composer.c:1240
+#: composer/e-msg-composer.c:1254
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1262
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikkje motta fil"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1276
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
+
+#: composer/e-msg-composer.c:1294
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10543,13 +10749,13 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: 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"
@@ -10559,34 +10765,39 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: 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 "�tvaring: Melding er endra"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Signature:"
 msgstr "Lagre signatur"
 
-#: 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 "Skriv ei melding"
 
-#: 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"
@@ -10595,30 +10806,19 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr "Kan ikkje laga nytt vindauge.\n"
 
-#: 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 "Kan ikkje laga nytt vindauge.\n"
 
-#: 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 "Klarar ikkje � starte Evolution-komponisten."
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Gruppevareverktyet Evolution"
@@ -10667,8 +10867,111 @@ msgstr "Emne inneheld"
 msgid "Subject does not contain"
 msgstr "Emne inneheld ikkje"
 
-#: 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 "Ute av kontoret"
+
+#: designs/OOA/ooa.glade.h:5
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "_Status:"
+
+#: 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 "Ute av kontoret"
+
+#: designs/OOA/ooa.glade.h:13
+#, fuzzy
+msgid "Yes, Change Status"
+msgstr "Status"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:2
+#, fuzzy
+msgid "<b>Receiving Email</b>"
+msgstr "Mottek e-post"
+
+#: designs/read_receipts/read.glade.h:3
+#, fuzzy
+msgid "<b>Sending Email:</b>"
+msgstr "Send"
+
+#: 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 "Mottakarar"
+
+#: 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?"
@@ -10676,217 +10979,243 @@ msgstr ""
 "Ei fil med det namnet finst alt.\n"
 "Vil du skrive over den?"
 
-#: e-util/e-passwords.c:363
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "Skriv over fil?"
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Husk dette passordet"
 
-#: 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 "Kategoriar"
 
 #. 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 ""
 
 #. 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 %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 "%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 "%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 "%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 "%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 "%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 "sekund"
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr "1 sekund"
 
-#: filter/filter-datespec.c:71
-msgid "minute"
-msgstr "minutt"
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr "%d sekund"
 
-#: filter/filter-datespec.c:72
-msgid "hour"
-msgstr "time"
+#: filter/filter-datespec.c:66
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 minutt"
 
-#: filter/filter-datespec.c:74
-msgid "week"
-msgstr "veke"
+#: filter/filter-datespec.c:66
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "%d minutt"
 
-#: filter/filter-datespec.c:74 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "veker"
+#: filter/filter-datespec.c:67
+#, fuzzy
+msgid "1 hour ago"
+msgstr "1 time"
+
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d timar"
 
-#: filter/filter-datespec.c:75
-msgid "month"
+#: 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 " sidan"
+
+#: filter/filter-datespec.c:69
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 veke"
+
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d veker"
+
+#: filter/filter-datespec.c:70
+#, fuzzy
+msgid "1 month ago"
 msgstr "m�nad"
 
-#: filter/filter-datespec.c:75 filter/filter.glade.h:23
-msgid "months"
-msgstr "m�nader"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr " sidan"
 
-#: filter/filter-datespec.c:76
-msgid "year"
-msgstr "�r"
+#: filter/filter-datespec.c:71
+msgid "1 year ago"
+msgstr ""
 
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
-msgid "years"
-msgstr "�r"
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr " sidan"
 
-#: filter/filter-datespec.c:174
+#: filter/filter-datespec.c:176
 #, fuzzy
 msgid "You must choose a date."
 msgstr "Du har gl�ymt � velje ein dato."
 
-#: filter/filter-datespec.c:269
+#: filter/filter-datespec.c:275
 msgid "<click here to select a date>"
 msgstr "<klikk her for � velje ein dato>"
 
-#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
 msgid "now"
 msgstr "no"
 
 #. 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 "%d. %a %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 " sidan"
-
-#: filter/filter-datespec.c:407
+#: filter/filter-datespec.c:406
 #, fuzzy
 msgid "Select a time to compare against"
 msgstr "Vel ei biletefil"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 #, fuzzy
 msgid "Filter Rules"
 msgstr "Filter-reglar"
 
-#: 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 "Stilnamn:"
 
-#: 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 "%1 finst, men er inga vanleg fil"
 
-#: filter/filter-file.c:307
+#: filter/filter-file.c:298
 #, fuzzy
 msgid "Choose a file"
 msgstr "Vel ei handling:"
 
 #. and now for the action area
-#: filter/filter-filter.c:513
+#: filter/filter-filter.c:491
 #, fuzzy
 msgid "Then"
 msgstr "Tiaren"
 
-#: filter/filter-filter.c:527
-msgid "Add action"
-msgstr "Legg til handling"
-
-#: 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 "Stilnamn:"
 
-#: 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 "Vel mappe"
 
-#: filter/filter-input.c:200
+#: filter/filter-input.c:191
 #, fuzzy, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10895,79 +11224,77 @@ msgstr ""
 "Feil ved lesing av fil:\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 "Viktig"
 
 #. 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 "etter"
 
-#: 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 "Du gi dette filteret eit namn."
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:751
 msgid "Rule name: "
 msgstr "Regelnamn: "
 
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:755
 msgid "Untitled"
 msgstr "Utan tittel"
 
-#: filter/filter-rule.c:785
+#: filter/filter-rule.c:772
 msgid "If"
 msgstr "Dersom"
 
-#: filter/filter-rule.c:803
+#: filter/filter-rule.c:790
 #, fuzzy
 msgid "Execute actions"
 msgstr "K�yr autorun.sh"
 
-#: 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 "Legg til kriterium"
-
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "incoming"
 msgstr "inkomande"
 
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "outgoing"
 msgstr "Utg�ande"
 
@@ -11010,7 +11337,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 "Virtuelle mapper"
 
@@ -11023,6 +11350,14 @@ msgstr "Vis hendingane for denne dagen"
 msgid "ago"
 msgstr "sidan"
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "m�nader"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr "sekund"
+
 #: filter/filter.glade.h:25
 #, fuzzy
 msgid "specific folders only"
@@ -11041,6 +11376,10 @@ msgstr "ei tid du spesifiserar"
 msgid "vFolder Sources"
 msgstr "vMappe-kjelder"
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "veker"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr ""
@@ -11053,6 +11392,10 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "�r"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11182,7 +11525,7 @@ msgstr "er ikkje"
 msgid "is not Flagged"
 msgstr "er ikkje flagga"
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 msgid "Label"
 msgstr "Etikett"
 
@@ -11212,7 +11555,7 @@ msgstr "Send melding til kontakt"
 msgid "Play Sound"
 msgstr "Spel lyd:"
 
-#: 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 "Les"
 
@@ -11243,12 +11586,12 @@ msgstr "er st�rre enn"
 msgid "returns less than"
 msgstr "er mindre enn"
 
-#: 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 "Poengsum"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "Avsendar"
 
@@ -11286,8 +11629,9 @@ msgstr "byrjar med"
 msgid "Stop Processing"
 msgstr "Stopp prosessering"
 
-#: 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 "Emne"
 
@@ -11296,75 +11640,91 @@ msgstr "Emne"
 msgid "Unset Status"
 msgstr "Sett status"
 
-#: filter/rule-editor.c:180
-msgid "Rules"
-msgstr "Linjer"
-
-#: 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 "Linjer"
+
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: filter/rule-editor.c:388
+#: filter/rule-editor.c:372
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
-#: filter/score-editor.c:130
+#: filter/rule-editor.c:689
+#, fuzzy
+msgid "Rule name"
+msgstr "Regelnamn: "
+
+#: filter/score-editor.c:114
 #, fuzzy
 msgid "Score Rules"
 msgstr "Rediger filterreglar"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 msgid "You must name this vfolder."
 msgstr "Du m� gi denne mappa eit namn."
 
-#: 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 "vMappe-kjelder"
+
+#: 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 "Importerar ..."
 
 #: 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 "Venlegast 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 "Importerar %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
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Sender %1"
 
 #: 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 "E-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"
 
@@ -11374,12 +11734,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 "Prioritet: %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"
@@ -11394,7 +11754,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"
@@ -11402,7 +11762,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"
@@ -11411,17 +11771,17 @@ 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 "Papirkorg"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr ""
@@ -11429,34 +11789,36 @@ msgstr ""
 "%1"
 
 #: 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 "Leitar etter tilleggsmodular"
 
-#: 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 "Startar importering"
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Rediger filter"
 
-#: 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 "Evolution importerar dine galme Pine-data"
 
-#: 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?"
@@ -11464,143 +11826,129 @@ msgstr ""
 "Evolution har funne Pine e-postfiler.\n"
 "Vil du importere desse inn i 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 "�ydelagd oppsettfil."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "�ydelagd oppsettfil."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Mailer."
-msgstr "�ydelagd oppsettfil."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "�ydelagd oppsettfil."
-
-#: 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 "�ydelagd oppsettfil."
 
-#: 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 "Evolutionskomponent for � handtere e-post."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 #, fuzzy
-msgid "Evolution mail composer."
-msgstr "Kan ikkje initialisera lokale variablar"
+msgid "Evolution Mail accounts configuration control"
+msgstr "�ydelagd oppsettfil."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 #, fuzzy
-msgid "Evolution mail executive summary component."
+msgid "Evolution Mail component"
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "Evolution mail folder display component."
+msgid "Evolution Mail composer"
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "�ydelagd oppsettfil."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Oppsett"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
 #, fuzzy
-msgid "Evolution mail folder factory component."
+msgid "Evolution Mail folder viewer"
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
 #, fuzzy
-msgid "Factory for the Evolution composer."
+msgid "Evolution Mail font configuration control"
 msgstr "�ydelagd oppsettfil."
 
-#: 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 "�ydelagd oppsettfil."
+msgid "Evolution Mail preferences control"
+msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 #, fuzzy
 msgid "Font Preferences"
 msgstr "Repetering"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Kontoar"
 
-#: 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
-#, fuzzy
-msgid "Mail configuration interface"
-msgstr "Oppsett"
-
-#: mail/component-factory.c:102
+#: mail/component-factory.c:116
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Fil alt i liste"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public Mail"
 msgstr "Offentleg"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "Fil alt i liste"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Virtuell papirkorg"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "Mapper"
 
-#: mail/component-factory.c:132
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Denne mappe kan ikkje innehalde meldingar."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Eigenskapar ..."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Endra namnet p� spelarane"
 
-#: 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."
@@ -11608,289 +11956,284 @@ msgstr ""
 "Nokre av e-postinstillingane dine ser ut til � vere �ydelagde, sjekk at alt "
 "er i orden."
 
-#: mail/component-factory.c:970
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "Du har ikkje sett opp ein transportmetode for e-post"
 
-#: 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 "�tvaring: Melding er endra"
-
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Ny e-postmelding"
 
-#: 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 "Skriv ei melding"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "New Message Post"
 msgstr "Ny melding"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "_Post Message"
 msgstr "Forrige melding"
 
-#: mail/component-factory.c:1050
+#: mail/component-factory.c:1070
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Ny e-postmelding"
 
-#: mail/component-factory.c:1078
-#, fuzzy
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Klarar ikkje initialisere Evolution sin e-postkomponent"
-
-#: mail/component-factory.c:1087
-#, fuzzy
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Kan ikkje initialisera lokale variablar"
-
-#: mail/component-factory.c:1093
-#, fuzzy
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Kan ikkje initialisera lokale variablar"
-
-#: mail/component-factory.c:1334 mail/component-factory.c:1364
+#: mail/component-factory.c:1353
 #, fuzzy
 msgid "Connecting..."
 msgstr " Koplar til tenar ..."
 
-#: mail/component-factory.c:1375
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Klarar ikkje � registrer lager med skal"
 
-#: mail/folder-browser-ui.c:471
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenskapar for �%s�"
 
-#: mail/folder-browser-ui.c:473
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Eigenskapar"
 
-#: 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 "Klarte ikkje � lage mellombels katalog: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr "%d nye"
 
-#: 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 g�ymde"
 
-#: 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 valde"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr "%d usendt"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d sent"
 msgstr "%d sendt"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1118
+#: mail/folder-browser.c:1182
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Mapper"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "vMappe p� _emne"
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "vMappe p� avse_dar"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "vMappe p� mottaka_r"
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "vMappe p� e-post_liste"
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "Filtr�r p� _emne"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "Filtr�r p� avsen_dar:"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1738
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Skriv ut filer"
 
-#: 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 "Fil alt i liste"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding .."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: 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 "Sva_r til avsendar"
 
-#: 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 "Svar til _liste"
 
-#: 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 "Svar til _alle"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "_Vidaresend"
 
-#: 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 "Ferdig"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1772
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "T�m"
 
 #. 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_ker som lesen"
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1777
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marker som _ulesen"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "Marker som v_iktig"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1779
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marker som uvi_ktig"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1784
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Slett"
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1788
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Flytt til _mappe ..."
 
-#: 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 "_Kopier til mappe ..."
 
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1797
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Legg til avsendar i adresseboka"
 
-#: mail/folder-browser.c:1774
+#: mail/folder-browser.c:1801
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Bruk filter"
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1805
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Mapper"
 
-#: mail/folder-browser.c:2036
+#: mail/folder-browser.c:2064
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:2038
+#: mail/folder-browser.c:2066
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtr�r p� e-postliste (%s)"
 
-#: mail/folder-browser.c:2039
+#: mail/folder-browser.c:2067
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Fil alt i liste"
 
-#: 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 "Forvald"
 
-#: mail/folder-info.c:71
+#: mail/folder-info.c:70
 msgid "Getting Folder Information"
 msgstr "Hentar informasjon om mapper"
 
-#: 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 "�ydelagd oppsettfil."
+msgid "Evolution Elm importer"
+msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Importerar mbox-filer inn i Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Fabrikk for � importere Outlook Express 4 e-postar inn i 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 "Import�r Outlook Express 4 filer inn i Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Kan ikkje initialisera lokale variablar"
+
+#: 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 "Kan ikkje initialisera lokale variablar"
 
 #: mail/local-config.glade.h:1
 #, fuzzy
@@ -11929,102 +12272,102 @@ 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 "Du har ikkje fyllt ut all den p�krevde informasjonen."
 
 #. 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 "Evolutions kontohandtering"
 
-#: 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 "_Vert:"
 
-#: 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 "Br_ukarnamn:"
 
-#: 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 "_Sti:"
 
-#: mail/mail-account-gui.c:1847
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikkje opprette to kontoar med det same namnet."
 
-#: mail/mail-accounts.c:224
+#: mail/mail-accounts.c:231
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker p� at du vil sletta denne klassen?"
 
-#: mail/mail-accounts.c:228
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "Ikkje slett"
 
-#: mail/mail-accounts.c:231
-msgid "Really delete account?"
-msgstr "Verkeleg slette 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 "Skru av"
 
-#: 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 "Skru p�"
 
-#: 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 "Forvald"
+
+#: 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 "P�"
 
-#: 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 "Konton_amn:"
 
-#: 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 "Melding til %s"
 
-#: mail/mail-autofilter.c:242
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: mail/mail-autofilter.c:258
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Melding fr� %s"
 
-#: mail/mail-autofilter.c:275
+#: mail/mail-autofilter.c:271
 #, fuzzy, c-format
 msgid "%s mailing list"
 msgstr "E-post&liste for spr�ket:"
 
-#: mail/mail-autofilter.c:327
+#: mail/mail-autofilter.c:323
 #, fuzzy
 msgid "Add Filter Rule"
 msgstr "Filter-reglar"
 
-#: 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"
@@ -12032,7 +12375,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 "Ikkje vis denne meldinga att"
+
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -12044,7 +12392,16 @@ msgstr ""
 "eller skrive e-post.\n"
 "Vil du sette opp dette no?"
 
-#: 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 ""
+"Du m� sette opp ein identitet\n"
+"f�r du skrive e-post."
+
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -12052,7 +12409,7 @@ msgstr ""
 "Du m� sette opp ein identitet\n"
 "f�r du skrive e-post."
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -12061,7 +12418,7 @@ msgstr ""
 "f�r du kan skrive e-post."
 
 #. 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"
@@ -12070,18 +12427,18 @@ msgstr ""
 "Du sender ei HTML-formattert melding, men den f�lgjande mottakeren vil ikkje "
 "ha HTML-formatter e-post:\n"
 
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "Send likevel?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:287
 #, fuzzy
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr "Meldinga har ingen sendar"
 
-#: 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."
@@ -12089,11 +12446,11 @@ msgstr ""
 "Sidan kontaktlista du sender til, er sett opp til � g�yme addressatane, vil "
 "den sette opp alle mottakarane som Bcc."
 
-#: mail/mail-callbacks.c:360
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr "Denne meldinga inneheld kun Bcc-mottakarar."
 
-#: 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"
@@ -12103,181 +12460,198 @@ msgstr ""
 "�Apparently-To�-topptekst.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr "Du m� spesifisere mottakarar for � sende denne meldinga."
 
-#: 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 "ein ukjend avsendar"
 
-#: mail/mail-callbacks.c:1211
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "P� %a, %d/%m/%Y klokka %H:%M, skreiv %%s:"
 
-#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "&Kopier bileteplassering"
 
-#: 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 "Er du sikker p� at du vil sletta %1?"
 
-#: mail/mail-callbacks.c:2406
+#: mail/mail-callbacks.c:2360
 #, fuzzy
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: mail/mail-callbacks.c:2445
+#: mail/mail-callbacks.c:2393
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: 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 "Er du sikker p� at du vil fjerna %1?"
 
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "Ingen meldingar vald!"
 
-#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
-msgid "Overwrite file?"
-msgstr "Skriv over fil?"
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"Klarar ikkje � hente melding: %s\n"
+"  %s"
+
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"%s eksisterar allereide\n"
+"Vil du skrive over?"
 
-#: mail/mail-callbacks.c:2584
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "Lagre melding som ..."
 
-#: mail/mail-callbacks.c:2586
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "Lagre meldingar som ..."
 
-#: mail/mail-callbacks.c:2655
-#, fuzzy
-msgid "Go to next folder with unread messages?"
-msgstr "Vis informasjonsmelding"
-
-#: 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
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Les filinformasjon"
 
-#: mail/mail-callbacks.c:3030
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:3074
+#: mail/mail-callbacks.c:2831
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: mail/mail-callbacks.c:3129
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: 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 "Utskrift av melding feila"
 
-#: 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 "Er du sikker p� at du vil sletta denne overf�ringa?"
 
-#: 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 "Kontakt utan namn"
 
-#: 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 "Ingen skildring"
+msgid "You must specify a valid script name."
+msgstr "Stilnamn:"
 
-#: 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 "Ingen skildring"
 
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
+#: mail/mail-composer-prefs.c:864
 #, fuzzy
-msgid "Unnamed"
-msgstr "Kontakt utan namn"
+msgid "Language(s)"
+msgstr "Spr�k"
 
-#: mail/mail-composer-prefs.c:875
+#: mail/mail-composer-prefs.c:906
 #, fuzzy
 msgid "Add script signature"
 msgstr "Legg til kriterium"
 
-#: mail/mail-composer-prefs.c:876
+#: mail/mail-composer-prefs.c:926
 #, fuzzy
-msgid "Add Signature"
-msgstr "Lagre signatur"
+msgid "Signature(s)"
+msgstr "_HTML-signatur:"
+
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr "Identitet"
 
-#: 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
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "Mottak av e-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."
 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 "Sender e-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."
 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 "
@@ -12286,467 +12660,446 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:637
-#, fuzzy
-msgid "Evolution Account Assistant"
-msgstr "KDeelop-installering"
-
-#: 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 "Sjekkar teneste"
 
-#: 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 " Koplar til tenar ..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid " _Check for supported types "
 msgstr "Vel modemtype ..."
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: 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
 #, fuzzy
 msgid "Account Information"
 msgstr "Informasjon"
 
-#: 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 "Legg til kriterium"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Lagre signatur"
 
-#: 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 "Kunne ikkje lagra melding(ar)."
 
-#: 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 "Vedlegg"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "enkle innlegg"
 
-#: 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 "Ukjent teiknsett: %s"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "C_olors"
 msgstr "_Lukk"
 
-#: 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 "Ser etter ny e-post"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Farge eller pixmap"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Skriv ei melding"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Oppsett"
 
-#: 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 "_Standard"
 
-#: 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 "Standardteiknsett"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Hentar e-post"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digital IDs..."
 msgstr "Digitale IDar ..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Kan ikkje opne melding"
 
-#: 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 "Ferdig"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Lagra i &kladdemappe"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "S_l� p�"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Emacs"
 msgstr "Aust"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email Accounts"
 msgstr "E-post inneheld"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Email _address:"
 msgstr "E-postadresse:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "T�m papirkorg ved avslutting"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Evolution Account Assistant"
+msgstr "KDeelop-installering"
+
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Execute Command..."
 msgstr "K�yr autorun.sh"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "sluttar med"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Font Properties"
 msgstr "Eigenskapar"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Get Digital ID..."
 msgstr "Les band-ID ..."
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Merkingsvilk�r"
 
-#: 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 "Identitet"
-
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Innvevd"
 
-#: 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 "Lagre og lukk"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "Last b_ileter"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Oppsett for post"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Postkaseeplassering"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Melding motteken"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "_Meldingsvisning"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Meldinga inneheld"
+
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronesia"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Oppsett for 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 "Valfri informasjon"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_sasjon:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP-lykje ID:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Vel ein farge"
 
-#: 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 "Sender meldingar til %1"
 
-#: 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 "&Innhald ..."
 
-#: 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 "Kan ikkje opne melding"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr "_Husk dette passordet"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Svar-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 "Mottek e-post"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Val for mottak"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Husk dette passordet"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Required Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Forvald"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Tryggleik"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Trygg 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
 #, fuzzy
 msgid "Sending Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Mottek meldingar fr� %1"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Send meldingar"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Autentisering:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Tenar-oppsett"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "Tenar-_type: "
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Snarvegar"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stilnamn:"
 
-#: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
-msgstr ""
-
 #: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
@@ -12784,7 +13137,7 @@ msgstr "Variabel"
 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
@@ -12857,120 +13210,125 @@ msgid "_Enable"
 msgstr "Skru p�"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr ""
-
-#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Vidaresend som"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Fullt namn:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "I HTML-e-post"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "Last alle bileta i ein katalog"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Gjer _dette til min standardkonto"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Merk meldingar som lest etter"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "Last aldri bileter fr� _nettet"
 
-#: 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 "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Mottak av e-post"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Svar til alle"
 
-#: 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 "_Tryggleik"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Sender e-post"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Vis tid som"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML-signatur:"
 
+#: 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 "Bruk sikker tilknytning (SSL)"
+msgid "_Terminal Font:"
+msgstr "Opprinneleg kontakt:"
 
 #: mail/mail-config.glade.h:176
 #, fuzzy
-msgid "_Variable-width:"
-msgstr "Variabel"
+msgid "_Use secure connection (SSL):"
+msgstr "Bruk sikker tilknytning (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 "_kvar"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "color"
 msgstr "farge"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "skildring"
 
@@ -12999,198 +13357,202 @@ msgstr "Kunne ikkje laga kio-jobb.\n"
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-display.c:321
+#: mail/mail-display.c:193
+#, fuzzy, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Ei fil med det namnet finst alt.\n"
+"Vil du skrive over den?"
+
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:386
+#: mail/mail-display.c:406
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Klarte ikkje � lage mellombels katalog: %s"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:454
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:433
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr "Vis innvevd"
 
-#: mail/mail-display.c:434
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "Opne i %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 "G�ym"
 
-#: mail/mail-display.c:519
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "Ekstern visar"
 
-#: mail/mail-display.c:1319
+#: mail/mail-display.c:1365
 #, fuzzy
 msgid "Downloading images"
 msgstr "Last b_ileter"
 
-#: mail/mail-display.c:1496
+#: mail/mail-display.c:1542
 #, fuzzy
 msgid "Loading message content"
 msgstr "Markerer meldingar"
 
-#: mail/mail-display.c:1783
+#: mail/mail-display.c:1879
 #, fuzzy
 msgid "Overdue:"
 msgstr "&Syntaksmerkingsmodusar"
 
-#: mail/mail-display.c:1787
+#: mail/mail-display.c:1883
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d. %b %k:%M"
 
-#: mail/mail-display.c:2114
+#: mail/mail-display.c:2240
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Opna ved innsetjing"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Kopier lenkjeadresse"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Lagre lenkje som "
 
-#: mail/mail-display.c:2119
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Lagre  bilete som ..."
 
-#: mail/mail-folder-cache.c:743
+#: mail/mail-folder-cache.c:744
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Sender %1"
 
-#: mail/mail-format.c:656
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr "%s vedlegg"
 
-#: 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 "Dato"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr "Ugyldig addresse"
 
-#: 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 "Fr�"
 
-#: mail/mail-format.c:917
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: 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 "Til"
 
-#: 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 "E-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 "Kunne ikkje laga kio-jobb.\n"
 
-#: 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 "Lokale mapper"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Les mapper"
 
-#: 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 "Klarar ikkje � lagre mappemetainfo til %s: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:804
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Klarar ikkje � lagre mappemetainfo til %s: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -13200,18 +13562,18 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 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 "Set opp %1"
 
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
@@ -13234,118 +13596,118 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Arbeidar"
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Les mapper"
 
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Hentar e-post"
 
-#: 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 "Sender �%s�"
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Markerer meldingar"
 
-#: 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 "Ferdig."
 
-#: mail/mail-ops.c:853
+#: mail/mail-ops.c:844
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Mottek meldingar fr� %1"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meldingar til %s"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Melding"
 
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar gjennom mapper i �%s�"
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-ops.c:1277
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Opnar mappe %s"
 
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1340
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1422
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjernar mappe %s"
 
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappe �%s�"
 
-#: mail/mail-ops.c:1567
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Friskar opp mappe"
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1594
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Forventar %1"
 
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hentat melding %s"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Mottek %d melding(ar)"
 
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1801
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Lagrar %d melding(ar)"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1877
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13354,65 +13716,65 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "Lagrar vedlegg"
 
-#: mail/mail-ops.c:2041
+#: mail/mail-ops.c:1968
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:2071
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Klarte ikkje � skrive data: %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar fr� %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Koplar til %s p� nytt"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "_S�k"
-
-#: mail/mail-search.c:137
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(Melding utan tittel)"
 
-#: mail/mail-search.c:240
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "Melding utan tittel"
 
-#: mail/mail-search.c:244
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "Tom melding"
 
-#: mail/mail-search.c:291
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "Finn i melding"
 
-#: mail/mail-search.c:321
+#: mail/mail-search.c:285
+msgid "Search"
+msgstr "S�k"
+
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "Skil mellom store og sm� bokstavar"
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr "S�k framover"
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "Finn:"
 
-#: mail/mail-search.c:346
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "Treff:"
 
@@ -13420,69 +13782,65 @@ msgstr "Treff:"
 msgid "Cancelling..."
 msgstr "Avbryt ..."
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tenar: %s, Type: %s"
 
-#: 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 "Type: %s"
 
-#: mail/mail-send-recv.c:293
+#: mail/mail-send-recv.c:297
 msgid "Send & Receive Mail"
 msgstr "Send og motta e-post"
 
-#: mail/mail-send-recv.c:295
+#: mail/mail-send-recv.c:299
 msgid "Cancel All"
 msgstr "Avbryt alle"
 
-#: mail/mail-send-recv.c:355
+#: mail/mail-send-recv.c:378
 msgid "Updating..."
 msgstr "Oppdaterar ..."
 
-#: 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 "Ventar ..."
 
-#: mail/mail-session.c:221
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr "Brukar avbraut operasjonen."
 
-#: mail/mail-session.c:272
-#, fuzzy
-msgid "_Remember this password"
-msgstr "Fjern denne oppf�ringa"
-
-#: 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 "Tast inn passord for %s"
 
-#: mail/mail-session.c:333
+#: mail/mail-session.c:260
 msgid "Enter Password"
 msgstr "Tast inn passord"
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-session.c:280
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Fjern denne oppf�ringa"
+
+#: 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 "Klarte ikkje � lagre signaturfil."
 
-#: mail/mail-signature-editor.c:175
-msgid "Save signature"
-msgstr "Lagre signatur"
-
-#: 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"
@@ -13492,43 +13850,51 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: 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 "Lagre signatur"
+
+#: mail/mail-signature-editor.c:389
 #, fuzzy
 msgid "Edit signature"
 msgstr "Legg til kriterium"
 
-#: 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 "Namn:"
 
-#: mail/mail-tools.c:262
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidaresendt melding - %s"
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Set opp vMappe: %s"
 
-#: 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"
@@ -13537,98 +13903,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 "vMapper"
 
-#: mail/mail-vfolder.c:819
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:861
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Rediger vMappe"
 
-#: mail/mail-vfolder.c:877
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pr�var � redigere ei vmappe �%s� som ikkje finnest."
 
-#: mail/mail-vfolder.c:931
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Ny vMappe"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(Ikkje noko emne)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - melding"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:740
 msgid "Unseen"
 msgstr "Ulesen"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:741
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr "Svara"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:743
 msgid "Multiple Unseen Messages"
 msgstr "Fleire uleste meldingar"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:744
 msgid "Multiple Messages"
 msgstr "Fleire meldingar"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:748
 msgid "Lowest"
 msgstr "Lavast"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:749
 msgid "Lower"
 msgstr "Senk"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:753
 msgid "Higher"
 msgstr "H�gare"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:754
 msgid "Highest"
 msgstr "H�gast"
 
-#: 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 "I dag, %H:%M"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "I g�r %H:%M"
 
-#: mail/message-list.c:1094
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1102
+#: mail/message-list.c:1116
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %k:%M"
 
-#: 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 "Opprettar meldingsliste"
 
@@ -13663,47 +14029,47 @@ msgstr "Mottatt"
 msgid "Size"
 msgstr "Storleik"
 
-#: 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 "G� framover"
 
-#: 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 "Tenarinformasjon"
 
-#: 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 "Vidaresend"
 
-#: 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 "Svar"
 
-#: 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 "Svar til alle"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:71
 #, fuzzy
 msgid "Review"
 msgstr "F�rehandsvisning"
 
-#: 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 ""
 
@@ -13733,52 +14099,43 @@ msgstr "Ferdig"
 msgid "_Flag:"
 msgstr "Flagga"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Leitar gjennom mapper under %s p� �%s�"
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Leitar gjennom rotniv�-mapper p� �%s�"
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abbonerar p� mappe �%s�"
 
-#: mail/subscribe-dialog.c:338
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjernar abonnement p� mappe �%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 "Mappe"
 
-#: mail/subscribe-dialog.c:1450
+#: mail/subscribe-dialog.c:1389
 msgid "Scanning folders..."
 msgstr "Leiter gjennom mapper ..."
 
-#: mail/subscribe-dialog.c:1557
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Ingen tenar har vorte vald"
 
-#: mail/subscribe-dialog.c:1621
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Velj ein tenar"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "All folders"
-msgstr "Alle mapper"
-
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "Apri file"
-msgstr "April"
-
 #: 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
@@ -13789,65 +14146,47 @@ msgid "Close"
 msgstr "Lukk"
 
 #: mail/subscribe-dialog.glade.h:4
-msgid "Display Options"
-msgstr "Vis val"
-
-#: mail/subscribe-dialog.glade.h:5
-msgid "Folders whose names begin with:"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:6
 msgid "Manage Subscriptions"
 msgstr "Handsam abonnement"
 
-#: 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 "Frisk opp liste"
 
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:6
 #, fuzzy
 msgid "S_elect server: "
 msgstr "Vel ei fil"
 
-#: mail/subscribe-dialog.glade.h:9
-#, fuzzy
-msgid "Salve file"
-msgstr "Vel ei fil"
-
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "_Abbon�r"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "_Fjern abbonnment"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for the Evolution Summary."
-msgstr "Evolutionkomponent for Mitt samandrag"
-
-#: 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 "Evolutionkomponent for Mitt samandrag"
 
-#: 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 "Kan ikkje initialisera lokale variablar"
 
-#: 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 "�ydelagd oppsettfil."
+msgid "Evolution Summary component"
+msgstr "Kan ikkje initialisera lokale variablar"
 
-#: 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 "Kan ikkje initialisera lokale variablar"
+msgid "Evolution Summary configuration control"
+msgstr "�ydelagd oppsettfil."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 #, fuzzy
 msgid "Summary Preferences"
 msgstr "Innstillingar for samandrag"
@@ -17250,7 +17589,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 "Hagl"
 
@@ -18944,6109 +19283,6099 @@ 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-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 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 "Mosj�en"
 
-#: 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 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 "Naha 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 "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 "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 "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 "North 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 "North 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 "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 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
 #, 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 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 "�rsta-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/Gardermoen"
 
-#: 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 "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 "Kina"
 
-#: 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 "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 "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
 #, 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 "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 "R�nneby"
 
-#: 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 "R�ros"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1916
 msgid "Rorvik/Ryum"
 msgstr "R�rvik/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 "Russland"
 
-#: 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 "Sandnessj�en/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 ""
 
-#: 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 "S�rkjosen"
 
-#: 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 "South 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/S�rstokken"
 
-#: 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-Harn�sand"
 
-#: 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 "Svolv�r/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
 #, 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 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 ""
 
-#: 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 "Troms�/Langnes"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2300
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/V�rnes"
 
-#: 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 "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 "Sameinte Arabiske Emiratar"
 
-#: 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 "Europa/Uzhgorod"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2352
 msgid "Vadso"
 msgstr "Vads�"
 
-#: 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 "V�xj�"
 
-#: 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 "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 "Avtalar"
 
-#: my-evolution/e-summary-calendar.c:382
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
 msgstr "Ingen avtalar"
 
-#: 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 "Ingen skildring"
 
-#: my-evolution/e-summary-mail.c:153
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "Postsamandrag"
 
-#: 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 "Lokale mapper"
 
-#. 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 "ENOV:ENGM"
-
-#: my-evolution/e-summary-preferences.c:584
+#: my-evolution/e-summary-preferences.c:356
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictinary.com Ord for dagen"
 
-#: my-evolution/e-summary-preferences.c:602
+#: my-evolution/e-summary-preferences.c:374
 msgid "Quotes of the Day"
 msgstr "Tips for dagen"
 
-#: my-evolution/e-summary-preferences.c:840
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr "Legg til ei nyhendekjelde"
 
-#: 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 "Oppgi URLen p� den nyhendekjelda du vil leggje til"
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr "Feil ved nedlasting av RDF"
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr "Nyhendekjelde"
 
-#: 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 "Le_gg til"
 
-#: 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 "Ingen oppg�ver"
 
-#: my-evolution/e-summary-tasks.c:372
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(Ingen skildring)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:73
 msgid "My Weather"
 msgstr "Mitt v�r"
 
-#: 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 "V�r"
 
-#: 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 "ENOV:ENGM"
+
+#: 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 "Venlegast vent ..."
 
-#: 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 "Skriv ut samandrag"
 
-#: my-evolution/e-summary.c:640
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Utskrift av samandrag feila"
 
-#: my-evolution/main.c:68
-#, fuzzy
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "Kunne ikkje initiere Bonobo"
-
-#: 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 "knop"
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "kph"
 msgstr "km/t"
 
-#: 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 "engelske mil"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "kilometers"
 msgstr "kilometer"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Clear sky"
 msgstr "Klar himmel"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Broken clouds"
 msgstr "Oppbrotne skyer"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Scattered clouds"
 msgstr "Spreidde skyer"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Few clouds"
 msgstr "F� skyer"
 
-#: my-evolution/metar.c:48
+#: my-evolution/metar.c:49
 msgid "Overcast"
 msgstr "Overskya"
 
-#: 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 "Ugyldig"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Variable"
 msgstr "Variabel"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North"
 msgstr "Nord"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North - NorthEast"
 msgstr "Nord - Nordaust"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Northeast"
 msgstr "Nordaust"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - NorthEast"
 msgstr "Aust - Nordaust"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East"
 msgstr "Aust"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East - Southeast"
 msgstr "Aust - S�raust"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southeast"
 msgstr "S�raust"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southeast"
 msgstr "S�r - S�raust"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South"
 msgstr "S�r"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South - Southwest"
 msgstr "S�r - S�rvest"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Southwest"
 msgstr "S�rvest"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Southwest"
 msgstr "Vest - S�rvest"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West"
 msgstr "Vest"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West - Northwest"
 msgstr "Vest - Nordvest"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "Northwest"
 msgstr "Nordvest"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "North - Northwest"
 msgstr "Nord - Nordvest"
 
 #. DRIZZLE
-#: my-evolution/metar.c:127
+#: my-evolution/metar.c:128
 msgid "Drizzle"
 msgstr "Sm�regn"
 
-#: my-evolution/metar.c:128
+#: my-evolution/metar.c:129
 msgid "Drizzle in the vicinity"
 msgstr "Sm�regn i omr�det"
 
-#: my-evolution/metar.c:129
+#: my-evolution/metar.c:130
 msgid "Light drizzle"
 msgstr "Lett sm�regn"
 
-#: my-evolution/metar.c:130
+#: my-evolution/metar.c:131
 msgid "Moderate drizzle"
 msgstr "Moderat sm�regn"
 
-#: my-evolution/metar.c:131
+#: my-evolution/metar.c:132
 msgid "Heavy drizzle"
 msgstr "Tungt sm�regn"
 
-#: my-evolution/metar.c:132
+#: my-evolution/metar.c:133
 msgid "Shallow drizzle"
 msgstr "Tynt sm�regn"
 
-#: my-evolution/metar.c:133
+#: my-evolution/metar.c:134
 msgid "Patches of drizzle"
 msgstr "Regnbyger"
 
-#: my-evolution/metar.c:134
+#: my-evolution/metar.c:135
 msgid "Partial drizzle"
 msgstr "Delvis sm�regn"
 
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
 msgid "Thunderstorm"
 msgstr "Tordenstorm"
 
-#: my-evolution/metar.c:136
+#: my-evolution/metar.c:137
 msgid "Windy drizzle"
 msgstr "Sm�regn med vind"
 
-#: my-evolution/metar.c:137
+#: my-evolution/metar.c:138
 msgid "Showers"
 msgstr "Regnbyger"
 
-#: my-evolution/metar.c:138
+#: my-evolution/metar.c:139
 msgid "Drifting drizzle"
 msgstr "Drivande sm�regn"
 
-#: my-evolution/metar.c:139
+#: my-evolution/metar.c:140
 msgid "Freezing drizzle"
 msgstr "Frysande sm�regn"
 
 #. RAIN
-#: my-evolution/metar.c:142
+#: my-evolution/metar.c:143
 msgid "Rain"
 msgstr "Regn"
 
-#: my-evolution/metar.c:143
+#: my-evolution/metar.c:144
 msgid "Rain in the vicinity"
 msgstr "Regn i omr�det"
 
-#: my-evolution/metar.c:144
+#: my-evolution/metar.c:145
 msgid "Light rain"
 msgstr "Lett regn"
 
-#: my-evolution/metar.c:145
+#: my-evolution/metar.c:146
 msgid "Moderate rain"
 msgstr "Moderat regn"
 
-#: my-evolution/metar.c:146
+#: my-evolution/metar.c:147
 msgid "Heavy rain"
 msgstr "Tungt regn"
 
-#: my-evolution/metar.c:147
+#: my-evolution/metar.c:148
 msgid "Shallow rain"
 msgstr "Tynt regn"
 
-#: my-evolution/metar.c:148
+#: my-evolution/metar.c:149
 msgid "Patches of rain"
 msgstr "Regnbyger"
 
-#: my-evolution/metar.c:149
+#: my-evolution/metar.c:150
 msgid "Partial rainfall"
 msgstr "Delvis regn"
 
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:152
 msgid "Blowing rainfall"
 msgstr "Regn med vind"
 
-#: my-evolution/metar.c:152
+#: my-evolution/metar.c:153
 msgid "Rain showers"
 msgstr "Regnbyger"
 
-#: my-evolution/metar.c:153
+#: my-evolution/metar.c:154
 msgid "Drifting rain"
 msgstr "Drivande regn"
 
-#: my-evolution/metar.c:154
+#: my-evolution/metar.c:155
 msgid "Freezing rain"
 msgstr "Frysande regn"
 
 #. SNOW
-#: my-evolution/metar.c:157
+#: my-evolution/metar.c:158
 msgid "Snow"
 msgstr "Sn�"
 
-#: my-evolution/metar.c:158
+#: my-evolution/metar.c:159
 msgid "Snow in the vicinity"
 msgstr "Sn� i n�rleiken"
 
-#: my-evolution/metar.c:159
+#: my-evolution/metar.c:160
 msgid "Light snow"
 msgstr "Lett sn�"
 
-#: my-evolution/metar.c:160
+#: my-evolution/metar.c:161
 msgid "Moderate snow"
 msgstr "Moderat sn�"
 
-#: my-evolution/metar.c:161
+#: my-evolution/metar.c:162
 msgid "Heavy snow"
 msgstr "Tung sn�"
 
-#: my-evolution/metar.c:162
+#: my-evolution/metar.c:163
 msgid "Shallow snow"
 msgstr "Grunn sn�"
 
-#: my-evolution/metar.c:163
+#: my-evolution/metar.c:164
 msgid "Patches of snow"
 msgstr "Delvise sn�byger"
 
-#: my-evolution/metar.c:164
+#: my-evolution/metar.c:165
 msgid "Partial snowfall"
 msgstr "Delvis sn�fall"
 
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr "Sn�storm"
 
-#: my-evolution/metar.c:166
+#: my-evolution/metar.c:167
 msgid "Blowing snowfall"
 msgstr "Sn� og vind"
 
-#: my-evolution/metar.c:167
+#: my-evolution/metar.c:168
 msgid "Snow showers"
 msgstr "Sn�byger"
 
-#: my-evolution/metar.c:168
+#: my-evolution/metar.c:169
 msgid "Drifting snow"
 msgstr "Drivande sn�"
 
-#: my-evolution/metar.c:169
+#: my-evolution/metar.c:170
 msgid "Freezing snow"
 msgstr "Frysande sn�"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:172
+#: my-evolution/metar.c:173
 msgid "Snow grains"
 msgstr "Sn�korn"
 
-#: my-evolution/metar.c:173
+#: my-evolution/metar.c:174
 msgid "Snow grains in the vicinity"
 msgstr "Sn�korn i n�rleiken"
 
-#: my-evolution/metar.c:174
+#: my-evolution/metar.c:175
 #, fuzzy
 msgid "Light snow grains"
 msgstr "Lett sn�korn"
 
-#: 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
 #, fuzzy
 msgid "Heavy snow grains"
 msgstr "Tunge sn�korn"
 
-#: my-evolution/metar.c:177
+#: my-evolution/metar.c:178
 #, fuzzy
 msgid "Shallow snow grains"
 msgstr "Vis &informasjon"
 
-#: my-evolution/metar.c:178
+#: my-evolution/metar.c:179
 #, fuzzy
 msgid "Patches of snow grains"
 msgstr "Stiar til spooler-kommandoar:"
 
-#: 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
 #, fuzzy
 msgid "Blowing snow grains"
 msgstr "Rekningsinformasjon"
 
-#: my-evolution/metar.c:182
+#: my-evolution/metar.c:183
 #, fuzzy
 msgid "Snow grain showers"
 msgstr "Vis skjulte ressursar"
 
-#: 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
 #, fuzzy
 msgid "Ice crystals"
 msgstr "Iskrystallar"
 
-#: 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 "Noken iskrystallar"
 
-#: 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 "Tungt med iskrystallar"
 
-#: 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
 #, fuzzy
 msgid "Few ice pellets"
 msgstr "Ny snill-verdi:"
 
-#: my-evolution/metar.c:205
+#: my-evolution/metar.c:206
 #, fuzzy
 msgid "Moderate ice pellets"
 msgstr "Sl� saman celler"
 
-#: 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
 #, fuzzy
 msgid "Shallow ice pellets"
 msgstr "Vis klientar"
 
-#: 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
 #, fuzzy
 msgid "Partial ice pellets"
 msgstr "Tilgjengelege appletar"
 
-#: 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
 #, fuzzy
 msgid "Drifting ice pellets"
 msgstr "Skriv indeksfil"
 
-#: 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 "Hagl i n�rleiken"
 
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
+#: my-evolution/metar.c:220 my-evolution/metar.c:235
 msgid "Light hail"
 msgstr "Lett Hagl"
 
-#: my-evolution/metar.c:220
+#: my-evolution/metar.c:221
 msgid "Moderate hail"
 msgstr "Moderat hagl"
 
-#: my-evolution/metar.c:221
+#: my-evolution/metar.c:222
 msgid "Heavy hail"
 msgstr "Tungt hagl"
 
-#: my-evolution/metar.c:222
+#: my-evolution/metar.c:223
 #, fuzzy
 msgid "Shallow hail"
 msgstr "Vis &alle"
 
-#: my-evolution/metar.c:223
+#: my-evolution/metar.c:224
 #, fuzzy
 msgid "Patches of hail"
 msgstr "Endringsdato"
 
-#: my-evolution/metar.c:224
+#: my-evolution/metar.c:225
 #, fuzzy
 msgid "Partial hail"
 msgstr "Kritisk feil"
 
-#: my-evolution/metar.c:225
+#: my-evolution/metar.c:226
 msgid "Hailstorm"
 msgstr "Haglstorm"
 
-#: my-evolution/metar.c:226
+#: my-evolution/metar.c:227
 #, fuzzy
 msgid "Blowing hail"
 msgstr "lastar fil"
 
-#: my-evolution/metar.c:227
+#: my-evolution/metar.c:228
 #, fuzzy
 msgid "Hail showers"
 msgstr "Ekte brukarar"
 
-#: my-evolution/metar.c:228
+#: my-evolution/metar.c:229
 #, fuzzy
 msgid "Drifting hail"
 msgstr "Utskrift mislukkast."
 
-#: my-evolution/metar.c:229
+#: my-evolution/metar.c:230
 #, fuzzy
 msgid "Freezing hail"
 msgstr "Mottek e-post"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:232
+#: my-evolution/metar.c:233
 #, fuzzy
 msgid "Small hail"
 msgstr "Lite"
 
-#: 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 "Vis &heile meldingshovudet"
 
-#: 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 "Liten haglstorm"
 
-#: my-evolution/metar.c:241
+#: my-evolution/metar.c:242
 #, fuzzy
 msgid "Blowing small hail"
 msgstr "Lukkar alle filer ..."
 
-#: 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
 #, fuzzy
 msgid "Drifting small hail"
 msgstr "Tradisjonell KMail"
 
-#: 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
 #, fuzzy
 msgid "Unknown precipitation"
 msgstr "Kjende program"
 
-#: 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
 #, fuzzy
 msgid "Light precipitation"
 msgstr "Lett regn"
 
-#: my-evolution/metar.c:250
+#: my-evolution/metar.c:251
 #, fuzzy
 msgid "Moderate precipitation"
 msgstr "L�gare presisjon"
 
-#: my-evolution/metar.c:251
+#: my-evolution/metar.c:252
 #, fuzzy
 msgid "Heavy precipitation"
 msgstr "Anna program"
 
-#: my-evolution/metar.c:252
+#: my-evolution/metar.c:253
 #, fuzzy
 msgid "Shallow precipitation"
 msgstr "Vis &skildring"
 
-#: my-evolution/metar.c:253
+#: my-evolution/metar.c:254
 #, fuzzy
 msgid "Patches of precipitation"
 msgstr "Stioppsett"
 
-#: my-evolution/metar.c:254
+#: my-evolution/metar.c:255
 #, fuzzy
 msgid "Partial precipitation"
 msgstr "Pilot-program"
 
-#: my-evolution/metar.c:255
+#: my-evolution/metar.c:256
 msgid "Unknown thunderstorm"
 msgstr "Ukjend tordenstorm"
 
-#: my-evolution/metar.c:256
+#: my-evolution/metar.c:257
 #, fuzzy
 msgid "Blowing precipitation"
 msgstr "Bl�sande nedb�r"
 
-#: my-evolution/metar.c:257
+#: my-evolution/metar.c:258
 #, fuzzy
 msgid "Showers, type unknown"
 msgstr "Ukjend port"
 
-#: my-evolution/metar.c:258
+#: my-evolution/metar.c:259
 #, fuzzy
 msgid "Drifting precipitation"
 msgstr "Feil spesifikasjon av port."
 
-#: my-evolution/metar.c:259
+#: my-evolution/metar.c:260
 #, fuzzy
 msgid "Freezing precipitation"
 msgstr "Feil spesifikasjon av port."
 
 #. MIST
-#: my-evolution/metar.c:262
+#: my-evolution/metar.c:263
 msgid "Mist"
 msgstr "T�ke"
 
-#: my-evolution/metar.c:263
+#: my-evolution/metar.c:264
 msgid "Mist in the vicinity"
 msgstr "T�ke i n�rleiken"
 
-#: my-evolution/metar.c:264
+#: my-evolution/metar.c:265
 msgid "Light mist"
 msgstr "Lett t�ke"
 
-#: my-evolution/metar.c:265
+#: my-evolution/metar.c:266
 msgid "Moderate mist"
 msgstr "Moderat t�ke"
 
-#: my-evolution/metar.c:266
+#: my-evolution/metar.c:267
 #, fuzzy
 msgid "Thick mist"
 msgstr "Kallenamn-liste"
 
-#: my-evolution/metar.c:267
+#: my-evolution/metar.c:268
 #, fuzzy
 msgid "Shallow mist"
 msgstr "Vis eining"
 
-#: my-evolution/metar.c:268
+#: my-evolution/metar.c:269
 #, fuzzy
 msgid "Patches of mist"
 msgstr "Lappar og anna"
 
-#: my-evolution/metar.c:269
+#: my-evolution/metar.c:270
 #, fuzzy
 msgid "Partial mist"
 msgstr "Innleggliste"
 
-#: my-evolution/metar.c:271
+#: my-evolution/metar.c:272
 #, fuzzy
 msgid "Mist with wind"
 msgstr "Maksimer vindauget"
 
-#: my-evolution/metar.c:273
+#: my-evolution/metar.c:274
 #, fuzzy
 msgid "Drifting mist"
 msgstr "Utskriftsmetode"
 
-#: my-evolution/metar.c:274
+#: my-evolution/metar.c:275
 #, fuzzy
 msgid "Freezing mist"
 msgstr "Skrifttype for helsing"
 
 #. FOG
-#: my-evolution/metar.c:277
+#: my-evolution/metar.c:278
 msgid "Fog"
 msgstr "T�ke"
 
-#: 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 "Lett t�ke"
 
-#: my-evolution/metar.c:280
+#: my-evolution/metar.c:281
 #, fuzzy
 msgid "Moderate fog"
 msgstr "moderert"
 
-#: my-evolution/metar.c:281
+#: my-evolution/metar.c:282
 msgid "Thick fog"
 msgstr "Tjukk t�ke"
 
-#: my-evolution/metar.c:282
+#: my-evolution/metar.c:283
 #, fuzzy
 msgid "Shallow fog"
 msgstr "Vis &logg"
 
-#: my-evolution/metar.c:283
+#: my-evolution/metar.c:284
 #, fuzzy
 msgid "Patches of fog"
 msgstr "Lappar og anna"
 
-#: my-evolution/metar.c:284
+#: my-evolution/metar.c:285
 msgid "Partial fog"
 msgstr "Delvis t�ke"
 
-#: my-evolution/metar.c:286
+#: my-evolution/metar.c:287
 msgid "Fog with wind"
 msgstr "T�ke med vind"
 
-#: my-evolution/metar.c:288
+#: my-evolution/metar.c:289
 #, fuzzy
 msgid "Drifting fog"
 msgstr "Skrifttype for helsing"
 
-#: my-evolution/metar.c:289
+#: my-evolution/metar.c:290
 #, fuzzy
 msgid "Freezing fog"
 msgstr "Skrifttype for helsing"
 
 #. SMOKE
-#: my-evolution/metar.c:292
+#: my-evolution/metar.c:293
 msgid "Smoke"
 msgstr "R�yk"
 
-#: 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 "Tynn r�yk"
 
-#: my-evolution/metar.c:295
+#: my-evolution/metar.c:296
 #, fuzzy
 msgid "Moderate smoke"
 msgstr "Format"
 
-#: my-evolution/metar.c:296
+#: my-evolution/metar.c:297
 #, fuzzy
 msgid "Thick smoke"
 msgstr "&Ur-modus"
 
-#: my-evolution/metar.c:297
+#: my-evolution/metar.c:298
 #, fuzzy
 msgid "Shallow smoke"
 msgstr "Vis meny"
 
-#: my-evolution/metar.c:298
+#: my-evolution/metar.c:299
 #, fuzzy
 msgid "Patches of smoke"
 msgstr "Lappar og anna"
 
-#: my-evolution/metar.c:299
+#: my-evolution/metar.c:300
 #, fuzzy
 msgid "Partial smoke"
 msgstr "Variabelnamn"
 
-#: my-evolution/metar.c:300
+#: my-evolution/metar.c:301
 #, fuzzy
 msgid "Thunderous smoke"
 msgstr "Skiljeteikn for tusental:"
 
-#: my-evolution/metar.c:301
+#: my-evolution/metar.c:302
 msgid "Smoke with wind"
 msgstr "R�yk med vind"
 
-#: my-evolution/metar.c:303
+#: my-evolution/metar.c:304
 #, fuzzy
 msgid "Drifting smoke"
 msgstr "&Teiknemodus"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:307
+#: my-evolution/metar.c:308
 msgid "Volcanic ash"
 msgstr "Vulkansk oske"
 
-#: 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 "Tjukk vulkansk oske"
 
-#: 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 "Lappar med vulkansk oske"
 
-#: 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
 #, fuzzy
 msgid "Thunderous volcanic ash"
 msgstr "Stiar til spooler-kommandoar:"
 
-#: 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 "Stiar til spooler-kommandoar:"
 
-#: 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 "Sand"
 
-#: 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 "Lett sand"
 
-#: my-evolution/metar.c:325
+#: my-evolution/metar.c:326
 #, fuzzy
 msgid "Moderate sand"
 msgstr "moderert"
 
-#: my-evolution/metar.c:326
+#: my-evolution/metar.c:327
 #, fuzzy
 msgid "Heavy sand"
 msgstr "Spel lyd"
 
-#: my-evolution/metar.c:328
+#: my-evolution/metar.c:329
 #, fuzzy
 msgid "Patches of sand"
 msgstr "Lappar og anna"
 
-#: my-evolution/metar.c:329
+#: my-evolution/metar.c:330
 #, fuzzy
 msgid "Partial sand"
 msgstr "Marshall�yane"
 
-#: my-evolution/metar.c:331
+#: my-evolution/metar.c:332
 #, fuzzy
 msgid "Blowing sand"
 msgstr "lastar fil"
 
-#: my-evolution/metar.c:333
+#: my-evolution/metar.c:334
 #, fuzzy
 msgid "Drifting sand"
 msgstr "Redigeringsko&mmando"
 
 #. HAZE
-#: my-evolution/metar.c:337
+#: my-evolution/metar.c:338
 #, fuzzy
 msgid "Haze"
 msgstr "Hz"
 
-#: 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 "H�grehendt"
 
-#: my-evolution/metar.c:340
+#: my-evolution/metar.c:341
 #, fuzzy
 msgid "Moderate haze"
 msgstr "moderert"
 
-#: my-evolution/metar.c:341
+#: my-evolution/metar.c:342
 #, fuzzy
 msgid "Thick haze"
 msgstr "&Breidd"
 
-#: my-evolution/metar.c:342
+#: my-evolution/metar.c:343
 #, fuzzy
 msgid "Shallow haze"
 msgstr "Vis dato"
 
-#: my-evolution/metar.c:343
+#: my-evolution/metar.c:344
 #, fuzzy
 msgid "Patches of haze"
 msgstr "Endringsdato"
 
-#: my-evolution/metar.c:344
+#: my-evolution/metar.c:345
 #, fuzzy
 msgid "Partial haze"
 msgstr "Variabelnamn"
 
-#: my-evolution/metar.c:346
+#: my-evolution/metar.c:347
 #, fuzzy
 msgid "Haze with wind"
 msgstr "Maksimer vindauget"
 
-#: my-evolution/metar.c:348
+#: my-evolution/metar.c:349
 #, fuzzy
 msgid "Drifting haze"
 msgstr "Utskrift mislukkast."
 
-#: my-evolution/metar.c:349
+#: my-evolution/metar.c:350
 #, fuzzy
 msgid "Freezing haze"
 msgstr "Ledig storleik"
 
 #. SPRAY
-#: my-evolution/metar.c:352
+#: my-evolution/metar.c:353
 #, fuzzy
 msgid "Spray"
 msgstr "Sprut"
 
-#: my-evolution/metar.c:353
+#: my-evolution/metar.c:354
 #, fuzzy
 msgid "Spray in the vicinity"
 msgstr "Vis &linjetal"
 
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
 #, fuzzy
 msgid "Light spray"
 msgstr "H�grehendt"
 
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
 #, fuzzy
 msgid "Moderate spray"
 msgstr "moderert"
 
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
 #, fuzzy
 msgid "Heavy spray"
 msgstr "Spel lyd"
 
-#: my-evolution/metar.c:357
+#: my-evolution/metar.c:358
 #, fuzzy
 msgid "Shallow spray"
 msgstr "Vis brukarar"
 
-#: my-evolution/metar.c:358
+#: my-evolution/metar.c:359
 #, fuzzy
 msgid "Patches of spray"
 msgstr "Lappar og anna"
 
-#: my-evolution/metar.c:359
+#: my-evolution/metar.c:360
 #, fuzzy
 msgid "Partial spray"
 msgstr "Marshall�yane"
 
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
 #, fuzzy
 msgid "Blowing spray"
 msgstr "lastar fil"
 
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
 #, fuzzy
 msgid "Drifting spray"
 msgstr "Skriv med gr�nyansar"
 
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
 #, fuzzy
 msgid "Freezing spray"
 msgstr "&Helsingstekst:"
 
 #. DUST
-#: my-evolution/metar.c:367
+#: my-evolution/metar.c:368
 msgid "Dust"
 msgstr "St�v"
 
-#: 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
 #, fuzzy
 msgid "Light dust"
 msgstr "Lyse felt"
 
-#: my-evolution/metar.c:370
+#: my-evolution/metar.c:371
 #, fuzzy
 msgid "Moderate dust"
 msgstr "moderert"
 
-#: my-evolution/metar.c:371
+#: my-evolution/metar.c:372
 #, fuzzy
 msgid "Heavy dust"
 msgstr "Emneliste"
 
-#: my-evolution/metar.c:373
+#: my-evolution/metar.c:374
 #, fuzzy
 msgid "Patches of dust"
 msgstr "pakkar ut"
 
-#: my-evolution/metar.c:374
+#: my-evolution/metar.c:375
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:376
+#: my-evolution/metar.c:377
 #, fuzzy
 msgid "Blowing dust"
 msgstr "Blinkande prikkar"
 
-#: my-evolution/metar.c:378
+#: my-evolution/metar.c:379
 #, fuzzy
 msgid "Drifting dust"
 msgstr "Skriv dokument"
 
 #. SQUALL
-#: my-evolution/metar.c:382
+#: my-evolution/metar.c:383
 #, fuzzy
 msgid "Squall"
 msgstr "Lite"
 
-#: 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
 #, fuzzy
 msgid "Light squall"
 msgstr "Lista er full"
 
-#: 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
 #, fuzzy
 msgid "Partial squall"
 msgstr "Parallell"
 
-#: 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 "Sandstorm"
 
-#: 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
 #, fuzzy
 msgid "Moderate sandstorm"
 msgstr "Fjernare"
 
-#: my-evolution/metar.c:401
+#: my-evolution/metar.c:402
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:402
+#: my-evolution/metar.c:403
 #, fuzzy
 msgid "Shallow sandstorm"
 msgstr "Vis sekund"
 
-#: my-evolution/metar.c:404
+#: my-evolution/metar.c:405
 #, fuzzy
 msgid "Partial sandstorm"
 msgstr "Marshall�yane"
 
-#: my-evolution/metar.c:405
+#: my-evolution/metar.c:406
 #, fuzzy
 msgid "Thunderous sandstorm"
 msgstr "Skiljeteikn for tusental:"
 
-#: my-evolution/metar.c:406
+#: my-evolution/metar.c:407
 #, fuzzy
 msgid "Blowing sandstorm"
 msgstr "&Under redigeringsvindauget"
 
-#: 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 "St�vstorm"
 
-#: 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
 #, fuzzy
 msgid "Light duststorm"
 msgstr "H�gre knapp"
 
-#: my-evolution/metar.c:415
+#: my-evolution/metar.c:416
 #, fuzzy
 msgid "Moderate duststorm"
 msgstr "Fjernare"
 
-#: 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
 #, fuzzy
 msgid "Blowing duststorm"
 msgstr "Blinkande prikkar"
 
-#: 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
 #, fuzzy
 msgid "Shallow funnel cloud"
 msgstr "Vis &linjetal"
 
-#: 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 "Tornado"
 
-#: 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 "Moderat tornado"
 
-#: my-evolution/metar.c:446
+#: my-evolution/metar.c:447
 msgid "Raging tornado"
 msgstr "Rasande tornado"
 
-#: my-evolution/metar.c:449
+#: my-evolution/metar.c:450
 #, fuzzy
 msgid "Partial tornado"
 msgstr "Partisjonar"
 
-#: my-evolution/metar.c:450
+#: my-evolution/metar.c:451
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:453
+#: my-evolution/metar.c:454
 #, fuzzy
 msgid "Drifting tornado"
 msgstr "Utskriftsmetode"
 
-#: my-evolution/metar.c:454
+#: my-evolution/metar.c:455
 #, fuzzy
 msgid "Freezing tornado"
 msgstr "Skrifttype for helsing"
 
 #. 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
 #, fuzzy
 msgid "Shallow dust whirls"
 msgstr "Vis detaljar"
 
-#: 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 ""
 
@@ -25154,88 +25483,73 @@ msgstr "&Plan"
 msgid "_Weather"
 msgstr "_V�r"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for Evolution folder settings."
-msgstr "�ydelagd oppsettfil."
-
-#: 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 "Innstillingar for e-post"
+msgid "Evolution Shell"
+msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
 #, fuzzy
-msgid "The Evolution shell."
-msgstr "Kan ikkje initialisera adresseboka"
+msgid "Evolution folder settings configuration control"
+msgstr "�ydelagd oppsettfil."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Innstillingar for e-post"
 
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr "Vis detaljar"
 
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
 msgid "Cancel Operation"
 msgstr "Avbryt operasjon"
 
-#: shell/e-folder-dnd-bridge.c:53
+#: shell/e-folder-dnd-bridge.c:55
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 "Opne i %s ..."
 
-#: shell/e-folder-list.c:312
+#: shell/e-folder-list.c:338
 #, fuzzy
 msgid "Add a Folder"
 msgstr "Vel mappe"
 
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
 msgid "Drafts"
 msgstr "Kladd"
 
-#: 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 "Innboks"
 
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:181
 msgid "Outbox"
 msgstr "Utboks"
 
-#: shell/e-local-storage.c:181
+#: shell/e-local-storage.c:182
 msgid "Sent"
 msgstr "Sendt"
 
-#: shell/e-setup.c:126
-#, fuzzy
-msgid "Evolution installation"
-msgstr "KDeelop-installering"
-
-#: 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 "Klikk �OK� for � installere filene, eller �Avbryt� for � avslutte."
-
-#: shell/e-setup.c:171
+#: shell/e-setup.c:146
 #, fuzzy
 msgid "Could not update files correctly"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: shell/e-setup.c:194
+#: shell/e-setup.c:167
 #, fuzzy, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -25245,40 +25559,14 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:178
 #, fuzzy, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr "Ein feil oppstod ved lagring."
 
-#: shell/e-setup.c:282
-#, fuzzy, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Kan ikkje laga heimekatalog\n"
-"Feil: %1"
-
-#: 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"
@@ -25286,16 +25574,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"
@@ -25307,27 +25586,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 "Fullf�ringsdato"
 
-#: shell/e-shell-config-default-folders.c:133
+#: shell/e-shell-config-default-folders.c:149
 #, fuzzy
 msgid "Select Default Folder"
 msgstr "Spesialmapper"
 
-#: shell/e-shell-config-folder-settings.c:71
+#: shell/e-shell-config-folder-settings.c:70
 #, fuzzy
 msgid "Default Folders"
 msgstr "Spesialmapper"
 
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
 #, fuzzy
 msgid "Offline Folders"
 msgstr "Spesialmapper"
 
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 #, fuzzy
 msgid "Autocompletion Folders"
 msgstr "Fullf�ringsdato"
@@ -25337,97 +25616,97 @@ msgstr "Fullf�ringsdato"
 msgid "Cannot copy folder: %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
 #, fuzzy, c-format
 msgid "Cannot move folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:188
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "Kan ikkje flytta mappe "
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:190
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr "kan ikkje opna fila %1"
 
-#: shell/e-shell-folder-commands.c:206
+#: shell/e-shell-folder-commands.c:204
 #, fuzzy
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Kan ikkje flytta ei foreldremappe inn i ei barnemappe."
 
-#: 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 "Kopier mappe"
 
-#: 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 "Flytt til mappe"
 
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:391
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: shell/e-shell-folder-commands.c:406
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Slett �%s�"
-
-#: shell/e-shell-folder-commands.c:407
+#: shell/e-shell-folder-commands.c:405
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:412
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Slett �%s�"
+
+#: shell/e-shell-folder-commands.c:485
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: shell/e-shell-folder-commands.c:535
+#: shell/e-shell-folder-commands.c:534
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endra namn p� profil '%1'"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:540
 #, fuzzy
 msgid "Rename folder"
 msgstr "Endra namn p� profil '%1'"
 
-#: 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 "Arkivfilnamnet er ikkje gyldig.\n"
 
-#: 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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: shell/e-shell-folder-creation-dialog.c:122
+#: shell/e-shell-folder-creation-dialog.c:127
 #, fuzzy, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25436,24 +25715,20 @@ msgstr ""
 "Kan ikkje laga fila\n"
 "\""
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:308
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Lag _ny mappe ..."
 
-#: shell/e-shell-folder-selection-dialog.c:393
-msgid "New..."
-msgstr "Ny ..."
-
-#: 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 "(Utan tittel)"
 
-#: 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"
@@ -25462,11 +25737,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 "Vel informasjonen du vil importere:"
 
-#: 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"
@@ -25475,33 +25750,33 @@ msgstr ""
 "Importerar %s\n"
 "Importerar element %d."
 
-#: shell/e-shell-importer.c:355
+#: shell/e-shell-importer.c:351
 #, fuzzy
 msgid "Select importer"
 msgstr "Vel mappe"
 
-#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "Fila %s finst ikkje"
 
-#: 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 feil"
 
-#: 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 "Det er ikkje band i stasjonen."
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "Importerar"
 
-#: shell/e-shell-importer.c:522
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25510,83 +25785,83 @@ msgstr ""
 "Importerar %s.\n"
 "Startar %s"
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Feil ved asting av %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
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Vel ei fil"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:716
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "Import�r data og innstillinga fr� eldre program"
 
-#: shell/e-shell-importer.c:720
+#: shell/e-shell-importer.c:714
 #, fuzzy
 msgid "Import a single file"
 msgstr "Flyttar"
 
-#: 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 "Fr� %s:"
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Vel mappe"
 
-#: 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 "Import�r"
 
-#: shell/e-shell-offline-handler.c:582
+#: shell/e-shell-offline-handler.c:592
 #, fuzzy
 msgid "Closing connections..."
 msgstr "Lukkar prosjekt ..."
 
-#: shell/e-shell-offline-sync.c:161
+#: shell/e-shell-offline-sync.c:163
 #, fuzzy, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
@@ -25595,170 +25870,174 @@ msgstr ""
 "Feil ved �%s�:\n"
 "%s"
 
-#: shell/e-shell-offline-sync.c:239
+#: shell/e-shell-offline-sync.c:232
 #, fuzzy
 msgid "Syncing Folder"
 msgstr "Synkroniser mapper"
 
 #. 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 "Velj ein tenar"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Leitar etter tilleggsmodular"
 
-#: 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 "Leitar etter tilleggsmodular"
 
-#: 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 "Opne i %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 "Kunne ikkje lasta kalender '%1'.\n"
 
-#: 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 ""
 "Kan ikkje laga fila\n"
 "\""
 
-#: shell/e-shell-startup-wizard.c:159
-#, fuzzy, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr "Kan ikkje initialisera adresseboka"
-
-#: shell/e-shell-startup-wizard.c:169
-#, fuzzy
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "Kan ikkje initialisera adresseboka"
-
-#: 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 "Ny"
 
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
 #, fuzzy
 msgid "No folder name specified."
 msgstr "G� til side"
 
-#: shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:123
 #, fuzzy
 msgid "Folder name cannot contain the Return character."
 msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: shell/e-shell-utils.c:127
+#: shell/e-shell-utils.c:129
 #, fuzzy
-msgid "Folder name cannot contain slashes."
+msgid "Folder name cannot contain the character \"/\"."
 msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr ""
+"Kan ikkje laga heimekatalog\n"
+"Feil: %1"
+
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "�.� og �..� er resverte mappenamn."
 
-#: 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 ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: shell/e-shell-view-menu.c:196
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug Buddy vart ikkje funnen i s�kestien din ($PATH)"
+#: shell/e-shell-view-menu.c:193
+#, fuzzy
+msgid "Bug buddy is not installed."
+msgstr "Kunne ikkje lagra adresseboka."
 
-#: shell/e-shell-view-menu.c:204
+#: shell/e-shell-view-menu.c:201
 #, fuzzy
 msgid "Bug buddy could not be run."
 msgstr "Kunne ikkje lagra adresseboka."
 
-#: shell/e-shell-view-menu.c:248
+#: shell/e-shell-view-menu.c:247
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Oppl�ysing"
 
-#: shell/e-shell-view-menu.c:503
+#: shell/e-shell-view-menu.c:502
 #, fuzzy
 msgid "Go to folder..."
 msgstr "Flytt til mappe"
 
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:503
 #, fuzzy
 msgid "Select the folder that you want to open"
 msgstr "Vel det ikontemaet du vil bruka:"
 
-#: shell/e-shell-view-menu.c:625
+#: shell/e-shell-view-menu.c:617
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shell-view-menu.c:626
+#: shell/e-shell-view-menu.c:618
 #, fuzzy
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vel katalogen som inneheld tenestene"
 
-#: shell/e-shell-view-menu.c:788
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr "Arbeid _tilkopla"
 
-#: 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 "Arbeid _fr�kopla"
 
-#: 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 "Arbeid fr�kopla"
 
-#: shell/e-shell-view.c:226
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: 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 "(Ingen)"
 
-#: 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 ""
@@ -25771,12 +26050,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:739
+#: shell/e-shell.c:741
 #, fuzzy, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikkje setja blokkstorleik for band."
 
-#: shell/e-shell.c:1877
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25784,160 +26063,154 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2178
+#: shell/e-shell.c:2067
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Ugyldig(e) argument"
 
-#: 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 "Oppsettsdatabasen ikkje funnen"
 
-#: shell/e-shell.c:2184 shell/e-storage.c:571
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Generell feil"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:80
 #, fuzzy
 msgid "Create new shortcut group"
 msgstr "Endra snarveg for:"
 
-#: shell/e-shortcuts-view.c:77
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
 msgstr "Gruppenamn:"
 
-#: shell/e-shortcuts-view.c:173
+#: shell/e-shortcuts-view.c:179
 #, fuzzy, 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 "Vil du verkeleg leggja '%1' i papirkorga?"
 
-#: shell/e-shortcuts-view.c:178
-msgid "Don't remove"
-msgstr "Ikkje fjern"
-
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:215
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Fjern denne oppf�ringa"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:216
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Fjern denne oppf�ringa"
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "_Sm� ikon"
 
-#: 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
 #, fuzzy
 msgid "_Large Icons"
 msgstr "Ordna ikon"
 
-#: 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 "_Ny gruppe ..."
 
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:264
 #, fuzzy
 msgid "Create a new shortcut group"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:266
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Fjern gruppe"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Fjern denne oppf�ringa"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:269
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Fjern gruppe"
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:270
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Fjern denne oppf�ringa"
 
-#: 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
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "&Programsn�ggtastar"
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:281
 #, fuzzy
 msgid "Create _Default Shortcuts"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:282
 #, fuzzy
 msgid "Create Default Shortcuts"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr "Gi snarveg nytt namn"
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr "Gi valde snarvegar nytt namn til:"
 
-#: 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 "Opne i nytt _vindauge"
 
-#: 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 "Opna dokumentet i eit nytt vindauge"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr "_Gje nytt namn"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr "Gi denne snarvegen nytt namn"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Re_move"
 msgstr "Fj_ern"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne snarvegen fr� snarvegstolpen"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr "Feil ved lagring av snavegar."
 
-#: shell/e-shortcuts.c:1080
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr "Snarvegar"
 
@@ -25946,83 +26219,83 @@ msgstr "Snarvegar"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:569
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "Ingen feil"
 
-#: shell/e-storage.c:573
+#: shell/e-storage.c:574
 #, fuzzy
 msgid "A folder with the same name already exists"
 msgstr "Ein tabell med det namnet finst alt."
 
-#: shell/e-storage.c:575
+#: shell/e-storage.c:576
 #, fuzzy
 msgid "The specified folder type is not valid"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:577
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "I/U-feil"
 
-#: shell/e-storage.c:579
+#: shell/e-storage.c:580
 #, fuzzy
 msgid "Not enough space to create the folder"
 msgstr "Ikkje nok skip � senda."
 
-#: shell/e-storage.c:581
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr "Mappa er ikkje tom"
 
-#: shell/e-storage.c:583
+#: shell/e-storage.c:584
 #, fuzzy
 msgid "The specified folder was not found"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:585
+#: shell/e-storage.c:586
 #, fuzzy
 msgid "Function not implemented in this storage"
 msgstr "Kommando ikkje st�tta p� tenar"
 
-#: shell/e-storage.c:589
+#: shell/e-storage.c:590
 #, fuzzy
 msgid "Operation not supported"
 msgstr "Operasjonen vart stoppa"
 
-#: shell/e-storage.c:591
+#: shell/e-storage.c:592
 #, fuzzy
 msgid "The specified type is not supported in this storage"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:593
+#: shell/e-storage.c:594
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:595
+#: shell/e-storage.c:596
 #, fuzzy
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Kan ikkje flytta ei foreldremappe inn i ei barnemappe."
 
-#: shell/e-storage.c:597
+#: shell/e-storage.c:598
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Leitar etter tilleggsmodular"
 
-#: 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 "%1 av %2 ferdig"
 
-#: shell/evolution-folder-selector-button.c:94
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<klikk her for � velje mappe>"
 
@@ -26052,88 +26325,84 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1145
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "CORBA-feil"
 
-#: shell/evolution-shell-component.c:1147
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Avbroten"
 
-#: shell/evolution-shell-component.c:1149
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Ugyldig argument"
 
-#: shell/evolution-shell-component.c:1151
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "Har allereide ein eigar"
 
-#: shell/evolution-shell-component.c:1153
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Ingen eigar"
 
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1192
 #, fuzzy
 msgid "Not found"
 msgstr "Fann ikkje fil"
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1194
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Vel modemtype ..."
 
-#: shell/evolution-shell-component.c:1159
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Ust�tta skjema"
 
-#: shell/evolution-shell-component.c:1161
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Ust�tta operasjon"
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Eksisterar"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1210
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Vidaresendt melding"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Ikkje noko plass att"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "Gammal eigar har d�ydd"
 
-#: shell/evolution-test-component.c:49
+#: shell/evolution-test-component.c:63
 #, fuzzy
 msgid "Test type"
 msgstr "Filtype:"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/evolution-test-component.c:703
 #, fuzzy
-msgid "Active connections"
-msgstr "Aktive tenarsamband"
+msgid "Evolution Test Component"
+msgstr "Kan ikkje initialisera lokale variablar"
 
-#: 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 "Klikk OK for � late att desse tilknytningane og for � kople av"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "Vert"
-
-#: shell/glade/e-active-connection-dialog.glade.h:4
+#: shell/glade/e-active-connection-dialog.glade.h:2
 #, fuzzy
 msgid "The following connections are currently active:"
 msgstr "F�lgjande konto(ar) er\n"
@@ -26158,15 +26427,15 @@ msgstr "Send"
 msgid "_Tasks:"
 msgstr "Oppg�ver"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder name:"
 msgstr "Mappenamn:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder type:"
 msgstr "Mappetype:"
 
-#: 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 "Ikkje nok skip � senda."
@@ -26191,39 +26460,39 @@ msgstr "Mappenamn:"
 msgid "_User:"
 msgstr "Br_ukarnamn:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Evolution Setup Assistant"
 msgstr "KDeelop-installering"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 #, fuzzy
 msgid "Importing Files"
 msgstr "Flyttar"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Tidssone"
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Velkomen"
 
-#: 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
@@ -26261,42 +26530,43 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
 msgid "Importers"
 msgstr "Importerarar"
 
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Ikkje importer"
 
-#: shell/importer/intelligent.c:198
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Ikkje sp�r meg igjen"
 
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
 #, fuzzy
 msgid "Evolution can import data from the following files:"
 msgstr "Bruk p� f�lgjande delar:"
 
-#: 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 avsluttar no ..."
 
-#: 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"
@@ -26306,82 +26576,116 @@ 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 "Ikkje sp�r meg igjen"
 
-#: shell/main.c:394
+#: shell/main.c:387
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:403
+#: shell/main.c:396
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:485
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Sl� av oppstartsskjerm"
 
-#: shell/main.c:487
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Startar importering"
 
-#: shell/main.c:489
+#: shell/main.c:532
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Startar importering"
 
-#: 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
-#, fuzzy
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Kan ikkje initialisera adresseboka"
-
-#: 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 "Feil ved lasting av standard addressebok."
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Inndata fil"
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "Utdata fil"
-
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 #, fuzzy
 msgid "No filename provided."
 msgstr "G� til side"
 
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "Vedlegg"
+
+#: 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 "Skildring inneheld"
+
+#: 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 "Sentrer dei valte elementa"
+
+#. 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 ikkje lasta kalender '%1'.\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..."
@@ -26482,7 +26786,7 @@ msgstr "tid no"
 #: 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_andlingar"
 
@@ -26609,7 +26913,7 @@ msgid "Print this item"
 msgstr "Skriv ut dette elementet"
 
 #: 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 "Lagre"
 
@@ -26636,7 +26940,7 @@ msgstr "Lagre dette elementet til 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"
 
@@ -26905,7 +27209,7 @@ msgstr "Tr�da meldingsliste"
 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 "_Mappe"
 
@@ -27184,7 +27488,8 @@ msgid "Post a Reply"
 msgstr "Post eit svar"
 
 #: ui/evolution-mail-message.xml.h:63
-msgid "Post a reply to a message message in a Public folder"
+#, fuzzy
+msgid "Post a reply to a message in a Public folder"
 msgstr "Post eit svar til ei melding i ei offentleg mappe"
 
 #: ui/evolution-mail-message.xml.h:64
@@ -27348,7 +27653,7 @@ msgstr "_Sitert"
 msgid "_Resend..."
 msgstr "_Omd�yp ..."
 
-#: 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 "Verk_ty"
 
@@ -27364,12 +27669,12 @@ msgstr "Lukk vindauge"
 #: 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_ukk"
 
 #: 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 "_Visning"
 
@@ -27377,6 +27682,10 @@ msgstr "_Visning"
 msgid "Attach"
 msgstr "Legg ved"
 
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Legg ved fil"
+
 #: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
@@ -27545,7 +27854,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Lagre aktiv fil"
 
-#: 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 "_Hjelp"
 
@@ -27725,125 +28034,115 @@ msgstr "Pi_lot-innstillingar ..."
 
 #: ui/evolution.xml.h:27
 #, fuzzy
-msgid "Pilot Con_duit Settings..."
-msgstr "_Pilot-innstillingar"
-
-#: ui/evolution.xml.h:28
-#, fuzzy
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "Lag _ny mappe ..."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "Send / Motta"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Send queued items and retrieve new items"
 msgstr "Send k�a meldingar og motta ny meldingar"
 
-#: ui/evolution.xml.h:31
-#, fuzzy
-msgid "Set up Pilot conduit configuration"
-msgstr "Oppsett for pilot"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Set up Pilot configuration"
 msgstr "Oppsett for pilot"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr "Vis informasjon om Ximian Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "Send inn _feilrapport"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn ei feilmelding ved hjelp av Bug Buddy"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "Byt"
 
-#: 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 "Avgjer om snarvegstolpen skal vise"
 
-#: 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 "Vis den valde mappa"
 
-#: 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 "_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 "_Mappestolpe"
 
-#: 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 "_Flytt ..."
 
-#: 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
 #, fuzzy
 msgid "_Remove Other User's Folder"
 msgstr "Lag _ny mappe ..."
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_Omd�yp ..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "_Sende / Motta"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "_Snarvegstolpe"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 msgid "_Shortcut..."
 msgstr "_Snarveg ..."
 
@@ -27919,9 +28218,8 @@ msgstr ""
 msgid "_Tasks"
 msgstr "_Oppg�ver"
 
-#. 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"
 
@@ -27944,20 +28242,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 "_Aktiv visning"
 
 #. 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 "Tilpassa visning"
 
-#: widgets/menus/gal-view-menus.c:366
+#: widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View"
 msgstr "Lagre tilpassa visning"
 
-#: widgets/menus/gal-view-menus.c:379
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr "Definer visningar"
 
@@ -27968,19 +28266,19 @@ msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. 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 "No"
 
-#: 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 "I dag"
 
-#: 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 "Tida m� vere p� format: %s"
@@ -27989,81 +28287,81 @@ msgstr "Tida m� vere p� format: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentverdien m� vere mellom 0 og 100, inklusiv"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "Sentraleuropeisk"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr "Gresk"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr "Japansk"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "Koreansk"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: 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 "Vesteuropeisk"
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "Tradisjonell"
 
-#: 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 "Forenkla"
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: 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 "Ukjent teiknsett: %s"
 
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr "Oppgi teiknsett"
 
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "Andre ..."
 
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr "Teiknkoding"
 
@@ -28071,11 +28369,12 @@ msgstr "Teiknkoding"
 msgid "..."
 msgstr "... "
 
-#: widgets/misc/e-filter-bar.c:189
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr "Redigering av s�k"
 
-#: widgets/misc/e-filter-bar.c:211
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "Lagre s�k"
 
@@ -28091,64 +28390,520 @@ msgstr "Redig�r lagra s�k ..."
 msgid "_Advanced..."
 msgstr "_Avansert ..."
 
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
 msgid "Information"
 msgstr "Informasjon"
 
-#: widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:168
 msgid "Error"
 msgstr "Feil"
 
-#: widgets/misc/e-messagebox.c:173
+#: widgets/misc/e-messagebox.c:175
 msgid "Question"
 msgstr "Sp�rsm�l"
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
 msgid "Message"
 msgstr "Melding"
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
-msgstr "Ikkje vis denne meldinga att"
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "_S�k"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:537
 msgid "_Find Now"
 msgstr "_Finn no"
 
-#: 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: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 "T�m"
 
-#: widgets/misc/e-search-bar.c:897
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Finn no"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Den personlege addresseboktenaren"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Evolutions addressebok minikortlesar"
+
+#: 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 "Tilgjengelege lenkjer:"
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Evolutions addressebok minikortlesar"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Fabrikk for � importere LDIF-filer inn i Evolution."
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Importerar LDIF-filer inn i Evolution."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Fabrikk for � importere VCard-filer inn i 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 "Personleg kalendertenar: kalendarfabrikk"
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Importerar VCard-filer inn i Evolution."
 
-#: wombat/wombat.c:199
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): klarte ikkje � initialisere GNOME-VFS"
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "Ein Bonobo-kontroll for ein addresse sprett-opp."
 
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): klarte ikkje initialisere GNOME"
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Ein bonobo-kontroll for vising av addresser."
 
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Ein eksempel Bonobo-kotroll som viser ein addressebok."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Kontroll som viser eit Evolution addressebok minikort."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Evolutionkomponent for handsaming av kontakter."
+
+#~ msgid "Factory for the Addressbook Minicard control"
+#~ msgstr "Fabrikk for Minikortkontrolle i addresseboka"
+
+#~ msgid "Factory for the Addressbook's address displayer"
+#~ msgstr "Fabrikk for addressevisaren til addresseboka"
+
+#~ msgid "Factory for the sample Addressbook control"
+#~ msgstr "Fabrikk for ein eksemple adressebokkontroll"
+
+#~ msgid "1234"
+#~ msgstr "1234"
+
+#~ msgid "380"
+#~ msgstr "380"
+
+#~ msgid "666"
+#~ msgstr "666"
+
+#, fuzzy
+#~ msgid "<- _Remove"
+#~ msgstr "Fje_rn"
+
+#, fuzzy
+#~ msgid "<< Fewer Options"
+#~ msgstr "&lt;&lt; Ferre val"
+
+#~ msgid "Attribute"
+#~ msgstr "Attributt"
+
+#, fuzzy
+#~ msgid "DN Customization"
+#~ msgstr "Ingen informasjon"
+
+#, fuzzy
+#~ msgid "Evolution Attribute"
+#~ msgstr "Evolution alarm"
+
+#~ msgid "LDAP Attribute"
+#~ msgstr "LDAP-attributt"
+
+#, fuzzy
+#~ msgid "Mappings"
+#~ msgstr "Margar"
+
+#, fuzzy
+#~ msgid "R_estore Defaults"
+#~ msgstr "Forvald"
+
+#, fuzzy
+#~ msgid "Re_store Defaults"
+#~ msgstr "Forvald"
+
+#~ msgid "Select"
+#~ msgstr "Vel"
+
+#, fuzzy
+#~ msgid "_Add ->"
+#~ msgstr "_Legg til"
+
+#, fuzzy
+#~ msgid "_Add Mapping"
+#~ msgstr "Legg til handling"
+
+#, fuzzy
+#~ msgid "_Add to DN"
+#~ msgstr "Legg til handling"
+
+#~ msgid "_Always"
+#~ msgstr "_Alltid"
+
+#, fuzzy
+#~ msgid "_Delete Mapping"
+#~ msgstr "S_lett alle"
+
+#, fuzzy
+#~ msgid "_Edit Mapping"
+#~ msgstr "R_edig�r avtale"
+
+#, fuzzy
+#~ msgid "_Evolution attribute:"
+#~ msgstr "Evolution alarm"
+
+#, fuzzy
+#~ msgid "_More Options >>"
+#~ msgstr "_Val"
+
+#, fuzzy
+#~ msgid "_Restore Defaults"
+#~ msgstr "Forvald"
+
+#, fuzzy
+#~ msgid "account-druid"
+#~ msgstr "Konto %d"
+
+#, fuzzy
+#~ msgid "account-editor"
+#~ msgstr "contact-list-editor"
+
+#~ msgid "Edit Contact List"
+#~ msgstr "Rediger kontaktliste"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Kontaktliste utan namn"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d ikkje vist)"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "Kontakter ..."
+
+#~ msgid "Phone Types"
+#~ msgstr "Telefontypar"
+
+#~ msgid "Delete Contact?"
+#~ msgstr "Slett kontakt?"
+
+#, fuzzy
+#~ msgid "Display Cards?"
+#~ msgstr "Vis"
+
+#, fuzzy
+#~ msgid "Display Cards"
+#~ msgstr "Vis"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "�ydelagd oppsettfil."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Evolutionkomponent for handtere kalendaren."
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Tasks control"
+#~ msgstr "�ydelagd oppsettfil."
+
+#, fuzzy
+#~ msgid "Factory for the calendar iTip view control"
+#~ msgstr "�ydelagd oppsettfil."
+
+#, fuzzy
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr "�ydelagd oppsettfil."
+
+#, fuzzy
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr "�ydelagd oppsettfil."
+
+#, fuzzy
+#~ msgid "Factory to create a component editor factory"
+#~ msgstr "�ydelagd oppsettfil."
+
+#, fuzzy
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "Kunne ikkje initiere 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 "Kunne ikkje initialisere Bonobo"
+
+#, fuzzy
+#~ msgid "Could not create the component editor factory"
+#~ msgstr ""
+#~ "Kunne ikkje laga mellombels fil\n"
+#~ "%1:\n"
+#~ "%2"
+
+#~ msgid "Print Calendar"
+#~ msgstr "Skriv ut kalendar"
+
+#, fuzzy
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Fabrikk for � importere VCard-filer inn i Evolution."
+
+#, fuzzy
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Importerar VCard-filer inn i Evolution."
+
+#, fuzzy
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Importerar VCard-filer inn i Evolution."
+
+#, fuzzy
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr "Mottek meldingar fr� %1"
+
+#, fuzzy
+#~ msgid "Can't call getFolderAtPath on storage: %s"
+#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#~ msgid "Warning!"
+#~ msgstr "�tvaring:"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "Klarar ikkje � starte Evolution-komponisten."
+
+#~ msgid "minute"
+#~ msgstr "minutt"
+
+#~ msgid "hour"
+#~ msgstr "time"
+
+#~ msgid "week"
+#~ msgstr "veke"
+
+#~ msgid "year"
+#~ msgstr "�r"
+
+#~ msgid "Add action"
+#~ msgstr "Legg til handling"
+
+#~ msgid "Add criterion"
+#~ msgstr "Legg til kriterium"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "�ydelagd oppsettfil."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "�ydelagd oppsettfil."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "�ydelagd oppsettfil."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "�ydelagd oppsettfil."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Evolutionskomponent for � handtere e-post."
+
+#, fuzzy
+#~ msgid "Evolution mail folder factory component."
+#~ msgstr "Kan ikkje initialisera lokale variablar"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr "�ydelagd oppsettfil."
+
+#, fuzzy
+#~ msgid "Factory for the Mail Summary component."
+#~ msgstr "�ydelagd oppsettfil."
+
+#, fuzzy
+#~ msgid "Warning: Unsent Messages"
+#~ msgstr "�tvaring: Melding er endra"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "Klarar ikkje initialisere Evolution sin e-postkomponent"
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "Kan ikkje initialisera lokale variablar"
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Kan ikkje initialisera lokale variablar"
+
+#, fuzzy
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "�ydelagd oppsettfil."
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importerar mbox-filer inn i Evolution"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "Fabrikk for � importere Outlook Express 4 e-postar inn i Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Import�r Outlook Express 4 filer inn i Evolution"
+
+#~ msgid "Really delete account?"
+#~ msgstr "Verkeleg slette konto?"
+
+#, fuzzy
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "Vis informasjonsmelding"
+
+#~ msgid "US-Letter"
+#~ msgstr "US-Letter"
+
+#, fuzzy
+#~ msgid "Add Signature"
+#~ msgstr "Lagre signatur"
+
+#, fuzzy
+#~ msgid "Account %d"
+#~ msgstr "Konto"
+
+#, fuzzy
+#~ msgid "_Variable-width:"
+#~ msgstr "Variabel"
+
+#~ msgid "All folders"
+#~ msgstr "Alle mapper"
+
+#, fuzzy
+#~ msgid "Apri file"
+#~ msgstr "April"
+
+#~ msgid "Display Options"
+#~ msgstr "Vis val"
+
+#, fuzzy
+#~ msgid "Salve file"
+#~ msgstr "Vel ei fil"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Evolutionkomponent for Mitt samandrag"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Summary component."
+#~ msgstr "Kan ikkje initialisera lokale variablar"
+
+#~ msgid "Marquette"
+#~ msgstr "Marquette"
+
+#, fuzzy
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "Kunne ikkje initiere Bonobo"
+
+#, fuzzy
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "�ydelagd oppsettfil."
+
+#, fuzzy
+#~ msgid "Evolution installation"
+#~ msgstr "KDeelop-installering"
+
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr "Klikk �OK� for � installere filene, eller �Avbryt� for � avslutte."
+
+#, fuzzy
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan ikkje laga heimekatalog\n"
+#~ "Feil: %1"
+
+#~ msgid "New..."
+#~ msgstr "Ny ..."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr "Kan ikkje initialisera adresseboka"
+
+#, fuzzy
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr "Kan ikkje initialisera adresseboka"
+
+#, fuzzy
+#~ msgid "Folder name cannot contain slashes."
+#~ msgstr ""
+#~ "Kan ikkje laga heimekatalog\n"
+#~ "Feil: %1"
+
+#~ msgid "Bug buddy was not found in your $PATH."
+#~ msgstr "Bug Buddy vart ikkje funnen i s�kestien din ($PATH)"
+
+#~ msgid "Don't remove"
+#~ msgstr "Ikkje fjern"
+
+#, fuzzy
+#~ msgid "Active connections"
+#~ msgstr "Aktive tenarsamband"
+
+#~ msgid "Host"
+#~ msgstr "Vert"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Bonobo component system."
+#~ msgstr "Kan ikkje initialisera adresseboka"
+
+#~ msgid "Output File"
+#~ msgstr "Utdata fil"
+
+#, fuzzy
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "_Pilot-innstillingar"
+
+#, fuzzy
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "Oppsett for pilot"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Den personlege addresseboktenaren"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "Personleg kalendertenar: kalendarfabrikk"
+
+#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
+#~ msgstr "setup_vfs(): klarte ikkje � initialisere GNOME-VFS"
+
+#~ msgid "init_corba(): could not initialize GNOME"
+#~ msgstr "init_corba(): klarte ikkje initialisere GNOME"
+
+#~ msgid "init_bonobo(): could not initialize Bonobo"
+#~ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 
 #, fuzzy
 #~ msgid "_Configure..."
@@ -28181,10 +28936,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "Copy selected messages"
 #~ msgstr "Kopier valde meldingar"
 
-#, fuzzy
-#~ msgid "Cut selected messages"
-#~ msgstr "Sentrer dei valte elementa"
-
 #~ msgid "&lt;- _Remove"
 #~ msgstr "&lt;- Fje_rn"
 
@@ -28203,10 +28954,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "%u bytes"
 #~ msgstr "%u oktettar"
 
-#, fuzzy
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "KDeelop-installering"
-
 #~ msgid "_Preferences..."
 #~ msgstr "_Innstillingar ..."
 
@@ -28252,9 +28999,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "NNTP Server:"
 #~ msgstr "NNTP-tenar:"
 
-#~ msgid "Source"
-#~ msgstr "Kjelde"
-
 #~ msgid "newswindow1"
 #~ msgstr "newswindow1"
 
@@ -28555,9 +29299,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "New Contact _List"
 #~ msgstr "Ny kontakt_liste"
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "Rediger adressebok"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Legg til adressebok"
 
@@ -28674,9 +29415,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "(No name)"
 #~ msgstr "(Ingen namn)"
 
-#~ msgid "New List"
-#~ msgstr "Ny liste"
-
 #~ msgid "Create a _New Appointment"
 #~ msgstr "Lag ein _ny avtale"
 
diff --git a/po/no.po b/po/no.po
index c538bb15f7..c7c6997473 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2003-03-17 01:05+0100\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-03-17 01:33+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -14,29 +14,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr "Factory for import av LDIF-filer til Evolution."
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Importeringsassistent for Evolution"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "Importerer LDIF-filer til 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 "Factory for import av VCard-filer til Evolution."
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolutions e-postredigering."
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importerer VCard-filer til Evolution."
+#, 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:1310
+#: addressbook/backend/ebook/e-card.c:1301
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Lagre som"
 
 #: 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
 #: my-evolution/e-summary-table.c:59
@@ -44,13 +52,13 @@ msgid "Name"
 msgstr "Navn"
 
 #: 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-post"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1773
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "Prim�r"
 
@@ -60,8 +68,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:1413
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: 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"
@@ -69,8 +77,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:1759
-#: addressbook/gui/contact-editor/e-contact-editor.c:1830
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr "Arbeid"
 
@@ -80,12 +88,12 @@ msgid "Bus"
 msgstr "Buss"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1762
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr "Tilbakering"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1764
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "Firma"
 
@@ -96,13 +104,13 @@ msgstr "Datamaskin"
 #: 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:1765
-#: addressbook/gui/contact-editor/e-contact-editor.c:1831
+#: 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:1371
+#: addressbook/backend/ebook/e-card.c:1362
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organisasjon"
@@ -113,18 +121,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:1769
+#: 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:1763
+#: 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:1761
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Faks p� arbeid"
@@ -134,13 +142,13 @@ msgid "Bus Fax"
 msgstr "Faks i buss"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1767
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "Arbeid 2"
 
@@ -149,43 +157,43 @@ msgid "Bus 2"
 msgstr "Buss 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1766
+#: 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:1768
+#: 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:1770
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: 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:1771
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Annen faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1772
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Persons�ker"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1774
+#: 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:1775
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Teleks"
@@ -196,15 +204,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:1803
+#: 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:492
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: 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"
@@ -228,7 +236,7 @@ msgid "Dep"
 msgstr "Avd"
 
 #: 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 "Kontor"
@@ -238,7 +246,7 @@ msgid "Off"
 msgstr "Av"
 
 #: 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 "Tittel"
@@ -253,7 +261,7 @@ msgid "Prof"
 msgstr "Yrke"
 
 #: 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 "Leder"
@@ -267,7 +275,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 "Kallenavn"
@@ -277,19 +285,19 @@ msgid "Nick"
 msgstr "Kallenavn"
 
 #: 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 "Ektefelle"
 
 #: 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 "Kommentar"
 
 #: 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"
 
@@ -315,7 +323,7 @@ msgid "icsCalendar"
 msgstr "icsCalender"
 
 #: 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 "Bryllupsdag"
 
@@ -328,7 +336,7 @@ msgid "Birth Date"
 msgstr "F�dselsdato"
 
 #: 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 "Kategorier"
@@ -341,104 +349,104 @@ msgstr "Etternavn"
 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 "Liste uten navn"
 
-#: 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 "Fullt navn"
 
-#: 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 "Adresseetikett"
 
-#: 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 "F�dselsdato"
 
-#: 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 "Organisasjonsenhet"
 
-#: 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 "Rolle"
 
-#: addressbook/backend/ebook/e-card.c:1440 mail/mail-format.c:930
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
 msgid "Mailer"
 msgstr "Postprogram"
 
-#: addressbook/backend/ebook/e-card.c:1454
+#: addressbook/backend/ebook/e-card.c:1445
 msgid "Free/Busy URL"
 msgstr "Ledig/opptatt URL"
 
-#: addressbook/backend/ebook/e-card.c:1461
+#: addressbook/backend/ebook/e-card.c:1452
 msgid "ICS Calendar"
 msgstr "ICS-kalender"
 
-#: addressbook/backend/ebook/e-card.c:1475
+#: addressbook/backend/ebook/e-card.c:1466
 msgid "Related Contacts"
 msgstr "Relaterte kontakter"
 
-#: addressbook/backend/ebook/e-card.c:1489
+#: addressbook/backend/ebook/e-card.c:1480
 msgid "Category List"
 msgstr "Kategoriliste"
 
-#: addressbook/backend/ebook/e-card.c:1496
+#: addressbook/backend/ebook/e-card.c:1487
 msgid "Wants HTML"
 msgstr "Vil ha HTML"
 
-#: addressbook/backend/ebook/e-card.c:1503
+#: addressbook/backend/ebook/e-card.c:1494
 msgid "Wants HTML set"
 msgstr "Vil ha HTML satt"
 
-#: addressbook/backend/ebook/e-card.c:1510
+#: addressbook/backend/ebook/e-card.c:1501
 msgid "List"
 msgstr "Liste"
 
-#: addressbook/backend/ebook/e-card.c:1517
+#: addressbook/backend/ebook/e-card.c:1508
 #, fuzzy
 msgid "List Show Addresses"
 msgstr "Annen adresse"
 
-#: addressbook/backend/ebook/e-card.c:1524
+#: addressbook/backend/ebook/e-card.c:1515
 msgid "Arbitrary"
 msgstr "Tilfeldig"
 
-#: addressbook/backend/ebook/e-card.c:1531
+#: addressbook/backend/ebook/e-card.c:1522
 msgid "ID"
 msgstr "ID"
 
-#: addressbook/backend/ebook/e-card.c:1538
+#: addressbook/backend/ebook/e-card.c:1529
 msgid "Last Use"
 msgstr "Sist brukt"
 
-#: addressbook/backend/ebook/e-card.c:1549
+#: addressbook/backend/ebook/e-card.c:1540
 msgid "Use Score"
 msgstr "Bruk poeng"
 
@@ -490,80 +498,83 @@ msgstr "Mottar s�keresultater fra LDAP-tjener..."
 msgid "Error performing search"
 msgstr "Feil ved utf�ring av s�k"
 
-#: addressbook/conduit/address-conduit.c:292
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Forvalgt synkroniseringsadresse:"
 
-#: addressbook/conduit/address-conduit.c:535
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Mark�ren kunne ikke lokaliseres\n"
 
-#: addressbook/conduit/address-conduit.c:548
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EBook ikke lastet\n"
 
-#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1272
-#: calendar/conduits/todo/todo-conduit.c:882
+#: 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 tjener"
 
-#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1273
-#: calendar/conduits/todo/todo-conduit.c:883
+#: 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: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 "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "En Bonobo-kontroll for visning av en adresse."
+msgid "Configure access to LDAP directory servers here"
+msgstr "Konfigurer tilgang til LDAP-katalogtjenere her"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "En Bonobo-kontroll for visning av en adresse."
+msgid "Directory Servers"
+msgstr "Katalogtjenere"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Eksempel p� Bonobo-kontroll som viser en adressebok."
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Evolution adressebok-komponent"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr "Konfigurasjonskontroll for Evolution adressebok-lager."
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Evolution adressebok-komponent"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure access to LDAP directory servers here"
-msgstr "Konfigurer tilgang til LDAP-katalogtjenere her"
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution adressebok-komponent"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Kontroll som viser et minikort for Evolutions adressebok."
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adressebok minikort visning"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Directory Servers"
-msgstr "Katalogtjenere"
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adressebok minikort visning"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution adressebok minikort visning"
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution adressebok-komponent"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Evolution komponent for h�ndtering av kontakter."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Factory for the controls exported by the Evolution Addressbook"
-msgstr "Factory for kontroller eksportert av Evolution adressebok"
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution adressebok minikort visning"
 
 #: 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:1863
+#: 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"
@@ -628,27 +639,27 @@ msgstr "Kunne ikke utf�re sp�rring p� Root DSE"
 msgid "The server responded with no supported search bases"
 msgstr "Tjeneren svarte ikke med noen st�ttede basis for s�k"
 
-#: 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 tjeneren st�tter ikke LDAPv3 schema-informasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1213
+#: addressbook/gui/component/addressbook-config.c:1215
 msgid "Error retrieving schema information"
 msgstr "Feil under henting av schema-informasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1221
+#: addressbook/gui/component/addressbook-config.c:1223
 msgid "Server did not respond with valid schema information"
 msgstr "Tjener svarte ikke med gyldig schema-informasjon"
 
-#: 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 "Legg til skript"
 
-#: 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 er ikke st�ttet i denne versjonen av Evolution"
 
@@ -767,7 +778,7 @@ msgstr "Denne sp�rringen ble ikke fullf�rt."
 
 #. 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"
 
@@ -780,46 +791,46 @@ msgstr "URIen som mappeutforskeren 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: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:1802
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr "Prim�r e-post"
 
-#: addressbook/gui/component/e-address-popup.c:608
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Velg en handling"
 
-#: 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 "Opprett en ny kontakt �%s�"
 
-#: 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 "Legg til adresse for eksisterende kontakt �%s�"
 
-#: addressbook/gui/component/e-address-popup.c:911
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Kj�rer sp�rring i adressebok..."
 
-#: addressbook/gui/component/e-address-popup.c:995
+#: addressbook/gui/component/e-address-popup.c:998
 #: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Rediger kontaktinfo"
 
-#: 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 "Legg til i kontakter"
 
-#: addressbook/gui/component/e-address-popup.c:1068
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Flett E-postadresse"
 
@@ -846,75 +857,56 @@ msgstr " V_is st�ttede baser "
 #: 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
-#: mail/subscribe-dialog.glade.h:3
 #: 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 "<- Fje_rn"
-
-#: 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 "Legg til (eller rediger) mapping av attributter"
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "Add LDAP Server"
+msgstr "LDAP-tjener"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
 msgstr "Adressebok-kilder"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:62
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
 #: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Alltid"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Anonymously"
 msgstr "Anonym"
 
-#: 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"
@@ -928,59 +920,56 @@ msgstr ""
 "Vennligst klikk p� �Fullf�r�-knappen for � lagre innstillingenene du har "
 "oppgitt her."
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
 msgstr "Tilkobling"
 
-#: 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_lett"
 
-#: 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-tjener"
+
+#: 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 bruke DN til � autentisere deg mot tjeneren"
 
-#: 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 bruke denne e-post adressen til � autentisere deg mot tjeneren"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Finished"
 msgstr "Fullf�rt"
 
-#: 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 "Konfigurasjonsassistent for LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "Mappings"
-msgstr "Mappinger"
-
-#: addressbook/gui/component/ldap-config.glade.h:35 mail/mail-account-gui.c:64
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr "Aldri"
 
-#: 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"
@@ -990,54 +979,26 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: 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 som brukes i Evolution:"
-
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid "Objectclasses Used on Server:"
-msgstr "Objektklasser som brukes p� tjener:"
-
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "En"
 
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"Please select an Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-"Vennligst velg en Evolution-attributt og en\n"
-"LDAP-attributt du vil assosiere med denne."
-
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid "R_estore Defaults"
-msgstr "Gjenopp_rett forvalg"
-
-#: addressbook/gui/component/ldap-config.glade.h:46
-msgid "Re_store Defaults"
-msgstr "_Gjenopprett forvalg"
-
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "S�_keomr�de: "
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:48
-#: calendar/gui/calendar-model.c:1975 calendar/gui/e-day-view.c:1670
-#: calendar/gui/e-week-view.c:1223
+#: 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�ker"
 
-#: 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"
@@ -1047,7 +1008,7 @@ msgstr ""
 "tjener hvis\n"
 "denne st�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"
@@ -1064,7 +1025,7 @@ msgstr ""
 "vil ikke Evolution beh�ve � bruke SSL/TLS fordi tilkoblingen 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"
@@ -1077,7 +1038,7 @@ msgstr ""
 "betyr at din tilkobling vil v�re usikker, og at du vil v�re s�rbar for "
 "sikkerhetshull. "
 
-#: 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"
@@ -1087,7 +1048,7 @@ msgstr ""
 "innstillinger\n"
 "for LDAP-s�k, og for oppretting og redigering av 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."
@@ -1095,31 +1056,31 @@ msgstr ""
 "Spesifisering av visningsnavn er det siste steget i konfigurasjon av en LDAP-"
 "tjener."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 1: Server Information"
 msgstr "Steg 1: Tjenerinformasjon"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Step 2: Connecting to Server"
 msgstr "Steg 2: Kobler til tjener"
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr "Steg 3: S�ker i katalogen"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr "Steg 4: Vis 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 "St�ttede s�kebaser"
 
-#: 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"
@@ -1131,7 +1092,7 @@ msgstr ""
 "Vennligst sp�r din systemadministrator hvis du ikke er sikker p� hva dette "
 "er."
 
-#: 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"
@@ -1145,7 +1106,7 @@ msgstr ""
 "trenger\n"
 "� endre disse alternativene."
 
-#: 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"
@@ -1156,7 +1117,7 @@ msgstr ""
 "starte.\n"
 "Hvis du lar denne st� tom vil s�k starte ved roten av katalogtreet."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:62
 #, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
@@ -1171,7 +1132,7 @@ msgstr ""
 "Et s�keomr�de som �sub� vil ta med alle oppf�ringer under din s�kebase.\n"
 "Et s�keomr�de som �one� vil kun ta med oppf�ringer ett niv� under basen."
 
-#: 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"
@@ -1187,14 +1148,14 @@ msgstr ""
 "om tjeneren. Vennligst kontakt din systemadministrator hvis du trenger\n"
 "hjelp med � finne denne informasjonen."
 
-#: 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 ""
 "Dette er fullt navn p� din LDAP-tjener. For eksempel �ldap.mittfirma.no�."
 
-#: 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"
@@ -1204,7 +1165,7 @@ msgstr ""
 "dette tallet \n"
 "for h�yt vil adresseboken bli treg."
 
-#: 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 "
@@ -1213,7 +1174,7 @@ msgstr ""
 "Dette er metoden Evolution bruker for � autentisere deg. Merk at hvis du "
 "setter denne til �e-post-adresse� krever anonym tilgang til din LDAP-tjener."
 
-#: 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"
@@ -1222,7 +1183,7 @@ msgstr ""
 "Dette er navnet p� denne tjeneren som vises i mappelisten i Evolution. \n"
 "Det brukes kun for visning p� skjermen."
 
-#: 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"
@@ -1233,81 +1194,44 @@ msgstr ""
 "liste med standardporter er gitt. Sp�r din systemadministrator hvilken\n"
 "port du skal bruke."
 
-#: 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 "Dette alternativet kontrollerer hvor lenge et s�k vil kj�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 ""
-
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr "B_ruk SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr "Bruker distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using email address"
 msgstr "Bruker e-post adresse"
 
-#: addressbook/gui/component/ldap-config.glade.h:101
-#: mail/mail-account-gui.c:63 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 "N�r mulig"
 
-#: 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
+#: 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 "_Legg til"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
-msgid "_Add ->"
-msgstr "_Legg til ->"
-
-#: addressbook/gui/component/ldap-config.glade.h:104
-msgid "_Add Mapping"
-msgstr "_Legg til mapping"
-
-#: addressbook/gui/component/ldap-config.glade.h:105
-msgid "_Add to DN"
-msgstr "_Legg til i DN"
-
-#: addressbook/gui/component/ldap-config.glade.h:106
-msgid "_Always"
-msgstr "_Alltid"
-
-#: addressbook/gui/component/ldap-config.glade.h:107
-msgid "_Delete Mapping"
-msgstr "_Slett mapping"
-
-#: 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 "_Ikke bruk SSL/TLS"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr "Grense for ne_dlasting:"
 
-#: addressbook/gui/component/ldap-config.glade.h:112 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
@@ -1317,149 +1241,86 @@ msgstr "Grense for ne_dlasting:"
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
-msgid "_Edit Mapping"
-msgstr "R_ediger mapping"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
-msgid "_Evolution attribute:"
-msgstr "_Evolution-attributt:"
-
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_If necessary "
-msgstr "_Om n�dvendig"
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_LDAP attribute:"
-msgstr "_LDAP-attributt:"
-
-#: addressbook/gui/component/ldap-config.glade.h:117
-msgid "_LDAP attributes:"
-msgstr "_LDAP-attributter:"
-
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr "Metode for p�_logging:"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-msgid "_More Options >>"
-msgstr "_Flere alternativer >>"
-
-#: 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 " Gjenopp_rett forvalg"
-
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Search base:"
 msgstr "_S�kebase:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "_Tjenernavn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Timeout (minutes):"
 msgstr "_Tidsavbrudd (minutter):"
 
-#: 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."
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
 msgstr "Evolution adressebok-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 "Factory for adressebokens grensesnitt 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:680
+#: 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:201
-msgid "Send HTML Mail?"
-msgstr "Send HTML e-post?"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:300
-msgid "View Contact Info"
-msgstr "Vis kontaktinformasjon"
-
-#: 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 "Vis kontaktliste"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:417
-msgid "Unnamed Contact List"
-msgstr "Kontaktliste uten navn"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+msgid "View Contact Info"
+msgstr "Vis kontaktinformasjon"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:434
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d ikke vist)"
+#: 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:500
+#: addressbook/gui/component/select-names/e-select-names-popup.c:350
 msgid "Unnamed Contact"
 msgstr "Kontakt uten navn:"
 
-#: addressbook/gui/component/select-names/e-select-names-table-model.c:350
+#: 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:510
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr "Velg kontakter fra adresseboken"
 
-#: addressbook/gui/component/select-names/e-select-names.c:570
+#: addressbook/gui/component/select-names/e-select-names.c:648
 msgid "Find contact in"
 msgstr "Finn kontakt i"
 
@@ -1523,7 +1384,7 @@ msgstr "Samarbeid"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1352
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -1588,13 +1449,13 @@ msgstr "Vil motta _HTML e-post"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:656 calendar/gui/e-calendar-table.c:969
-#: calendar/gui/e-day-view.c:3720 calendar/gui/e-week-view.c:3559
-#: filter/filter.glade.h:15 mail/folder-browser.c:1768
+#: 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 "_Slett"
 
@@ -1624,14 +1485,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:187
+#: 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: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 "Redigerbar"
 
@@ -2656,48 +2517,48 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:159
+#: 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:104
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:459
 msgid "Book"
 msgstr "Bok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:166
+#: 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 "Kort"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:173
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
 msgid "Is New Card"
 msgstr "Er nytt kort"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
 msgid "Writable Fields"
 msgstr "Skrivbare felter"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
 msgid "Changed"
 msgstr "Endret"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:845
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr "Kategori editor ikke tilgjengelig."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:853
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakten h�rer til disse kategoriene:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1027
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr "Lagre kontakt som VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1073
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2705,7 +2566,7 @@ msgstr ""
 "Er du sikker p� at du vil\n"
 "slette disse kontaktene?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1076
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2713,11 +2574,11 @@ msgstr ""
 "Er du sikker p� at du vil\n"
 "slette denne kontakten?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1776
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2380
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kunne ikke finne widget for felt: �%s�"
@@ -2861,28 +2722,28 @@ msgstr "_Suffiks:"
 msgid "_Title:"
 msgstr "_Tittel:"
 
-#: 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-post adresse eller dra en kontakt inn i feltet under:"
 
-#: 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"
 
@@ -2948,8 +2809,9 @@ msgstr ""
 "Den nye e-post adressen eller navnet for denne kontakten\n"
 "eksisterer allerede i denne mappen. Vil du legge til likevel?"
 
+#. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:117
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Avansert s�k"
 
@@ -2969,7 +2831,7 @@ msgstr "%d kort"
 #: 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 "Sp�r"
@@ -2984,20 +2846,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 "Feil ved endring av kort"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1160
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr "Suksess"
 
 #: 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:2104
-#: shell/e-storage.c:602 shell/evolution-shell-component.c:1199
+#: 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 "Ukjent feil"
 
@@ -3006,7 +2869,7 @@ msgid "Repository offline"
 msgstr "Frakoblet lager"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
-#: shell/evolution-shell-component.c:1190
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
@@ -3023,11 +2886,11 @@ msgid "Protocol not supported"
 msgstr "Protokollen er ikke st�ttet"
 
 #: 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
-#: camel/camel-service.c:847 camel/camel-service.c:890
+#: 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"
@@ -3127,7 +2990,7 @@ msgstr "Type"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-#: mail/importers/pine-importer.c:591
+#: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Adressebok"
 
@@ -3210,7 +3073,7 @@ msgstr "Kopier"
 msgid "Paste"
 msgstr "Lim inn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:10
+#: 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
@@ -3218,7 +3081,7 @@ msgid "Delete"
 msgstr "Slett"
 
 #: 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 "Aktiv visning"
 
@@ -3319,38 +3182,38 @@ msgstr "og et annet kort."
 msgid "Save in addressbook"
 msgstr "Lagre i adressebok"
 
-#: 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 "Bredde"
 
-#: 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�yde"
 
-#: 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 "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 "Tekstmodell"
 
-#: 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 "Kolonnebredde"
 
@@ -3382,11 +3245,11 @@ msgstr ""
 msgid "Adapter"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:165
+#: addressbook/gui/widgets/e-minicard.c:169
 msgid "Selected"
 msgstr "Valgt"
 
-#: addressbook/gui/widgets/e-minicard.c:172
+#: addressbook/gui/widgets/e-minicard.c:176
 msgid "Has Cursor"
 msgstr "Har mark�r"
 
@@ -3709,98 +3572,101 @@ msgstr "30"
 msgid "31st"
 msgstr "31"
 
-#: calendar/cal-util/cal-util.c:523 calendar/cal-util/cal-util.c:545
+#: 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�y"
 
-#: calendar/cal-util/cal-util.c:525 calendar/cal-util/cal-util.c:547
-#: calendar/gui/calendar-model.c:1701
+#: 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:527 calendar/cal-util/cal-util.c:549
+#: 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:543
+#: 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 "Udefinert"
 
-#: calendar/conduits/calendar/calendar-conduit.c:204
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr "Del opp hendelser som g�r over flere dager:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1219
-#: calendar/conduits/todo/todo-conduit.c:828
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Feil under kommunikasjon med kalendertjeneren"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1370
-#: calendar/conduits/calendar/calendar-conduit.c:1373
+#: 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 lese pilotens kalender-applikasjonsblokk"
 
-#: calendar/conduits/todo/todo-conduit.c:204
+#: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
 msgstr "Forvalgt prioritet:"
 
-#: calendar/conduits/todo/todo-conduit.c:952
-#: calendar/conduits/todo/todo-conduit.c:955
+#: 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 lese pilotens applikasjonsblokk for oppgaveliste"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "En Bonobo-kontroll som viser en oppgaveliste."
+msgid "Calendar and Tasks"
+msgstr "Kalender og oppgaver"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Eksempel p� Bonobo-kontroll som viser en kalender."
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfigurer din tidssone, kalender og oppgaveliste her "
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
 msgstr "Kalender og oppgaver"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Konfigurasjonskontroll for Evolution kalender."
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution kalender-komponent"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Konfigurer din tidssone, kalender og oppgaveliste her "
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution kalender-komponent"
 
 #: 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 av kalenderen."
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution kalender iTip/iMip-visning"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 #, fuzzy
-msgid "Factory for the Evolution Calendar objects"
-msgstr "Factory for Evolutions sammendrag-komponent."
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution kalender-komponent"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Factory for � sentralisere dialoger for kalender-komponent"
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution nyhetsredigerer"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Alarm notification service"
-msgstr "Alarm-tjeneste"
-
-#: 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 "Factory for alarm-tjenesten"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
@@ -3841,17 +3707,17 @@ msgstr "Utsett-tid (minutter)"
 msgid "_Edit appointment"
 msgstr "R_ediger avtale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:760
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:831
-#: calendar/gui/alarm-notify/alarm-queue.c:855
-#: calendar/gui/tasks-control.c:457 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:835
+#: 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"
@@ -3863,7 +3729,7 @@ msgstr ""
 "� sende e-post. Evolution vil vise en vanlig dialog\n"
 "for p�minnelse i stedet."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:861
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3880,7 +3746,7 @@ msgstr ""
 "\n"
 "Er du sikker p� at du �nsker � kj�re dette programmet?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:889
 msgid "Do not ask me about this program again."
 msgstr "Ikke sp�r meg om dette programmet igjen."
 
@@ -3904,7 +3770,7 @@ msgstr "Beskrivelse inneholder"
 msgid "Comment contains"
 msgstr "Kommentar inneholder"
 
-#: 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 treff"
 
@@ -3914,8 +3780,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"
 
@@ -3933,7 +3799,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"
 
@@ -3945,7 +3811,7 @@ msgstr ""
 "konfigurasjon."
 
 #: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1341
-#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1862
+#: 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"
@@ -3964,10 +3830,10 @@ msgid "Public folder containing appointments and events"
 msgstr "Offentlig mappe som inneholder avtaler og hendelser"
 
 #: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:735
-#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:511
-#: calendar/importers/icalendar-importer.c:708
-#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1864
-#: my-evolution/e-summary-tasks.c:326 my-evolution/e-summary-tasks.c:344
+#: 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 "Oppgaver"
@@ -4032,12 +3898,12 @@ msgstr "Avtale for hele _dagen"
 msgid "Create a new all-day appointment"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: 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 "Konfidensiell"
@@ -4062,37 +3928,37 @@ msgstr "�"
 msgid "W"
 msgstr "V"
 
-#: 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 "Ledig"
 
 #: 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:1184
+#: calendar/gui/e-meeting-time-sel.c:407
+#: shell/evolution-shell-component.c:1202
 msgid "Busy"
 msgstr "Opptatt"
 
-#: 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 "Ikke startet"
 
-#: 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 "Under arbeid"
 
-#: 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 "Fullf�rt"
 
-#: calendar/gui/calendar-model.c:1028
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4103,33 +3969,33 @@ 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:286
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1982
-#: mail/folder-browser.c:1730 mail/mail-account-gui.c:1254
-#: mail/mail-account-gui.c:1686 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:78
+#: 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:1703
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:276
-#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:543
-#: calendar/gui/e-meeting-model.c:837
+#: 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/e-meeting-model.c:838
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "Nei"
 
@@ -4166,32 +4032,32 @@ msgstr "Tilgang nektet ved �pning av kalender"
 msgid "Could not open the folder in '%s'"
 msgstr "Kunne ikke �pne 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 "Type visning som skal brukes"
 
-#: calendar/gui/dialogs/alarm-options.c:473
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Alternativer for lyd-alarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:482
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Alternativer for meldingsalarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:491
+#: calendar/gui/dialogs/alarm-options.c:438
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "Alternativer for e-post-alarm"
 
-#: calendar/gui/dialogs/alarm-options.c:500
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Alternativer for program-alarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Alternativer for ukjente alarmer"
 
@@ -4227,22 +4093,24 @@ msgstr "Send til:"
 msgid "With these arguments:"
 msgstr "Med disse argumentene:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 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 "dager"
 
 #: 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 ganger hver"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12 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:13 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"
 
@@ -4307,7 +4175,7 @@ msgstr "slutt p� avtale"
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: 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 "minutt(er)"
 
@@ -4487,7 +4355,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 "_Generell"
 
@@ -4633,61 +4501,61 @@ msgstr " (Ferdig "
 msgid "Due "
 msgstr "Ferdig "
 
-#: calendar/gui/dialogs/comp-editor.c:329
+#: calendar/gui/dialogs/comp-editor.c:328
 msgid "Could not update invalid object"
 msgstr "Kunne ikke oppdatere ugyldig objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:332
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr "Objekt ikke funnet, ikke oppdatert"
 
-#: calendar/gui/dialogs/comp-editor.c:335
+#: calendar/gui/dialogs/comp-editor.c:334
 msgid "You don't have permissions to update this object"
 msgstr "Du har ikke rettigheter til � oppdatere dette objektet"
 
-#: calendar/gui/dialogs/comp-editor.c:338
+#: calendar/gui/dialogs/comp-editor.c:337
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:788
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:793
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:796
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:799
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppf�ring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:810
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1231
-#: 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/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 "Lagre som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1332
-#: calendar/gui/dialogs/comp-editor.c:1356
-#: calendar/gui/dialogs/comp-editor.c:1380
+#: 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 ""
 "Endringer som gj�res i denne oppf�ringen kan bli forkastet hvis en "
 "oppdatering kommer via e-post"
 
-#: calendar/gui/dialogs/comp-editor.c:1407
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr "Kan ikke hente versjonsdata!"
 
@@ -4759,29 +4627,29 @@ msgstr "Gjeninntreffelse"
 
 #: calendar/gui/dialogs/event-editor.c:220
 #: calendar/gui/dialogs/event-editor.c:292
-#: calendar/gui/dialogs/event-editor.c:432
+#: calendar/gui/dialogs/event-editor.c:434
 msgid "Scheduling"
 msgstr "M�teplanlegging"
 
 #: calendar/gui/dialogs/event-editor.c:227
 #: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:435 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:437 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "M�te"
 
-#: 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 "Startdato er feil"
 
-#: calendar/gui/dialogs/event-page.c:664
+#: calendar/gui/dialogs/event-page.c:610
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: calendar/gui/dialogs/event-page.c:687
+#: calendar/gui/dialogs/event-page.c:633
 msgid "Start time is wrong"
 msgstr "Tid for start er feil"
 
-#: calendar/gui/dialogs/event-page.c:694
+#: calendar/gui/dialogs/event-page.c:640
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
@@ -4838,31 +4706,30 @@ msgid "Su_mmary:"
 msgstr "Sa_mmendrag:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Kontakter..."
-
-#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: calendar/gui/dialogs/meeting-page.c:400
+#: 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 kreves."
 
-#: calendar/gui/dialogs/meeting-page.c:424
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: calendar/gui/dialogs/meeting-page.c:579
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr "Denne personen er allerede satt opp for dette m�tet!"
 
-#: calendar/gui/dialogs/meeting-page.c:652
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
@@ -4902,14 +4769,14 @@ msgid "Member"
 msgstr "Medlem"
 
 #: 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"
 
 #: 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"
@@ -4924,10 +4791,37 @@ msgid "_Change Organizer"
 msgstr "En_dre organisator"
 
 #: 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 "_Inviter andre..."
 
+#: 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-�yene"
+
+#: calendar/gui/dialogs/recur-comp.c:77
+#, fuzzy
+msgid "All Instances"
+msgstr "Al_le stasjoner:"
+
 #: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
@@ -4945,7 +4839,7 @@ msgstr "p�"
 msgid "first"
 msgstr "f�rste"
 
-#: calendar/gui/dialogs/recurrence-page.c:978 filter/filter-datespec.c:65
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr "sekund"
 
@@ -4965,7 +4859,7 @@ msgstr "siste"
 msgid "Other Date"
 msgstr "Annen dato"
 
-#: calendar/gui/dialogs/recurrence-page.c:1032 filter/filter-datespec.c:68
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "dag"
 
@@ -5099,7 +4993,7 @@ msgstr "Tildeling"
 msgid "Due date is wrong"
 msgstr "Gjenintreffende dato er feil"
 
-#: 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:"
@@ -5109,6 +5003,10 @@ 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 "Fer_dig-dato:"
@@ -5261,13 +5159,13 @@ msgstr "90%"
 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 "Sletter valgte objekter"
 
-#: 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: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 "_�pne"
@@ -5276,30 +5174,30 @@ msgstr "_�pne"
 msgid "_Save as..."
 msgstr "_Lagre som..."
 
-#: 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 "S_kriv ut..."
 
-#: 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 "Kli_pp ut"
 
-#: 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 "_Kopier"
 
-#: 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"
@@ -5325,12 +5223,12 @@ msgstr "_Merk valgte oppgaver som fullf�rt"
 msgid "_Delete Selected Tasks"
 msgstr "Sle_tt valgte oppgaver"
 
-#: calendar/gui/e-calendar-table.c:1243 calendar/gui/e-day-view.c:7640
-#: calendar/gui/e-week-view.c:4248
+#: 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 "Oppdaterer objekter"
 
-#: calendar/gui/e-calendar-table.c:1326
+#: calendar/gui/e-calendar-table.c:1327
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klikk for � legge til en oppgave"
@@ -5369,7 +5267,7 @@ msgid "Start Date"
 msgstr "Startdato"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:56 shell/e-shell.c:767
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Sammendrag"
@@ -5401,22 +5299,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 minutters oppdeling"
 
 #. 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"
 
@@ -5432,67 +5330,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 "Ny _avtale"
 
-#: 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 "Ny avtale som varer h_ele dagen"
 
-#: 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 "Nytt m�te"
 
-#: 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 "Ny oppgave"
 
-#: 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 "Skriv ut..."
 
-#: 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 "G� _til i dag"
 
-#: 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 "_G� til dato..."
 
-#: 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 "_Publiser ledig/opptatt-informasjon"
 
-#: calendar/gui/e-day-view.c:3694 calendar/gui/e-week-view.c:3535
-#: 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 "Inn_stillinger..."
 
-#: calendar/gui/e-day-view.c:3703 calendar/gui/e-week-view.c:3542
-#: 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 "Lagre _som..."
 
-#: 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 "_Sett opp m�te..."
 
-#: 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 "_Videresend som iCalendar..."
 
-#: 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 "Gj�r denne hendelsen _flyttbar"
 
-#: 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 "Slett denne _hendelsen"
 
-#: 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 "Slett _alle hendelser"
 
@@ -5611,333 +5509,333 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:1058
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "Plassering:"
 
-#: 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-meeting-model.c:319 calendar/gui/e-meeting-model.c:851
-#: calendar/gui/itip-utils.c:404
+#: 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 "Godtatt"
 
-#: calendar/gui/e-itip-control.c:1081 calendar/gui/itip-utils.c:407
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Akteptert tentativt"
 
-#: calendar/gui/e-itip-control.c:1085 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:852
-#: calendar/gui/itip-utils.c:410 calendar/gui/itip-utils.c:436
+#: 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 "Avsl�tt"
 
-#: 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:809
-#: calendar/gui/e-meeting-model.c:825 camel/camel-gpg-context.c:1531
-#: camel/camel-gpg-context.c:1581 camel/camel-tcp-stream-openssl.c:634
-#: 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:931 widgets/misc/e-charset-picker.c:60
+#: 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 "Ukjent"
 
-#: 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 "Velg en handling:"
 
-#: calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Oppdater"
 
-#: 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:2094 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 "Godta"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Godta tentativt"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Avsl�"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Send ledig/opptatt-informasjon"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Oppdater status for respondent"
 
-#: calendar/gui/e-itip-control.c:1225
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
-#: calendar/gui/e-itip-control.c:1238 calendar/gui/itip-utils.c:424
-#: shell/evolution-shell-component.c:1162 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 "Avbryt"
 
-#: 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> har publisert m�teinformasjon."
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "M�teinformasjon"
 
-#: 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> foresp�r at %s er tilstede i et m�te."
 
-#: 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> foresp�r din tilstedev�relse i et m�te."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "M�teforslag"
 
-#: 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> �nsker � legge til informasjon i et eksisterende m�te."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "M�teoppdatering"
 
-#: 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> �nsker � motta seneste m�teinformasjon."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "Foresp�rsel om m�teoppdatering"
 
-#: 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> har svart p� en m�teforesp�rsel."
 
-#: calendar/gui/e-itip-control.c:1346
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "M�tesvar"
 
-#: 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> har avlyst et m�te."
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "M�teavlysing"
 
-#: 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> har sendt en uforst�elig melding."
 
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Ugyldig m�temelding"
 
-#: 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> har publisert informasjon om en oppgave."
 
-#: calendar/gui/e-itip-control.c:1387
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Oppgaveinformasjon"
 
-#: 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> foresp�r at %s utf�rer en oppgave."
 
-#: 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> foresp�r at du utf�rer en oppgave."
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Foresp�rsel om oppgave"
 
-#: 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> �nsker � legge til informasjon i en eksisterende oppgave."
 
-#: calendar/gui/e-itip-control.c:1400
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Oppgaveoppdatering"
 
-#: 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> �nsker � motta den seneste informasjon om oppgaven."
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Foresp�rsel om oppgaveoppdatering"
 
-#: 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> har svart p� en oppgavetildeling."
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Svar p� oppgave"
 
-#: 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> har avlyst en oppgave."
 
-#: calendar/gui/e-itip-control.c:1421
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Avlysning av oppgave"
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Ugyldig oppgavemelding"
 
-#: 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> har publisert ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:1449
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: 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> foresp�r din ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:1454
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Ledig/opptatt foresp�rsel"
 
-#: 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> har svart p� en foresp�rsel etter ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:1459
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Ledig/opptatt svar"
 
-#: calendar/gui/e-itip-control.c:1464
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig ledig/opptatt-melding"
 
-#: 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 "Meldingen ser ikke ut til � v�re riktig utformet"
 
-#: calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "Denne meldingen inneholder foresp�rsler som ikke er st�ttet."
 
-#: 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 "Vedlegget inneholder ikke et gyldig kalender-vedlegg"
 
-#: calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneholder ingen visbare kalender-vedlegg"
 
-#: 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 "Objektet er ugyldig og kan ikke oppdateres\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 "Det oppsto en feil i CORBA-systemet\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 "Objektet kunne ikke finnes\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 "Du har ikke rettigheter til � oppdatere kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Oppdatering fullf�rt\n"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunne ikke oppdateres!\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 ""
 "Deltakerstatus kan ikke oppdateres fordi oppf�ringen ikke eksisterer lenger"
 
-#: 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 "Dette svaret er ikke fra en aktiv deltaker. Legg til som deltaker?"
 
-#: 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 "Deltakerstatus kunne ikke oppdateres pga ugyldig status!\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 "Du har ikke rettigheter til � oppdatere kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Deltakerstatus oppdatert\n"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltakerstatus kunne ikke oppdateres!\n"
 
-#: calendar/gui/e-itip-control.c:2048
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Fjerning fullf�rt"
 
-#: 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 "Oppf�ring sendt!\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 "Oppf�ringen kunne ikke sendes!\n"
 
-#: calendar/gui/e-itip-control.c:2205
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr "Velg kalendermappe"
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr "Velg oppgavemappe"
 
@@ -5982,7 +5880,7 @@ msgstr "start-dato"
 msgid "Chair Persons"
 msgstr "Styremedlemmer"
 
-#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1694
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
 msgid "Required Participants"
 msgstr "Obligatoriske deltakere"
 
@@ -5995,57 +5893,57 @@ msgid "Resources"
 msgstr "Ressurser"
 
 #: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
-#: calendar/gui/e-meeting-model.c:539 calendar/gui/e-meeting-model.c:805
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:806
 msgid "Individual"
 msgstr "Individuell"
 
 #: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
-#: calendar/gui/e-meeting-model.c:806
+#: calendar/gui/e-meeting-model.c:807
 msgid "Group"
 msgstr "Gruppe"
 
 #: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
-#: calendar/gui/e-meeting-model.c:807
+#: calendar/gui/e-meeting-model.c:808
 msgid "Resource"
 msgstr "Ressurs"
 
 #: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
-#: calendar/gui/e-meeting-model.c:808
+#: calendar/gui/e-meeting-model.c:809
 msgid "Room"
 msgstr "Rom"
 
 #: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:821
+#: calendar/gui/e-meeting-model.c:822
 msgid "Chair"
 msgstr "Styremedlem"
 
 #: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:541 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
 msgid "Required Participant"
 msgstr "Obligatorisk deltaker"
 
 #: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:263
-#: calendar/gui/e-meeting-model.c:823
+#: calendar/gui/e-meeting-model.c:824
 msgid "Optional Participant"
 msgstr "Valgfri deltaker"
 
 #: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:265
-#: calendar/gui/e-meeting-model.c:824
+#: calendar/gui/e-meeting-model.c:825
 msgid "Non-Participant"
 msgstr "Ikke-deltaker"
 
 #: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
-#: calendar/gui/e-meeting-model.c:549 calendar/gui/e-meeting-model.c:850
+#: calendar/gui/e-meeting-model.c:550 calendar/gui/e-meeting-model.c:851
 msgid "Needs Action"
 msgstr "Trenger handling"
 
 #: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
-#: calendar/gui/e-meeting-model.c:853 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 "Tentativ"
 
 #: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
-#: calendar/gui/e-meeting-model.c:854
+#: calendar/gui/e-meeting-model.c:855
 msgid "Delegated"
 msgstr "Delegert"
 
@@ -6056,14 +5954,14 @@ msgstr "Under arbeid"
 #. 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"
@@ -6075,63 +5973,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 "Ute"
 
-#: calendar/gui/e-meeting-time-sel.c:410
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: calendar/gui/e-meeting-time-sel.c:468
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Vis k_un arbeidstid"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Vis _zoomet ut"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "_Oppdater ledig/opptatt"
 
-#: 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 "_Autovelg"
 
-#: 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 mennesker og ressurser"
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Alle _mennesker og en ressurs"
 
-#: calendar/gui/e-meeting-time-sel.c:594
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "_Obligatoriske mennesker"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Obligatoriske mennesker _og en ressurs"
 
-#: calendar/gui/e-meeting-time-sel.c:630
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Tid for m�tets _start:"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Tid for m�tets slutt:"
 
@@ -6177,7 +6075,7 @@ msgstr "Sletter valgte objekter..."
 msgid "Expunging"
 msgstr "T�mmer"
 
-#: calendar/gui/e-week-view.c:3509
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
@@ -6277,56 +6175,57 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:262 calendar/gui/itip-utils.c:333
+#: 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 m� oppgis."
 
-#: calendar/gui/itip-utils.c:297
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: calendar/gui/itip-utils.c:376 calendar/gui/itip-utils.c:485
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 msgid "Event information"
 msgstr "Hendelsesinformasjon"
 
-#: calendar/gui/itip-utils.c:378 calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 msgid "Task information"
 msgstr "Oppgaveinformasjon"
 
-#: calendar/gui/itip-utils.c:380 calendar/gui/itip-utils.c:489
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Journal information"
 msgstr "Journalinformasjon"
 
-#: calendar/gui/itip-utils.c:382 calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: calendar/gui/itip-utils.c:384
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
-#: calendar/gui/itip-utils.c:420
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: calendar/gui/itip-utils.c:428
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: calendar/gui/itip-utils.c:432
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr "Motforslag"
 
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/opptatt-informasjon (%s til %s)"
 
-#: calendar/gui/itip-utils.c:512
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Du m� v�re en deltager i hendelsen."
 
@@ -6425,8 +6324,8 @@ msgid "Contacts: "
 msgstr "Kontakter: "
 
 #: calendar/gui/print.c:2533 calendar/gui/print.c:2619
-#: calendar/gui/tasks-control.c:579 mail/mail-callbacks.c:2939
-#: my-evolution/e-summary.c:618
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:616
 msgid "Print Preview"
 msgstr "Forh�ndsvisning av utskrift"
 
@@ -6442,7 +6341,7 @@ msgstr "Skriveroppsett"
 msgid "The URI of the tasks folder to display"
 msgstr "URIen til oppgavemappen skal vises"
 
-#: calendar/gui/tasks-control.c:465
+#: 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"
@@ -6454,49 +6353,51 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
-#: calendar/gui/tasks-control.c:472
+#: calendar/gui/tasks-control.c:479
 msgid "Do not ask me again."
 msgstr "Ikke sp�r meg igjen."
 
-#: calendar/gui/tasks-control.c:608
+#: calendar/gui/tasks-control.c:615
 msgid "Print Tasks"
 msgstr "Skriv ut oppgaver"
 
-#: 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.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "Factory for import av iCalendar-filer til Evolution."
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Evolution kalender-komponent"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "Importerer iCalendar-filer til Evolution"
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Evolution kalender-komponent"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "Importerer vCalendar-filer til Evolution"
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Evolution kalender-komponent"
 
-#: calendar/importers/icalendar-importer.c:172
-#, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr "Kan ikke hente lagerliste fra registeret: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Kalendermelding"
 
-#: calendar/importers/icalendar-importer.c:184
-#, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "Kan ikke kalle 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:487
+#: calendar/importers/icalendar-importer.c:404
 msgid "Reminder!!"
 msgstr "P�minnelse!!"
 
-#: calendar/importers/icalendar-importer.c:701
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "Hendlelser i kalenderen"
 
-#: calendar/importers/icalendar-importer.c:726
+#: calendar/importers/icalendar-importer.c:663
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6504,11 +6405,11 @@ msgstr ""
 "Evolution har funnet filer fra GNOME kalender.\n"
 "Vil du importere dem til Evolution?"
 
-#: calendar/importers/icalendar-importer.c:733
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr "GNOME kalender"
 
-#: calendar/pcs/cal-backend-file.c:310
+#: calendar/pcs/cal-backend-file.c:311
 msgid "Can't save calendar data: Malformed URI."
 msgstr ""
 
@@ -8176,11 +8077,11 @@ msgstr "Du kan ikke importere n�kler med dette cipheret"
 msgid "You may not export keys with this cipher"
 msgstr "Du kan ikke eksportere n�kler med dette cipheret"
 
-#: camel/camel-data-cache.c:137
+#: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
 msgstr "Kunne ikke opprette sti til buffer"
 
-#: 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 cache-oppf�ring: %s: %s"
@@ -8221,11 +8122,13 @@ msgid "You must be working online to complete this operation"
 msgstr "Du m� arbeide tilknyttet for � fullf�re denne operasjonen"
 
 #: 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 "Klarte ikke � opprette 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 "Feil under oppretting av underprosess �%s�: %s"
@@ -8380,9 +8283,9 @@ msgstr ""
 "Du trenger et passord for � l�se opp n�kkelen for\n"
 "bruker �%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 "Avbrutt"
 
@@ -8403,7 +8306,7 @@ msgstr "Ingen data gitt"
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Kan ikke kryptere: Ingen gyldige mottakere spesifisert."
 
-#: camel/camel-gpg-context.c:1122
+#: camel/camel-gpg-context.c:1125
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8414,24 +8317,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 "Feil under bruk av GPG p� %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 "Feil ved kj�ring av 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 "Feil ved kj�ring av 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 ""
@@ -8655,75 +8558,79 @@ msgstr "Svar fra tjener inneholdt ufullstendige autorisasjonsdata\n"
 msgid "Server response does not match\n"
 msgstr "Svar fra tjener er ikke likt\n"
 
-#: 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
 #, fuzzy
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 "Dette alternativet kobler til tjeneren med bruk av Kerberos 4-autentisering."
 
-#: 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-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 "Ugyldig svar p� autentisering fra tjener."
 
-#: camel/camel-sasl-gssapi.c:281
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "Klarte ikke � opprette r�r til �%s�: %s"
+
+#: camel/camel-sasl-gssapi.c:299
 msgid "Unsupported security layer."
 msgstr "Ust�ttet sikkerhetslag."
 
@@ -8819,30 +8726,30 @@ msgstr "URL �%s� m� inneholde en sti"
 msgid "Resolving: %s"
 msgstr "Finner: �%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 "Feil i navneoppslag: %s"
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Vertsoppslag feilet: %s: vert ikke funnet"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Vertsoppslag feilet: %s: ukjent �rsak"
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 msgid "Resolving address"
 msgstr "Finner adresse"
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 msgid "Host lookup failed: host not found"
 msgstr "Vertsoppslag feilet: vert ikke funnet"
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 msgid "Host lookup failed: unknown reason"
 msgstr "Vertsoppslag feilet: ukjent �rsak"
 
@@ -9033,7 +8940,7 @@ msgstr "Bruk av n�kkel st�tter ikke sertifikatsignering"
 msgid "Error in application verification"
 msgstr "Feil i applikasjonsverifikasjon"
 
-#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:811
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9046,11 +8953,11 @@ msgstr ""
 "Fingeravtrykk      %s\n"
 "Signatur:          %s"
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:817
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr "GODTATT"
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:817
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr "UGYLDIG"
 
@@ -9074,7 +8981,7 @@ msgstr ""
 "Vil du akseptere likevel?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:821
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9089,7 +8996,7 @@ msgstr ""
 "\n"
 "Vil du akseptere?"
 
-#: camel/camel-tcp-stream-ssl.c:865
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9098,7 +9005,7 @@ msgstr ""
 "Sertifikatproblem: %s\n"
 "Utsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:917
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9107,7 +9014,7 @@ msgstr ""
 "Ugyldig sertifikatdomene: %s\n"
 "Utsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:935
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9116,7 +9023,7 @@ msgstr ""
 "Sertifikatet har g�tt ut: %s\n"
 "Utsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:952
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9125,7 +9032,7 @@ msgstr ""
 "Listen over sertifikater som er trukket tilbake er g�tt ut: %s\n"
 "Utsteder: %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Kunne ikke tolke URL �%s�"
@@ -9144,29 +9051,29 @@ msgstr "Ingen slik melding %s i %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan ikke kopiere eller flytte meldinger inn i en virtuell mappe"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-vee-store.c:281
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen slik mappe"
 
-#: camel/camel-vee-store.c:294
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikke endre navn p� mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-vee-store.c:302
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke endre navn p� mappe: %s: Ingen slik 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-command.c:453
 #: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr "Operasjon avbrutt"
@@ -9197,16 +9104,16 @@ msgstr "Uventet svar fra IMAP-tjener: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando feilet: %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 tjener ble avsluttet for tidlig."
 
-#: 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-tjener inneholdt ikke %s-informasjon"
 
-#: 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 svar �OK� fra IMAP-tjener: %s"
@@ -9298,7 +9205,7 @@ msgstr "Ser etter nye meldinger"
 msgid "Check for new messages in all folders"
 msgstr "Se etter nye meldinger i alle mapper"
 
-#: 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 "Mapper"
 
@@ -9357,7 +9264,7 @@ msgstr "Tilkobling avbrutt"
 
 #: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:275
+#: 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"
@@ -9384,7 +9291,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-tjener %s st�tter ikke etterspurt autentiseringstype %s"
 
 #: camel/providers/imap/camel-imap-store.c:1085
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/smtp/camel-smtp-transport.c:484
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen st�tte for autentiseringstype %s"
@@ -9575,7 +9482,7 @@ msgstr "Ugyldig meldingsinnhold"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9587,14 +9494,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:168
+#: 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:173
+#: camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9620,8 +9527,8 @@ msgid "not a maildir directory"
 msgstr "ikke en maildir katalog"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:287
-#: camel/providers/local/camel-spool-store.c:317
+#: 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�ke i mappe �%s�: %s"
@@ -9642,8 +9549,8 @@ msgstr "Ser etter nye meldinger"
 
 #: camel/providers/local/camel-maildir-summary.c:733
 #: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:580
-#: camel/providers/local/camel-mbox-summary.c:671
+#: 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 "Lagrer mappe"
@@ -9741,60 +9648,60 @@ msgstr "Fatal feil i lesing av postboksen n�r posisjon %ld i mappe %s"
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan ikke sjekke mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:585
-#: camel/providers/local/camel-mbox-summary.c:676
+#: 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 �pne fil %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:597
+#: 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 �pne midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:610
-#: camel/providers/local/camel-mbox-summary.c:772
+#: 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:619
+#: 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:630
+#: camel/providers/local/camel-mbox-summary.c:560
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke endre navn p� mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:714
-#: camel/providers/local/camel-mbox-summary.c:722
-#: 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 "Feil i sammendrag og mappe, selv etter synkronisering"
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:777
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjent feil: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:812
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kunne ikke lagre mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:976
-#: camel/providers/local/camel-mbox-summary.c:1002
+#: 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 "Feil under skriving til midlertidig postboks: %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 "Skriving til midlertidig postboks feilet: %s: %s"
@@ -9828,35 +9735,35 @@ msgstr "Spool �%s� kan ikke �pnes: %s"
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "Spool �%s� er ikke en vanlig fil eller katalog"
 
-#: camel/providers/local/camel-spool-store.c:154
+#: 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:181
+#: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "�%s� er ikke en postboks-fil."
 
-#: camel/providers/local/camel-spool-store.c:198
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr "Lager st�tter ikke en INNBOKS"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: 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:210
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Tre av spool-mapper %s"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-mapper kan ikke v�re gis nytt navn"
 
-#: camel/providers/local/camel-spool-store.c:226
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr "Spoolmapper kan ikke v�re slettes"
 
@@ -10092,7 +9999,7 @@ msgstr ""
 "Kunne ikke koble til POP-tjener %s.\n"
 "Feil ved oversending av passord: %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 "Ingen slik mappe �%s�."
@@ -10160,140 +10067,140 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "For levering av e-post via en ekstern e-posttjener 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 "Syntaksfeil, kommando ikke gjenkjent"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaksfeil i parametere 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 implementert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter ikke implementert"
 
-#: 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� systemhjelp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr "Hjelp-melding"
 
-#: 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 tilgjengelig, 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 "Forespurt e-post handling er ok, fullf�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 bruker; 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 "Forespurt e-post handling er ikke utf�rt: postboks ikke tilgjengelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Forespurt handling ikke utf�rt: postboks ikke tilgjengelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr "Forespurt handling avbrutt: feil i prosessering"
 
-#: 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 bruker; vennligst 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 "Forespurt handling ikke utf�rt: utilstrekkelig lagringsplass"
 
-#: 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 "Forespurt e-post handling avbrutt: lagringsallokering oversteget"
 
-#: 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 "Forespurt handling ikke utf�rt: postboksnavn ikke tillatt"
 
-#: 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; slutt med <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr "Transaksjonen feilet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr "Passordoverf�ring kreves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr "Autentiseringsmekanismen er for svak"
 
-#: 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 kreves for forespurt autentiseringsmekanisme."
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr "Midlertidig autentiseringsfeil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "Autentisering kreves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:298
+#: camel/providers/smtp/camel-smtp-transport.c:297
 msgid "Welcome response error"
 msgstr "Feil i velkommen-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:342
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: 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 "Kunne ikke koble til SMTP-tjener %s i sikker modus: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:342
 msgid "server does not appear to support SSL"
 msgstr "tjeneren ser ikke ut til � st�tte SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:356
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Tidsavbrudd for STARTTLS-foresp�rsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:372
+#: camel/providers/smtp/camel-smtp-transport.c:371
 msgid "STARTTLS response error"
 msgstr "Feil i STARTTLS-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:475
+#: camel/providers/smtp/camel-smtp-transport.c:474
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP-tjener %s st�tter ikke etterspurt autentiseringstype %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:513
+#: camel/providers/smtp/camel-smtp-transport.c:512
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVennligst skriv inn SMTP-passord for %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:532
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10304,87 +10211,87 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tjener %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:667
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende melding: senderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:613
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:705
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende melding: ingen mottakere definert."
 
-#: camel/providers/smtp/camel-smtp-transport.c:714
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan ikke sende melding: en eller flere ugyldige mottakere"
 
-#: camel/providers/smtp/camel-smtp-transport.c:882
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr "SMTP-velkomst"
 
-#: camel/providers/smtp/camel-smtp-transport.c:928
+#: camel/providers/smtp/camel-smtp-transport.c:924
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Tidsavbrudd for HELO-foresp�rsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:950
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "HELO response error"
 msgstr "Feil i HELO-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1016
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr "SMTP-autentisering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr "Feil under oppretting av SASL-autentiseringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
-#: camel/providers/smtp/camel-smtp-transport.c:1051
+#: 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 "Tidsavbrudd for AUTH-foresp�rsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr "AUTH-foresp�rsel feilet."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldig svar p� autentisering fra tjener.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1146
+#: camel/providers/smtp/camel-smtp-transport.c:1142
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for �MAIL FROM�-foresp�rsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1166
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 msgid "MAIL FROM response error"
 msgstr "Feil i �MAIL FROM�-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1190
+#: camel/providers/smtp/camel-smtp-transport.c:1186
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for �RCPT TO�-foresp�rsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1212
+#: camel/providers/smtp/camel-smtp-transport.c:1208
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> feilet"
 
-#: 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 "Tidsavbrudd for DATA-foresp�rsel: %s: melding ikke sendt."
@@ -10392,36 +10299,36 @@ msgstr "Tidsavbrudd for DATA-foresp�rsel: %s: melding 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 "Feil i DATA-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1314
-#: camel/providers/smtp/camel-smtp-transport.c:1337
+#: 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 ""
 "Tidsavbrudd for DATA-send: meldingsterminering: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1357
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 msgid "DATA termination response error"
 msgstr "Feil i DATA-termineringssvar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1380
+#: camel/providers/smtp/camel-smtp-transport.c:1374
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsavbrudd for RSET-foresp�rsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1400
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 msgid "RSET response error"
 msgstr "Feil i RSET-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1423
+#: camel/providers/smtp/camel-smtp-transport.c:1417
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Tidsavbrudd for QUIT-foresp�rsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1443
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 msgid "QUIT response error"
 msgstr "Feil i QUIT-svar"
 
@@ -10500,45 +10407,45 @@ msgstr "Klikk her for � f� opp adresseboken"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:511
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:522
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Fra:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:528
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:546
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:547
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
 
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:551
+#: 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."
@@ -10549,11 +10456,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:558
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Post til:"
 
-#: composer/e-msg-composer-hdrs.c:560
+#: composer/e-msg-composer-hdrs.c:549
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
@@ -10562,11 +10469,11 @@ msgstr "Destinasjon for post"
 msgid "Attach file(s)"
 msgstr "Legg ved fil(er)"
 
-#: composer/e-msg-composer.c:530
+#: composer/e-msg-composer.c:533
 msgid "Could not create a PGP signature context"
 msgstr "Kunne ikke opprette PGP signaturkontekst"
 
-#: composer/e-msg-composer.c:809
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10575,30 +10482,30 @@ msgstr ""
 "Feil under lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:1213
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Feil under tilgang til fil: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente melding fra editor"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10607,7 +10514,7 @@ msgstr ""
 "Kunne ikke s�ke i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1270
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10616,7 +10523,7 @@ msgstr ""
 "Kunne ikke kutte av fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1279
+#: composer/e-msg-composer.c:1285
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10625,7 +10532,7 @@ msgstr ""
 "Kunne ikke s�ke i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10634,7 +10541,7 @@ msgstr ""
 "Feil under autolagring av av melding: %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?"
@@ -10642,7 +10549,7 @@ msgstr ""
 "Ximian Evolution har funnet ikke-lagrede filer fra en tidligere sesjon.\n"
 "Vil du pr�ve � gjenopprette dem?"
 
-#: composer/e-msg-composer.c:1544
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10653,32 +10560,32 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:1549
+#: composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: composer/e-msg-composer.c:1553
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Endret melding"
 
-#: composer/e-msg-composer.c:1585
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "�pne fil"
 
-#: 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:1255
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
-#: composer/e-msg-composer.c:2162 composer/e-msg-composer.c:2761
-#: composer/e-msg-composer.c:2762
+#: 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 melding"
 
-#: composer/e-msg-composer.c:2793
+#: composer/e-msg-composer.c:2905
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10686,7 +10593,7 @@ msgstr ""
 "Kunne ikke opprette vindu for ny melding:\n"
 "Klarte ikke � aktivere kontroll for adressevelger."
 
-#: composer/e-msg-composer.c:2819
+#: composer/e-msg-composer.c:2931
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10698,7 +10605,7 @@ msgstr ""
 "Vennligst sjekk at du har installert korrekt\n"
 "versjon av gtkhtml og libgtkhtml.\n"
 
-#: 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."
@@ -10706,7 +10613,7 @@ msgstr ""
 "Kunne ikke opprette skrivevindu:\n"
 "Klarte ikke � aktivere HTML-redigeringskomponenten."
 
-#: composer/e-msg-composer.c:3895
+#: composer/e-msg-composer.c:4005
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10861,7 +10768,7 @@ 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?"
@@ -10869,11 +10776,15 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: e-util/e-passwords.c:345
+#: 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 dette passordet"
 
-#: e-util/e-passwords.c:347
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Husk dette passordet for resten av denne sesjonen"
 
@@ -10971,42 +10882,74 @@ msgstr "%H.%M"
 msgid "%I %p"
 msgstr "%H"
 
-#: filter/filter-datespec.c:65 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:181
-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
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 minutt"
 
 #: filter/filter-datespec.c:66
-msgid "minute"
-msgstr "minutt"
+#, 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 "uke"
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 uke"
 
-#: filter/filter-datespec.c:69 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "uker"
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d uker"
 
 #: 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."
@@ -11025,13 +10968,7 @@ msgstr "n�"
 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 "Velg en tid � sammenligne mot"
 
@@ -11048,7 +10985,7 @@ msgstr "Du m� oppgi et filnavn."
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Fil �%s� eksisterer ikke eller er ikke en vanlig fil"
 
-#: filter/filter-file.c:293
+#: filter/filter-file.c:298
 msgid "Choose a file"
 msgstr "Velg en fil"
 
@@ -11062,7 +10999,7 @@ msgid "You must specify a folder."
 msgstr "Du m� oppgi en mappe."
 
 #: filter/filter-folder.c:243 filter/vfolder-rule.c:408
-#: mail/mail-account-gui.c:1504 mail/mail-account-gui.c:1518
+#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
 msgid "Select Folder"
 msgstr "Velg mappe"
 
@@ -11075,30 +11012,32 @@ msgstr ""
 "Feil i regul�rt uttrykk �%s�:\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:68
-#: mail/mail-config.glade.h:64
+#: 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 "Viktig"
 
 #. red
 #: filter/filter-label.c:122 mail/mail-config.c:69
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1280
 msgid "Work"
 msgstr "Arbeid"
 
 #. 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 "Personlig"
 
 #. forest green
 #: filter/filter-label.c:124 mail/mail-config.c:71
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1282
 msgid "To Do"
 msgstr "Oppgaver"
 
 #. 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 "Senere"
 
@@ -11198,6 +11137,14 @@ msgstr "en tid relativ til tiden n�"
 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 spesifikke mapper"
@@ -11214,6 +11161,10 @@ msgstr "tiden du spesifiserer"
 msgid "vFolder Sources"
 msgstr "vFolder kilder"
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "uker"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "med alle aktive eksterne mapper"
@@ -11226,6 +11177,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"
@@ -11248,225 +11203,226 @@ msgid "Beep"
 msgstr "Pip"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "inneholder"
+
+#: 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 mottatt"
 
-#: 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 "inneholder 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 "Skisse"
 
-#: 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 "Uttrykk"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "F�lg opp"
 
-#: 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 etter"
+
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr "er f�r"
+
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
+msgstr "er merket"
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "er st�rre enn"
+
+#: filter/libfilter-i18n.h:32
+msgid "is less than"
+msgstr "er mindre enn"
+
+#: filter/libfilter-i18n.h:33
+msgid "is not"
+msgstr "er ikke"
+
+#: filter/libfilter-i18n.h:34
+msgid "is not Flagged"
+msgstr "er ikke merket"
+
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 msgid "Label"
 msgstr "Etikett"
 
-#: 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 "Meldingskropp"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Meldingshode"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 msgid "Pipe Message to Shell Command"
 msgstr "Kj�r melding gjennom en skall-kommando"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr "Spill 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 "Les"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Mottakere"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Treff p� vanlig uttrykk"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Svart 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 enn"
+
+#: filter/libfilter-i18n.h:48
+msgid "returns less than"
+msgstr "returnerer mindre enn"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Gi poeng"
 
-#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1823
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "Avsender"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Sett status"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:52
 msgid "Shell Command"
 msgstr "Skall-kommando"
 
-#: 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 "Spesifikk 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 "Stopp behandling"
 
-#: filter/libfilter-i18n.h:38 mail/mail-format.c:903
+#: 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 "Nullstill status"
 
-#: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "inneholder"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "inneholder 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 merket"
-
-#: filter/libfilter-i18n.h:50
-msgid "is after"
-msgstr "er etter"
-
-#: filter/libfilter-i18n.h:51
-msgid "is before"
-msgstr "er f�r"
-
-#: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "er st�rre enn"
-
-#: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "er mindre enn"
-
-#: filter/libfilter-i18n.h:54
-msgid "is not Flagged"
-msgstr "er ikke merket"
-
-#: 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 enn"
-
-#: filter/libfilter-i18n.h:58
-msgid "returns less than"
-msgstr "returnerer mindre enn"
-
-#: 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 "Regelnavn �%s� er ikke unikt. Velg et annet navn."
 
 #: 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 "Regelnavn �%s� er ikke unikt. Velg et annet navn."
-
 #: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Legg til regel"
@@ -11491,48 +11447,48 @@ msgstr "Du m� gi navn til denne vfolderen."
 msgid "You need to to specify at least one folder as a source."
 msgstr "Du m� spesifisere minst en mappe som kilde."
 
-#: filter/vfolder-rule.c:492
+#: filter/vfolder-rule.c:499
 msgid "VFolder source"
 msgstr "VFolder-kilde"
 
-#: importers/elm-importer.c:95 mail/importers/elm-importer.c:103
+#: 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 mail/importers/elm-importer.c:104
-#: mail/importers/netscape-importer.c:1237 mail/importers/pine-importer.c:114
+#: 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 mail/importers/elm-importer.c:106
-#: mail/importers/netscape-importer.c:1239 mail/importers/pine-importer.c:116
+#: 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 "Vennligst vent"
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365 mail/importers/elm-importer.c:183
-#: mail/importers/netscape-importer.c:1794 mail/importers/pine-importer.c:330
+#: 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 mail/importers/elm-importer.c:389
-#: mail/importers/netscape-importer.c:1906 mail/importers/pine-importer.c:439
+#: 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�ker i %s"
 
 #: 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:523
-#: mail/importers/netscape-importer.c:2104 mail/importers/pine-importer.c:586
+#: 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 mail/importers/elm-importer.c:544
+#: 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?"
@@ -11540,7 +11496,7 @@ msgstr ""
 "Evolution har funnet Elm e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/elm-importer.c:574 mail/importers/elm-importer.c:565
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -11552,12 +11508,12 @@ msgstr ""
 "Evolution har funnet GnomeCard filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:74
+#: 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 mail/importers/netscape-importer.c:662
+#: 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"
@@ -11572,7 +11528,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:686
+#: 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"
@@ -11580,7 +11536,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:703
+#: 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"
@@ -11589,39 +11545,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1236
+#: 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/importers/netscape-importer.c:1861
+#: 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 "S�ppel"
 
-#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:2014
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Skanner e-postfiltre"
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
-#: mail/importers/netscape-importer.c:2025 mail/importers/pine-importer.c:534
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
 msgid "Scanning directory"
 msgstr "S�ker i katalog"
 
-#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2034
+#: 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 mail/importers/netscape-importer.c:2109
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2114
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 msgid "Mail Filters"
 msgstr "E-post filtre"
 
-#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2138
+#: 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?"
@@ -11629,11 +11585,11 @@ msgstr ""
 "Evolution har funnet Netscape e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/pine-importer.c:100 mail/importers/pine-importer.c:113
+#: 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 mail/importers/pine-importer.c:613
+#: 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?"
@@ -11641,7 +11597,7 @@ msgstr ""
 "Evolution har funnet Pine e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/pine-importer.c:691 mail/importers/pine-importer.c:632
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 msgid "Pine"
 msgstr "Pine"
 
@@ -11650,59 +11606,67 @@ msgid "Composer Preferences"
 msgstr "Brukervalg for redigering"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Konfigurasjonskontroll for Evolution skjermskrifter."
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Konfigurer brukervalg for e-post, inkludert sikkerhet og meldingsvisning her"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Konfigurasjonskontroll for Evolution e-post-konti."
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Konfigurer stavekontroll, signaturer og meldingskomposisjon her"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Konfigurasjonskontroll for Evolution e-posth�ndterer."
+msgid "Configure the fonts used by Evolution here"
+msgstr "Konfigurer skrifter for Evolution her"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Konfigurasjonskontroll for Evolution meldingsredigering."
+msgid "Configure your email accounts here"
+msgstr "Konfigurer e-post-kontoer her"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Konfigurer brukervalg for e-post, inkludert sikkerhet og meldingsvisning her"
+#, 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 "Konfigurer stavekontroll, signaturer og meldingskomposisjon her"
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution e-post-konfigurasjon"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Configure the fonts used by Evolution here"
-msgstr "Konfigurer skrifter for Evolution her"
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolutions e-postredigering."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Configure your email accounts here"
-msgstr "Konfigurer e-post-kontoer her"
+#, 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 av e-post."
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution e-post-konfigurasjon"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution mail composer."
-msgstr "Evolutions e-postredigering."
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Grensesnitt for e-post-konfigurasjon"
 
 #: 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 e-post-konfigurasjon"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:14
 #, fuzzy
-msgid "Factory for the controls exported by the Evolution Mailer"
-msgstr "Konfigurasjonskontroll for Evolution e-posth�ndterer."
+msgid "Evolution Mail preferences control"
+msgstr "Evolution kalender-komponent"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:15
 msgid "Font Preferences"
@@ -11716,43 +11680,39 @@ msgstr "E-post-konti"
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:18
-msgid "Mail configuration interface"
-msgstr "Grensesnitt for e-post-konfigurasjon"
-
-#: mail/component-factory.c:114
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Mappe som inneholder e-post"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "Offentlig e-post"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "Offentlig mappe som inneholder e-post"
 
-#: mail/component-factory.c:116
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Virtuell s�ppel"
 
-#: mail/component-factory.c:116
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Virtuelle s�ppelmappe"
 
-#: mail/component-factory.c:144
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Denne mappen kan ikke inneholde meldinger."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Egenskaper ..."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Endre denne mappens egenskaper"
 
-#: mail/component-factory.c:822
+#: mail/component-factory.c:818
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11764,52 +11724,52 @@ msgstr ""
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke satt en transportmetode for e-post"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Du har usendte meldinger, vil du avslutte likevel?"
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: mail/component-factory.c:1062
+#: mail/component-factory.c:1061
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: mail/component-factory.c:1070
+#: mail/component-factory.c:1069
 msgid "New Message Post"
 msgstr "Ny publisering av melding"
 
-#: mail/component-factory.c:1070
+#: mail/component-factory.c:1069
 msgid "_Post Message"
 msgstr "_Publiser melding"
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1070
 msgid "Post a new mail message"
 msgstr "Publiser en ny e-postmelding"
 
-#: mail/component-factory.c:1354
+#: mail/component-factory.c:1353
 msgid "Connecting..."
 msgstr "Kobler til..."
 
-#: mail/component-factory.c:1365
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
-#: mail/folder-browser-ui.c:483
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper for �%s�"
 
-#: mail/folder-browser-ui.c:485
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:920
+#: 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 opprette midlertidig katalog: %s"
@@ -11854,129 +11814,129 @@ msgstr "%d sendt"
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1167
+#: mail/folder-browser.c:1182
 msgid "Create _Virtual Folder From Search..."
 msgstr "Lag _virtuell mappe fra s�k..."
 
-#: mail/folder-browser.c:1714
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "VFolder p� e_mne"
 
-#: mail/folder-browser.c:1715
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: mail/folder-browser.c:1716
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "VFolder p� e-post_liste"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "Filtrer p� em_ne"
 
-#: mail/folder-browser.c:1722
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "Filtrer p� sen_der"
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "Filtrer p� motta_ker"
 
-#: 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 "Filtrer p� e-_postliste"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: 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 opp..."
 
-#: mail/folder-browser.c:1756
+#: mail/folder-browser.c:1771
 msgid "Fla_g Completed"
 msgstr "Mer_k som fullf�rt"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1772
 msgid "Cl_ear Flag"
 msgstr "Fj_ern flagg"
 
 #. 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 "Mer_k som lest"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1777
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: mail/folder-browser.c:1763
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: mail/folder-browser.c:1764
+#: mail/folder-browser.c:1779
 msgid "_Mark as Unimportant"
 msgstr "_Merk som uviktig"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1784
 msgid "U_ndelete"
 msgstr "A_ngre slett"
 
-#: mail/folder-browser.c:1773
+#: mail/folder-browser.c:1788
 msgid "Mo_ve to Folder..."
 msgstr "Fl_ytt 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_opier til mappe..."
 
-#: mail/folder-browser.c:1782
+#: mail/folder-browser.c:1797
 msgid "Add Sender to Address_book"
 msgstr "Legg til sender i adresse_bok"
 
-#: mail/folder-browser.c:1786
+#: mail/folder-browser.c:1801
 msgid "Appl_y Filters"
 msgstr "_P�f�r filtre"
 
-#: mail/folder-browser.c:1790
+#: mail/folder-browser.c:1805
 msgid "Crea_te Rule From Message"
 msgstr "Oppre_tt regel fra melding"
 
-#: mail/folder-browser.c:2049
+#: mail/folder-browser.c:2064
 msgid "VFolder on M_ailing List"
 msgstr "VFolder p� _e-postliste"
 
-#: mail/folder-browser.c:2051
+#: mail/folder-browser.c:2066
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrer _p� e-postliste (%s)"
 
-#: mail/folder-browser.c:2052
+#: mail/folder-browser.c:2067
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VFolder _p� e-postliste (%s)"
@@ -11989,21 +11949,37 @@ msgstr "Forvalgt"
 msgid "Getting Folder Information"
 msgstr "Henter mappeinformasjon"
 
+#: 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 "Factory for � 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 "Factory for � importere Outlook Express 4-meldinger 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:"
@@ -12048,19 +12024,19 @@ msgstr "Du har ikke fylt ut all n�dvendig informasjon."
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
-#: mail/mail-account-gui.c:752 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: mail/mail-account-gui.c:1881
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke opprette to kontoer med samme navn."
 
@@ -12073,12 +12049,12 @@ msgid "Don't delete"
 msgstr "Ikke slett"
 
 #: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
-#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:666
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Disable"
 msgstr "Deaktiver"
 
 #: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
-#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:666
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
 msgid "Enable"
 msgstr "Aktiver"
 
@@ -12088,7 +12064,7 @@ msgid "[Default]"
 msgstr "[Forvalg]"
 
 #: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:809
+#: mail/mail-composer-prefs.c:704 mail/mail-composer-prefs.c:860
 msgid "Enabled"
 msgstr "Aktivert"
 
@@ -12140,11 +12116,11 @@ msgstr ""
 "Og har blitt oppdatert."
 
 #. 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 "Ikke vis denne meldingen igjen."
 
-#: 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"
@@ -12156,7 +12132,7 @@ msgstr ""
 "motta eller skrive meldinger.\n"
 "Vil du konfigurere den n�?"
 
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:211
 msgid ""
 "You need to configure an account\n"
 "before you can compose mail."
@@ -12164,7 +12140,7 @@ msgstr ""
 "Du m� konfigurere en konto\n"
 "f�r du kan skrive meldinger."
 
-#: mail/mail-callbacks.c:227
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -12172,7 +12148,7 @@ msgstr ""
 "Du m� konfigurere en identitet\n"
 "f�r du kan skrive e-post."
 
-#: mail/mail-callbacks.c:234
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -12181,7 +12157,7 @@ msgstr ""
 "f�r du kan skrive e-post."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:256
+#: 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"
@@ -12189,11 +12165,11 @@ msgstr ""
 "Du sender en melding i HMTL-format. Sjekk at f�lgende mottakere\n"
 "kan og vil motta e-post som HTML:\n"
 
-#: mail/mail-callbacks.c:268
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "Send likevel?"
 
-#: mail/mail-callbacks.c:289
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12201,7 +12177,7 @@ msgstr ""
 "Denne meldingen har ikke emne.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:315
+#: 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."
@@ -12209,11 +12185,11 @@ msgstr ""
 "Siden kontaktlisten du sender til er konfigurert til � skjule listens "
 "adresser vil denne meldingen kun inneholde Bcc mottakere."
 
-#: mail/mail-callbacks.c:319
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr "Denne meldingen inneholder kun Bcc mottakere."
 
-#: 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"
@@ -12223,11 +12199,11 @@ msgstr ""
 "�Apparently-To�-header.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:472
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr "Du m� spesifisere mottakere for � kunne sende denne meldingen."
 
-#: mail/mail-callbacks.c:727
+#: 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?"
@@ -12235,28 +12211,28 @@ msgstr ""
 "Kunne ikke �pne skisse-mappen for denne kontoen.\n"
 "Vil du bruke standard skisse-mappe?"
 
-#: mail/mail-callbacks.c:1192
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
-#: mail/mail-callbacks.c:1196
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %d.%m.%Y kl. %H.%M skrev %%s:"
 
-#: mail/mail-callbacks.c:1703 mail/message-browser.c:143
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:1705 mail/message-browser.c:145
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr "Kopier melding(er) til"
 
-#: mail/mail-callbacks.c:2349
+#: 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 meldingene?"
 
-#: mail/mail-callbacks.c:2365
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12264,7 +12240,7 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:2398
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12272,16 +12248,16 @@ msgstr ""
 "Du kan kun sende meldinger p� nytt\n"
 "som er lagret i sendt-katalogen."
 
-#: mail/mail-callbacks.c:2408
+#: 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 meldingene p� nytt?"
 
-#: mail/mail-callbacks.c:2429
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "Ingen melding valgt"
 
-#: mail/mail-callbacks.c:2470
+#: mail/mail-callbacks.c:2465
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12290,7 +12266,7 @@ msgstr ""
 "Kan ikke lagre til �%s�\n"
 " %s"
 
-#: mail/mail-callbacks.c:2475
+#: mail/mail-callbacks.c:2470
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12299,15 +12275,15 @@ msgstr ""
 "�%s� eksisterer allerede\n"
 "Vil du overskrive den?"
 
-#: mail/mail-callbacks.c:2516
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:2518
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:2686
+#: mail/mail-callbacks.c:2687
 #, fuzzy
 msgid ""
 "This operation will permanently erase all messages marked as\n"
@@ -12320,7 +12296,7 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse meldingene?"
 
-#: mail/mail-callbacks.c:2772
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12329,50 +12305,50 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2780
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:2822
+#: mail/mail-callbacks.c:2831
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: mail/mail-callbacks.c:2878
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:2945
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
-#: mail/mail-callbacks.c:3135
+#: 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 �pne alle %d meldingene i separate vinduer?"
 
-#: mail/mail-composer-prefs.c:225 mail/mail-composer-prefs.c:326
-#: mail/mail-config.c:1218
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
 msgid "Unnamed"
 msgstr "Uten navn"
 
-#: mail/mail-composer-prefs.c:311
+#: mail/mail-composer-prefs.c:335
 msgid "You must specify a valid script name."
 msgstr "Du m� oppgi et gyldig navn p� skriptet."
 
-#: mail/mail-composer-prefs.c:367 mail/mail-composer-prefs.c:429
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
 msgid "[script]"
 msgstr "[skript]"
 
-#: mail/mail-composer-prefs.c:813
+#: mail/mail-composer-prefs.c:864
 msgid "Language(s)"
 msgstr "Spr�k"
 
-#: mail/mail-composer-prefs.c:855
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr "Legg til skriptsignatur"
 
-#: mail/mail-composer-prefs.c:875
+#: mail/mail-composer-prefs.c:926
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
@@ -12439,11 +12415,11 @@ msgstr ""
 "et navn for denne kontoen i feltet under. Dette navnet blir kun brukt for "
 "visning p� skjermen."
 
-#: mail/mail-config.c:922
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
-#: mail/mail-config.c:1000 mail/mail-config.c:1004
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 msgid "Connecting to server..."
 msgstr "Kobler til tjener..."
 
@@ -12688,24 +12664,25 @@ msgid "Message Display"
 msgstr "Meldingsvisning"
 
 #: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Melding inneholder"
+
+#: 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 "Melding om ny e-post"
 
-#: 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 ""
 "Merk: du vil ikke bli spurt etter et passord f�r du kobler til f�rste gang"
 
-#: mail/mail-config.glade.h:80
-msgid "On Screen fonts"
-msgstr "Skrifter p� skjermen"
-
 #: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Tilleggsinformasjon"
@@ -12940,102 +12917,108 @@ msgid "_Enable"
 msgstr "_Aktiver"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr "_Fast bredde:"
-
-#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "_Fullt navn:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr "_HTML e-post"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr "_Identitet"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "_Last bilder hvis avsender er i adresseboken"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "_Bruk denne som forvalgt konto"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "_Merk meldinger som lest etter"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "Aldri last bilder fra _nettet"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr "S_pill en lydfil n�r nye meldinger ankommer"
 
-#: 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 "S_p�r ved sending av HTML-meldinger til kontakter som ikke �nsker dem"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "S_p�r ved sending av meldinger med tomt emnefelt"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr "_Mottak av e-post"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr "Gjenopp_rett forvalg"
 
-#: 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 "Ut_sending av e-post"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Vi_s animerte bilder"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Signaturer"
 
+#: 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 "Br_uk sikker forbindelse (SSL):"
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "Opprinnelig kontakt:"
 
 #: mail/mail-config.glade.h:176
-msgid "_Variable-width:"
-msgstr "_Variabel bredde:"
+msgid "_Use secure connection (SSL):"
+msgstr "Br_uk sikker forbindelse (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 "hv_er(t)"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr "farge"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "beskrivelse"
 
@@ -13068,10 +13051,6 @@ msgstr ""
 "Filen �%s�  eksisterer allerede.\n"
 "Overskriv den?"
 
-#: mail/mail-display.c:196
-msgid "Overwrite file?"
-msgstr "Overskriv fil?"
-
 #: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
@@ -13107,35 +13086,35 @@ msgstr "Skjul"
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:1341
+#: mail/mail-display.c:1365
 msgid "Downloading images"
 msgstr "Laster ned bilder"
 
-#: mail/mail-display.c:1518
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "Laster meldingsinnhold"
 
-#: mail/mail-display.c:1855
+#: mail/mail-display.c:1879
 msgid "Overdue:"
 msgstr "Utg�tt:"
 
-#: mail/mail-display.c:1859
+#: mail/mail-display.c:1883
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "ved %B %d, %Y, %l:%M %P"
 
-#: mail/mail-display.c:2210
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "�pne lenke i nettleser"
 
-#: mail/mail-display.c:2211
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Kopier lokasjon for lenke"
 
-#: mail/mail-display.c:2213
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Lagre lenke som"
 
-#: mail/mail-display.c:2215
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Lagre bilde som..."
 
@@ -13144,89 +13123,89 @@ msgstr "Lagre bilde som..."
 msgid "Pinging %s"
 msgstr "Pinger %s"
 
-#: mail/mail-format.c:635
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/mail-format.c:677 mail/mail-format.c:1331 mail/mail-format.c:1400
-#: mail/mail-format.c:1520 mail/mail-format.c:1644 mail/mail-format.c:1669
+#: 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 lese MIME-melding. Viser ren meldingstekst."
 
-#: mail/mail-format.c:754 mail/message-list.etspec.h:2
+#: mail/mail-format.c:759 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:840
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr "Ugyldig e-post-adresse:"
 
-#: mail/mail-format.c:881 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:885
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:890 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:895
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:900
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1443
+#: mail/mail-format.c:1451
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Denne meldingen er digitalt signert. Klikk l�sikonet for mer informasjon."
 
-#: mail/mail-format.c:1471
+#: mail/mail-format.c:1479
 msgid "Could not create a PGP verfication context"
 msgstr "Kunne ikke opprette PGP verifiseringskontekst"
 
-#: mail/mail-format.c:1479
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Denne meldingen er digitalt signert og er funnet autentisk."
 
-#: mail/mail-format.c:1486
+#: mail/mail-format.c:1494
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Denne meldingen er digitalt signert, men kan ikke finnes autentisk."
 
-#: mail/mail-format.c:1750
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/mail-format.c:1761
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig p� nettsted �%s�"
 
-#: mail/mail-format.c:1764
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/mail-format.c:1791
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: mail/mail-format.c:1797
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data (�%s�-type)"
 
-#: mail/mail-format.c:1799
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
@@ -13399,7 +13378,7 @@ msgstr "Henter %d melding(er)"
 msgid "Saving %d messsage(s)"
 msgstr "Lagrer %d melding(er)"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13408,7 +13387,7 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13417,11 +13396,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13430,58 +13409,54 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %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 p� nytt"
 
-#: mail/mail-search-dialogue.c:121 widgets/misc/e-search-bar.c:518
-msgid "_Search"
-msgstr "_S�k"
-
-#: mail/mail-search.c:148
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(Melding uten tittel)"
 
-#: mail/mail-search.c:230
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "Melding uten tittel"
 
-#: mail/mail-search.c:232
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "Tom melding"
 
-#: mail/mail-search.c:280
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "Finn i melding"
 
-#: mail/mail-search.c:283
+#: mail/mail-search.c:285
 msgid "Search"
 msgstr "S�k"
 
-#: mail/mail-search.c:309
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "Skill mellom store/sm� bokstaver"
 
-#: mail/mail-search.c:311
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr "S�k fremover"
 
-#: mail/mail-search.c:331
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "Finn:"
 
-#: mail/mail-search.c:334
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "Treff:"
 
@@ -13568,24 +13543,24 @@ msgstr "Lagre signatur"
 msgid "Edit signature"
 msgstr "Rediger signatur"
 
-#: mail/mail-signature-editor.c:428
+#: mail/mail-signature-editor.c:429
 msgid "Enter a name for this signature."
 msgstr "Oppgi et navn for denne signaturen."
 
-#: mail/mail-signature-editor.c:431 my-evolution/e-summary-preferences.c:625
+#: 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 melding - %s"
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "Videresendt melding"
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "Videresendt melding"
 
@@ -13612,7 +13587,7 @@ msgstr ""
 "    �%s�\n"
 "Og har blitt oppdatert."
 
-#: mail/mail-vfolder.c:777 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "VFoldere"
 
@@ -13620,24 +13595,24 @@ msgstr "VFoldere"
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:875
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Rediger VFolder"
 
-#: mail/mail-vfolder.c:893
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pr�ver � redigere en vfolder �%s� som ikke eksisterer."
 
-#: mail/mail-vfolder.c:946
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Ny VFolder"
 
-#: mail/message-browser.c:219
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(Uten emne)"
 
-#: mail/message-browser.c:221
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Melding"
@@ -13678,31 +13653,31 @@ msgstr "H�yere"
 msgid "Highest"
 msgstr "H�yest"
 
-#: 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 %l:%M %p"
 
-#: mail/message-list.c:1092
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "I g�r %l:%M %p"
 
-#: 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:2602
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
@@ -13798,12 +13773,12 @@ msgstr "_Ferdig til"
 msgid "_Flag:"
 msgstr "_Flagg:"
 
-#: mail/subscribe-dialog.c:232
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "S�ker 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�ker i mapper p� rot-niv� p� �%s�"
@@ -13818,28 +13793,24 @@ msgstr "Abonnerer p� mappe �%s�"
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjerner abonnement p� mappe �%s�"
 
-#: mail/subscribe-dialog.c:1272 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:1429
+#: mail/subscribe-dialog.c:1389
 msgid "Scanning folders..."
 msgstr "S�ker gjennom mapper..."
 
-#: mail/subscribe-dialog.c:1551
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Ingen tjener er valgt"
 
-#: mail/subscribe-dialog.c:1626
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Vennligst velg en tjener."
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "All folders"
-msgstr "Alle mapper"
-
-#: 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
@@ -13848,47 +13819,46 @@ msgstr "Alle mapper"
 msgid "Close"
 msgstr "Lukk"
 
-#: mail/subscribe-dialog.glade.h:6
-msgid "Display Options"
-msgstr "Alternativer for visning"
-
-#: mail/subscribe-dialog.glade.h:7
-msgid "Folders whose names begin with:"
-msgstr "Vis mapper med navn som begynner p�:"
-
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:4
 msgid "Manage Subscriptions"
 msgstr "H�ndter 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 "Les listen p� nytt"
 
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:6
 msgid "S_elect server: "
 msgstr "V_elg tjener: "
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "_Abonner"
 
-#: mail/subscribe-dialog.glade.h:12
+#: 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 "Konfigurasjonskontroll for Evolution sammendrag."
-
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Konfigurer utseende for Evolution sammendrag her"
 
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Summary"
+msgstr "Komponent for Evolution sammendrag."
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
-msgid "Evolution Summary component."
+#, fuzzy
+msgid "Evolution Summary component"
 msgstr "Komponent for Evolution sammendrag."
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Factory for konfigurasjonskontroll for Evolution sammendrag."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 msgid "Summary Preferences"
 msgstr "Brukervalg for sammendrag"
 
@@ -23694,19 +23664,19 @@ msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
 #: my-evolution/e-summary-calendar.c:407
-msgid "%l:%M %d %B"
+#, fuzzy
+msgid "%l:%M%P %d %B"
 msgstr "%l: %M %d %B"
 
 #: my-evolution/e-summary-calendar.c:425
 msgid "No description"
 msgstr "Ingen 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"
 
@@ -23726,11 +23696,11 @@ msgstr "Legg til news-tjener"
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Skriv inn URL for nyhetsstedet du vil legge til"
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr "Feil under nedlasting av RDF"
 
-#: my-evolution/e-summary-rdf.c:447
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr "Nyhetstjenester"
 
@@ -23747,11 +23717,11 @@ msgstr "Legg til"
 msgid "Shown"
 msgstr "Vist"
 
-#: my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "Ingen oppgaver"
 
-#: my-evolution/e-summary-tasks.c:371
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(Ingen beskrivelse)"
 
@@ -23759,11 +23729,11 @@ msgstr "(Ingen beskrivelse)"
 msgid "My Weather"
 msgstr "Min v�rmelding"
 
-#: my-evolution/e-summary-weather.c:269
+#: my-evolution/e-summary-weather.c:262
 msgid "There was an error downloading data for"
 msgstr "Det oppsto en feil under nedlasting av data for"
 
-#: my-evolution/e-summary-weather.c:490
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr "V�r"
 
@@ -23771,11 +23741,11 @@ msgstr "V�r"
 #. 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:594
+#: my-evolution/e-summary-weather.c:584
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary.c:197
+#: my-evolution/e-summary.c:198
 msgid "%A, %B %e %Y"
 msgstr "%A, %e %B %Y"
 
@@ -23783,11 +23753,11 @@ msgstr "%A, %e %B %Y"
 msgid "Please wait..."
 msgstr "Vennligst vent..."
 
-#: my-evolution/e-summary.c:591 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Skriv ut sammendrag"
 
-#: my-evolution/e-summary.c:625
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Feil under utskrift av sammendrag"
 
@@ -25058,20 +25028,22 @@ msgid "_Weather"
 msgstr "_V�r"
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configuration control for Evolution folder settings."
-msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Configure special folders and offline folder behavior here"
 msgstr "Konfigurer spesielle mapper og oppf�rsel n�r du arbeider frakoblet her"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution skallet."
+
 #: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Folder Settings"
-msgstr "Mappeinnstillinger"
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Factory for konfigurasjonskontroll for Evolution sammendrag."
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "The Evolution shell."
-msgstr "Evolution skallet."
+msgid "Folder Settings"
+msgstr "Mappeinnstillinger"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25090,7 +25062,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�"
@@ -25103,8 +25075,8 @@ msgstr "Legg til en mappe"
 msgid "Drafts"
 msgstr "Skisser"
 
-#: 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 "Innboks"
 
@@ -25116,11 +25088,11 @@ msgstr "Utboks"
 msgid "Sent"
 msgstr "Sendt"
 
-#: shell/e-setup.c:147
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "Kunne ikke oppdatere filene."
 
-#: shell/e-setup.c:168
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -25131,7 +25103,7 @@ msgstr ""
 "%s\n"
 "Feil: %s"
 
-#: shell/e-setup.c:179
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -25143,39 +25115,6 @@ msgstr ""
 #: shell/e-setup.c:244
 #, c-format
 msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Evolution kunne ikke opprette 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 rettigheter. Vennligst gj�r den\n"
-"lesbar og kj�rbar og start Evolution p� nytt."
-
-#: 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"
-"m� fjernes for at Evolution skal fungere riktig.\n"
-"Vennligst fjern denne filen og start Evolution p� nytt."
-
-#: 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."
@@ -25184,7 +25123,7 @@ msgstr ""
 "Vennligst flytt denne for � tillate installasjon\n"
 "av Evolution's brukerfiler."
 
-#: shell/e-setup.c:300
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25219,47 +25158,47 @@ msgstr "Frakoblede mapper"
 msgid "Autocompletion Folders"
 msgstr "Autofullf�ringsmapper"
 
-#: 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 "Kunne 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 seg 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 opp� seg 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 av sine 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 "Spesifiser 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 "Kopier 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 "Spesifiser en mappe � flytte mappen �%s� til:"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "Flytt mappe"
 
-#: shell/e-shell-folder-commands.c:392
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25268,17 +25207,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 "Vild du virkelig slette mappe �%s�?"
 
-#: shell/e-shell-folder-commands.c:413
+#: shell/e-shell-folder-commands.c:412
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Slett �%s�"
 
-#: shell/e-shell-folder-commands.c:486
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25287,26 +25226,26 @@ msgstr ""
 "Kunne ikke endre 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 "Endre navn p� mappe �%s� til:"
 
-#: shell/e-shell-folder-commands.c:541
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr "Endre 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 "Spesifisert mappenavn er ikke gyldig: %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 "Valgt mappe tilh�rer ikke en annen bruker"
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:586
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25315,7 +25254,7 @@ msgstr ""
 "Kan ikke fjerne mappe:\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"
@@ -25324,11 +25263,11 @@ msgstr ""
 "Kan ikke opprette spesifisert katalog:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:307
+#: shell/e-shell-folder-creation-dialog.c:308
 msgid "Create New Folder"
 msgstr "Opprett ny mappe"
 
-#: 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 "(Uten navn)"
 
@@ -25363,7 +25302,7 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppf�ring %d."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:351
 msgid "Select importer"
 msgstr "Velg importerer"
 
@@ -25373,7 +25312,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 feil"
 
@@ -25404,12 +25343,12 @@ msgstr ""
 msgid "Error starting %s"
 msgstr "Feil under start av %s"
 
-#: shell/e-shell-importer.c:556
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Feil under lasting av %s"
 
-#: shell/e-shell-importer.c:573
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25418,31 +25357,31 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppf�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 "Velg 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 innstillinger 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:538
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25450,28 +25389,28 @@ msgstr ""
 "Vennligst vent...\n"
 "S�ker etter eksisterende oppsett"
 
-#: shell/e-shell-importer.c:788
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent import"
 
-#: shell/e-shell-importer.c:912 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 "Fra %s:"
 
-#: shell/e-shell-importer.c:1082
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: shell/e-shell-importer.c:1083
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Velg en m�lmappe for � importere data"
 
-#: 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 "Importer"
 
-#: shell/e-shell-offline-handler.c:588
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "Lukker forbindelser..."
 
@@ -25494,7 +25433,7 @@ msgstr "Synkroniserer mappe"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "Synkroniserer �%s� (%d av %d) ..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:345
 msgid "Evolution Settings"
 msgstr "Innstillinger for Evolution"
 
@@ -25592,15 +25531,15 @@ msgstr "Opprett en ny snarvei"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Velg mappen du �nsker snarveien skal peke til:"
 
-#: shell/e-shell-view-menu.c:778
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: 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 "Ar_beid frakoblet"
 
-#: 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 "Arbeid frakoblet"
 
@@ -25608,34 +25547,34 @@ msgstr "Arbeid frakoblet"
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: 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 "(Ingen)"
 
-#: 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 er koblet til. Klikk p� denne knappen for � arbeide "
 "frakoblet."
 
-#: 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 er i ferd med � koble fra."
 
-#: 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 ""
 "Ximian Evolution er frakoblet. Klikk p� denne knappen for � arbeide "
 "tilkoblet."
 
-#: shell/e-shell.c:176
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25646,12 +25585,12 @@ msgstr ""
 "Feilen fra aktiveringssystemet er:\n"
 "%s"
 
-#: shell/e-shell.c:758
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke sette opp lokal lagring -- %s"
 
-#: shell/e-shell.c:1831
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25662,19 +25601,19 @@ msgstr ""
 "har avsluttet uventet. Du vil m�tte avslutte Evolution og starte p�\n"
 "nytt for � f� tilgang til disse dataene igjen."
 
-#: shell/e-shell.c:2096
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:2098
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:2100
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: shell/e-shell.c:2102 shell/e-storage.c:572
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Vanlig feil"
 
@@ -25869,11 +25808,11 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullf�rt)"
 
-#: shell/evolution-folder-selector-button.c:101
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<klikk her for � velge en mappe>"
 
-#: shell/evolution-shell-component-utils.c:123
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -25884,7 +25823,7 @@ msgstr ""
 "\n"
 "Ukjent feil."
 
-#: shell/evolution-shell-component-utils.c:126
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -25897,7 +25836,7 @@ msgstr ""
 "Feilen fra komponentsystemet er:\n"
 "%s"
 
-#: shell/evolution-shell-component-utils.c:133
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -25910,63 +25849,63 @@ msgstr ""
 "Feilen fra aktiveringssystemet er:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1164
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "CORBA-feil"
 
-#: shell/evolution-shell-component.c:1166
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Avbrutt"
 
-#: shell/evolution-shell-component.c:1168
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Ugyldig argument"
 
-#: shell/evolution-shell-component.c:1170
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "Har allerede en eier"
 
-#: shell/evolution-shell-component.c:1172
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Ingen eier"
 
-#: shell/evolution-shell-component.c:1174
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Ikke funnet"
 
-#: shell/evolution-shell-component.c:1176
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Ust�ttet type"
 
-#: shell/evolution-shell-component.c:1178
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Ust�ttet schema"
 
-#: shell/evolution-shell-component.c:1180
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Ust�ttet operasjon"
 
-#: shell/evolution-shell-component.c:1182
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: shell/evolution-shell-component.c:1186
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Eksisterer"
 
-#: shell/evolution-shell-component.c:1188
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: shell/evolution-shell-component.c:1192
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Har undermapper"
 
-#: shell/evolution-shell-component.c:1194
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Ingen plass igjen"
 
-#: shell/evolution-shell-component.c:1196
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "Gammel eier er d�d"
 
@@ -25986,10 +25925,6 @@ msgstr "Klikk OK for � lukke disse forbindelsene og arbeide frakoblet"
 msgid "The following connections are currently active:"
 msgstr "F�lgende forbindelser er aktive:"
 
-#: 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 "K_alender"
@@ -26127,16 +26062,16 @@ msgstr "Ikke sp�r meg igjen"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importere data fra f�lgende filer:"
 
-#: 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 avslutter n�..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:216
+#: shell/main.c:266
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26171,7 +26106,7 @@ msgstr ""
 "Vi h�per at du nyter resultatene av v�rt harde arbeid, og vi venter i\n"
 "spenning p� at du tilbyr din hjelp!\n"
 
-#: shell/main.c:240
+#: shell/main.c:290
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -26179,40 +26114,45 @@ msgstr ""
 "Takk\n"
 "Ximian Evolution utviklerene\n"
 
-#: shell/main.c:248
+#: shell/main.c:298
 msgid "Don't tell me again"
 msgstr "Ikke gi beskjed igjen"
 
-#: shell/main.c:335
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan ikke aksessere Ximian Evolution-skallet."
 
-#: shell/main.c:344
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikke initiere Ximian Evolution-skallet: %s"
 
-#: shell/main.c:476
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Deaktiver splash"
 
-#: shell/main.c:478
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
-#: shell/main.c:480
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: shell/main.c:482
+#: shell/main.c:535
+#, fuzzy
+msgid "Forcibly shut down all evolution components"
+msgstr "Factory for Evolution notat-komponent."
+
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feils�kingsutskrift for alle komponentene til en fil."
 
-#: shell/main.c:485
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr "Tvungen oppgradering av konfigurasjonsfilene fra Evolution 1.0.x"
 
-#: shell/main.c:510
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26222,7 +26162,6 @@ msgstr ""
 "  Bruk %s --help for mer informasjon.\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 "Feil under lasting av standard adressebok."
@@ -26232,14 +26171,50 @@ msgstr "Feil under lasting av standard adressebok."
 msgid "Input File"
 msgstr "Innfil"
 
-#: tools/evolution-addressbook-export.c:51
-msgid "Output File"
-msgstr "Utfil"
-
 #: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Ingen filnavn spesifisert."
 
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "Legg til vedlegg..."
+
+#: 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 inneholder"
+
+#: 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 "Slett denne meldingen"
+
+#. 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 kj�re %s: %s\n"
+
+#: 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 "Kopier kontakt(er) til en annen mappe..."
@@ -26328,7 +26303,7 @@ msgstr "Vis aktiv 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"
 
@@ -26446,7 +26421,7 @@ msgid "Print this item"
 msgstr "Skriv ut denne oppf�ringen"
 
 #: 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 "Lagre"
 
@@ -26473,7 +26448,7 @@ msgstr "Lagre denne oppf�ringen til 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"
 
@@ -26719,7 +26694,7 @@ msgstr "Meldingsliste med tr�der"
 msgid "_Expunge"
 msgstr "_T�m"
 
-#: 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"
 
@@ -27124,7 +27099,7 @@ msgstr "_Sitert"
 msgid "_Resend..."
 msgstr "S_end p� nytt..."
 
-#: 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 "Ve_rkt�y"
 
@@ -27139,12 +27114,12 @@ msgstr "Lukk dette vinduet"
 #: 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_ukk"
 
 #: 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"
 
@@ -27323,7 +27298,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Lagre aktiv fil og lukk 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 "_Hjelp"
 
@@ -27500,122 +27475,114 @@ msgid "Pi_lot Settings..."
 msgstr "Innstillinger for pi_lot..."
 
 #: ui/evolution.xml.h:27
-msgid "Pilot Con_duit Settings..."
-msgstr "Innstillinger for Pilot-komponent..."
-
-#: ui/evolution.xml.h:28
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "Fjern en mappe som er lagt til med ��pne annen brukers mappe�"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "Send / motta"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Send queued items and retrieve new items"
 msgstr "Send k�lagte oppf�ringer og hent nye oppf�ringer"
 
-#: ui/evolution.xml.h:31
-msgid "Set up Pilot conduit configuration"
-msgstr "Sett opp konfigurasjon av  Pilot-komponent"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Set up Pilot configuration"
 msgstr "Konfigurer Pilot"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr "Vis informasjon om Ximian Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "Sen_d inn feilrapport"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn en feilrapport med Bug Buddy"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "Bytt"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "Sl� av/p� visning av mappelinjen"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Sl� av/p� visning av snarveilinjen"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr "Skift til frakoblet arbeidsmodus."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "Vis den valgte mappen"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _OBS"
 
-#: 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 "_Kopier..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Ma_ppelinje"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Folder..."
 msgstr "M_appe..."
 
-#: 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 "_Importer..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "_Flytt..."
 
-#: 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 annen brukers mappe"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_Gi nytt navn..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "_Send / motta"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "_Snarveilinje"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 msgid "_Shortcut..."
 msgstr "_Snarvei..."
 
@@ -27692,7 +27659,7 @@ msgid "_Tasks"
 msgstr "_Oppgaver"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:644
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
 msgid "UTC"
 msgstr "UTC"
 
@@ -27737,12 +27704,12 @@ msgstr "Definer 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:434
+#: 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:1107
+#: widgets/misc/e-calendar-item.c:1102
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -27844,11 +27811,12 @@ msgstr "Tegnkoding"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:190
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr "Redigering av s�k"
 
-#: widgets/misc/e-filter-bar.c:212
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "Lagre s�k"
 
@@ -27880,44 +27848,333 @@ msgstr "Sp�rsm�l"
 msgid "Message"
 msgstr "Melding"
 
-#: widgets/misc/e-search-bar.c:524
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "_S�k"
+
+#: widgets/misc/e-search-bar.c:537
 msgid "_Find Now"
 msgstr "_Finn n� "
 
-#: widgets/misc/e-search-bar.c:525
+#: widgets/misc/e-search-bar.c:538
 msgid "_Clear"
 msgstr "_T�m"
 
-#: widgets/misc/e-search-bar.c:826
+#: widgets/misc/e-search-bar.c:833
 msgid "Item ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:833
+#: widgets/misc/e-search-bar.c:840
 msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:840
+#: widgets/misc/e-search-bar.c:847
 #, fuzzy
 msgid "Text"
 msgstr "Test"
 
-#: widgets/misc/e-search-bar.c:918
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "T�m"
 
-#: widgets/misc/e-search-bar.c:920
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Finn n� "
 
 #: 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 adressebok-tjener"
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Evolution adressebok-komponent"
 
 #: 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 adressebok-tjener; factory"
+#, fuzzy
+msgid "Evolution Calendar local file backend"
+msgstr "Evolution kalender-komponent"
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Evolution adressebok minikort visning"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Factory for import av LDIF-filer til Evolution."
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Importerer LDIF-filer til Evolution."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Factory for import av VCard-filer til Evolution."
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Importerer VCard-filer til Evolution."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "En Bonobo-kontroll for visning av en adresse."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "En Bonobo-kontroll for visning av en adresse."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Eksempel p� Bonobo-kontroll som viser en adressebok."
+
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr "Konfigurasjonskontroll for Evolution adressebok-lager."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Kontroll som viser et minikort for Evolutions adressebok."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Evolution komponent for h�ndtering av kontakter."
+
+#~ msgid "Factory for the controls exported by the Evolution Addressbook"
+#~ msgstr "Factory for kontroller eksportert av Evolution adressebok"
+
+#~ msgid "1234"
+#~ msgstr "1234"
+
+#~ msgid "380"
+#~ msgstr "380"
+
+#~ msgid "666"
+#~ msgstr "666"
+
+#~ msgid "<- _Remove"
+#~ msgstr "<- Fje_rn"
+
+#~ msgid "<< Fewer Options"
+#~ msgstr "<< F�rre alternativer"
+
+#~ msgid "Add (or Edit) Attribute Mappings"
+#~ msgstr "Legg til (eller rediger) mapping av attributter"
+
+#~ msgid "DN Customization"
+#~ msgstr "DN-tilpasning"
+
+#~ msgid "Mappings"
+#~ msgstr "Mappinger"
+
+#~ msgid "Objectclasses"
+#~ msgstr "Objektklasser"
+
+#~ msgid "Objectclasses Used in Evolution:"
+#~ msgstr "Objektklasser som brukes i Evolution:"
+
+#~ msgid "Objectclasses Used on Server:"
+#~ msgstr "Objektklasser som brukes p� tjener:"
+
+#~ msgid ""
+#~ "Please select an Evolution attribute and an\n"
+#~ "LDAP attribute to associate with it."
+#~ msgstr ""
+#~ "Vennligst velg en Evolution-attributt og en\n"
+#~ "LDAP-attributt du vil assosiere med denne."
+
+#~ msgid "R_estore Defaults"
+#~ msgstr "Gjenopp_rett forvalg"
+
+#~ msgid "Re_store Defaults"
+#~ msgstr "_Gjenopprett forvalg"
+
+#~ msgid "_Add ->"
+#~ msgstr "_Legg til ->"
+
+#~ msgid "_Add Mapping"
+#~ msgstr "_Legg til mapping"
+
+#~ msgid "_Add to DN"
+#~ msgstr "_Legg til i DN"
+
+#~ msgid "_Always"
+#~ msgstr "_Alltid"
+
+#~ msgid "_Delete Mapping"
+#~ msgstr "_Slett mapping"
+
+#~ msgid "_Distinguished Name (DN):"
+#~ msgstr "_Distinguished name (DN)"
+
+#~ msgid "_Don't use SSL/TLS"
+#~ msgstr "_Ikke bruk SSL/TLS"
+
+#~ msgid "_Edit Mapping"
+#~ msgstr "R_ediger mapping"
+
+#~ msgid "_Evolution attribute:"
+#~ msgstr "_Evolution-attributt:"
+
+#~ msgid "_If necessary "
+#~ msgstr "_Om n�dvendig"
+
+#~ msgid "_LDAP attribute:"
+#~ msgstr "_LDAP-attributt:"
+
+#~ msgid "_LDAP attributes:"
+#~ msgstr "_LDAP-attributter:"
+
+#~ msgid "_More Options >>"
+#~ msgstr "_Flere alternativer >>"
+
+#~ msgid "_Restore Defaults"
+#~ msgstr " Gjenopp_rett forvalg"
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr "Factory for adressebokens grensesnitt for navnevalg"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Kontaktliste uten navn"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d ikke vist)"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "En Bonobo-kontroll som viser en oppgaveliste."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Eksempel p� Bonobo-kontroll som viser en kalender."
+
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Konfigurasjonskontroll for Evolution kalender."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Evolution komponent for h�ndtering av kalenderen."
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Calendar objects"
+#~ msgstr "Factory for Evolutions sammendrag-komponent."
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr "Factory for � sentralisere dialoger for kalender-komponent"
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Alarm-tjeneste"
+
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Factory for import av 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 registeret: %s"
+
+#~ msgid "Can't call getFolderAtPath on storage: %s"
+#~ msgstr "Kan ikke kalle getFolderAtPath p� lager: %s"
+
+#~ msgid "minute"
+#~ msgstr "minutt"
+
+#~ msgid "hour"
+#~ msgstr "time"
+
+#~ msgid "week"
+#~ msgstr "uke"
+
+#~ msgid "year"
+#~ msgstr "�r"
+
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Konfigurasjonskontroll for Evolution skjermskrifter."
+
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Konfigurasjonskontroll for Evolution e-post-konti."
+
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Konfigurasjonskontroll for Evolution e-posth�ndterer."
+
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Konfigurasjonskontroll for Evolution meldingsredigering."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Evolution komponent for h�ndtering av e-post."
+
+#~ msgid "Evolution mail executive summary component."
+#~ msgstr "Evolution e-post komponent for sammendrag."
+
+#, fuzzy
+#~ msgid "Factory for the controls exported by the Evolution Mailer"
+#~ msgstr "Konfigurasjonskontroll for Evolution e-posth�ndterer."
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Factory for � 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 "Factory for � importere Outlook Express 4-meldinger til Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importerer Outlook Express 4-filer til Evolution"
+
+#~ msgid "On Screen fonts"
+#~ msgstr "Skrifter p� skjermen"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "_Fast bredde:"
+
+#~ msgid "_Variable-width:"
+#~ msgstr "_Variabel bredde:"
+
+#~ msgid "All folders"
+#~ msgstr "Alle mapper"
+
+#~ msgid "Display Options"
+#~ msgstr "Alternativer for visning"
+
+#~ msgid "Folders whose names begin with:"
+#~ msgstr "Vis mapper med navn som begynner p�:"
+
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Konfigurasjonskontroll for Evolution sammendrag."
+
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution."
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Evolution kunne ikke opprette 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 rettigheter. Vennligst gj�r den\n"
+#~ "lesbar og kj�rbar og start Evolution p� nytt."
+
+#~ 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"
+#~ "m� fjernes for at Evolution skal fungere riktig.\n"
+#~ "Vennligst fjern denne filen og start Evolution p� nytt."
+
+#~ msgid "Output File"
+#~ msgstr "Utfil"
+
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "Innstillinger for Pilot-komponent..."
+
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "Sett opp konfigurasjon av  Pilot-komponent"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Personlig adressebok-tjener"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "Personlig adressebok-tjener; factory"
 
 #~ msgid "Factory for the Addressbook Minicard control"
 #~ msgstr "Factory for minikort kontroll for adressebok"
@@ -28145,9 +28402,6 @@ msgstr "Personlig adressebok-tjener; factory"
 #~ msgid "Salve file"
 #~ msgstr "Redd fil"
 
-#~ msgid "Factory for Evolution Summary's configuration control."
-#~ msgstr "Factory for konfigurasjonskontroll for Evolution sammendrag."
-
 #~ msgid "Marquette"
 #~ msgstr "Marquette"
 
@@ -28286,9 +28540,6 @@ msgstr "Personlig adressebok-tjener; factory"
 #~ msgid "Type the name by which you would like to refer to this signature."
 #~ msgstr "Skriv navnet du vil referere til denne signaturen med."
 
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Importeringsassistent for Evolution"
-
 #~ msgid "_Preferences..."
 #~ msgstr "_Brukervalg..."
 
@@ -28414,9 +28665,6 @@ msgstr "Personlig adressebok-tjener; factory"
 #~ msgid "You must specify a label name"
 #~ msgstr "Du m� spesifisere et navn p� etiketten"
 
-#~ msgid "Evolution News Editor"
-#~ msgstr "Evolution nyhetsredigerer"
-
 #~ msgid "Are you sure you want to delete this news account?"
 #~ msgstr "Er du sikker p� at du vil slette denne diskusjonsgruppekontoen?"
 
@@ -29097,9 +29345,6 @@ msgstr "Personlig adressebok-tjener; factory"
 #~ msgid "Mail Summary"
 #~ msgstr "E-post-sammendrag"
 
-#~ msgid "Factory for the Evolution notes component."
-#~ msgstr "Factory for Evolution notat-komponent."
-
 #~ msgid "Factory for the Notes control"
 #~ msgstr "Factory for notat-kontroll"
 
@@ -29166,9 +29411,6 @@ msgstr "Personlig adressebok-tjener; factory"
 #~ msgid "Summary Settings"
 #~ msgstr "Innstillinger for sammendrag"
 
-#~ msgid "Evolution "
-#~ msgstr "Evolution "
-
 #~ msgid "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
 
@@ -29250,9 +29492,6 @@ msgstr "Personlig adressebok-tjener; factory"
 #~ msgid " _Remove"
 #~ msgstr " Fje_rn"
 
-#~ msgid "Al_l stations:"
-#~ msgstr "Al_le stasjoner:"
-
 #~ msgid "All _folders:"
 #~ msgstr "Alle _mapper:"
 
@@ -31270,9 +31509,6 @@ msgstr "Personlig adressebok-tjener; factory"
 #~ msgid "Forward this message"
 #~ msgstr "Videresend denne meldingen"
 
-#~ msgid "Delete this message"
-#~ msgstr "Slett denne meldingen"
-
 #~ msgid "Select everything"
 #~ msgstr "Velg alt"
 
@@ -31701,9 +31937,6 @@ msgstr "Personlig adressebok-tjener; factory"
 #~ msgid "Unspecified"
 #~ msgstr "Uspesifisert"
 
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Evolution e-post-konfigurasjon"
-
 #~ msgid "Include this account when receiving mail"
 #~ msgstr "Ta med denne kontoen n�r du mottar e-post"
 
@@ -31794,9 +32027,6 @@ msgstr "Personlig adressebok-tjener; factory"
 #~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 #~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
-#~ msgid "Evolution Addressbook Conduit"
-#~ msgstr "Evolution adressebok-komponent"
-
 #~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
 #~ msgstr "� 1998-2000 the Free Software Foundation og Helix Code"
 
@@ -31829,15 +32059,9 @@ msgstr "Personlig adressebok-tjener; factory"
 #~ msgid "Evolution Address conduit "
 #~ msgstr "Oppgaver"
 
-#~ msgid "Evolution Calendar Conduit"
-#~ msgstr "Evolution kalender-komponent"
-
 #~ msgid "Configure the GnomeCal conduit"
 #~ msgstr "Konfigurer GnomeCal-komponent"
 
-#~ msgid "Evolution Calendar conduit"
-#~ msgstr "Evolution kalender-komponent"
-
 #~ msgid "Configure the todo conduit"
 #~ msgstr "Konfigurer oppgavelistekomponenten"
 
@@ -32294,9 +32518,6 @@ msgstr "Personlig adressebok-tjener; factory"
 #~ msgid "Sets something as bold"
 #~ msgstr "Setter utvalg til uthevet"
 
-#~ msgid "Could not execute %s: %s\n"
-#~ msgstr "Kunne ikke kj�re %s: %s\n"
-
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Kan ikke initiere Evolutions e-postlagrings-hash."
 
diff --git a/po/pl.po b/po/pl.po
index 0a9f7e4e9f..1d259a85d6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,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: 2002-09-24 01:06+0200\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -17,40 +17,52 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\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 "Generator importu plik�w z LDIF do Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Druid importu 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 "Importuje pliki LDIF do Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Edytor list�w Evolution."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Generator importu plik�w VCard do Evolution."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Edytor list�w Evolution."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importuje pliki VCard do 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 "Nazwa karty"
 
 #: 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 "Nazwa"
 
 #: 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-mail"
 
 #: 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 "G��wny"
 
@@ -60,16 +72,17 @@ msgstr "G�wn"
 
 #: 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 "Asystent"
 
 #: 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 "Praca"
 
@@ -79,12 +92,12 @@ msgid "Bus"
 msgstr "Prc"
 
 #: 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 "Telefon kontaktowy"
 
 #: 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"
 
@@ -95,12 +108,13 @@ msgstr "Frma"
 #: 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 "Dom"
 
 #: 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 "Organizacja"
@@ -111,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:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "Przeno�ny"
 
 #: 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 "Samoch�d"
 
 #: 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 s�u�bowy"
@@ -132,13 +146,13 @@ msgid "Bus Fax"
 msgstr "Faks s�u�b"
 
 #: 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 "Faks w domu"
 
 #: 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 "Praca 2"
 
@@ -147,43 +161,43 @@ msgid "Bus 2"
 msgstr "Prc 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 "Dom 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 "Inne"
 
 #: 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 "Inny 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 "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 "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"
@@ -194,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: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: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-mail 3"
@@ -226,6 +240,7 @@ msgid "Dep"
 msgstr "Oddz"
 
 #: 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 "Biuro"
@@ -235,6 +250,7 @@ msgid "Off"
 msgstr "Bro"
 
 #: 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 "Tytu�"
@@ -249,6 +265,7 @@ msgid "Prof"
 msgstr "Zawd"
 
 #: 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 "Menad�er"
@@ -262,6 +279,7 @@ msgid "Ass"
 msgstr "Asyst"
 
 #: 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 "Przydomek"
@@ -271,16 +289,19 @@ msgid "Nick"
 msgstr "Przyd"
 
 #: 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 "Ma��onek"
 
 #: 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 "Notka"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr "URI kalendarza"
 
@@ -298,293 +319,386 @@ msgid "FBUrl"
 msgstr "UrlZaj"
 
 #: 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 "Kalendarz"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
 msgid "Anniversary"
 msgstr "Rocznica"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Roczn"
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "Data urodzenia"
 
-#: 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 "Kategorie"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Nazwisko panie�skie"
 
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:335
+#, fuzzy
+msgid "ECard"
+msgstr "Samoch�d"
+
+#: 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
 msgid "Unnamed List"
 msgstr "Lista kontakt�w bez nazwy"
 
-#: addressbook/backend/ebook/e-card.c:2683
-msgid "Multiple VCards"
-msgstr "Plik VCard z wieloma pozycjami"
+#: 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 "Pe�na nazwa"
 
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
-msgstr "Plik VCard z pozycj� %s"
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "_Adres:"
+
+#: addressbook/backend/ebook/e-card.c:1328
+#, fuzzy
+msgid "Address Label"
+msgstr "Karty adresowe"
+
+#: addressbook/backend/ebook/e-card.c:1335
+#, fuzzy
+msgid "Phone"
+msgstr "Ponce"
+
+#: addressbook/backend/ebook/e-card.c:1349
+#, fuzzy
+msgid "Birth date"
+msgstr "Data urodzenia"
+
+#: 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 "Organizacja"
+
+#: 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 "Rola"
+
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
+#, fuzzy
+msgid "Mailer"
+msgstr ""
+"\n"
+"Dostarczyciel poczty: "
+
+#: addressbook/backend/ebook/e-card.c:1445
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "URL sygnalizuj�cy zaj�to��:"
+
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Kalendarz"
+
+#: addressbook/backend/ebook/e-card.c:1466
+#, fuzzy
+msgid "Related Contacts"
+msgstr "Wybrane kontakty:"
+
+#: addressbook/backend/ebook/e-card.c:1480
+#, fuzzy
+msgid "Category List"
+msgstr "Kategori� jest"
+
+#: 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 "Inny adres"
+
+#: 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/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:1529
+#, fuzzy
+msgid "Last Use"
+msgstr "Wklej"
+
+#: addressbook/backend/ebook/e-card.c:1540
+#, fuzzy
+msgid "Use Score"
+msgstr "Punkty"
+
+#: 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 "Nie mo�na zainicjowa� 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 "Wyszukiwanie..."
 
-#: addressbook/backend/pas/pas-backend-file.c:366
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr "Wczytywanie..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:687
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+#, fuzzy
+msgid "Using Distinguished Name (DN)"
+msgstr "U�ycie wyr�nionej nazwy (DN)"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "U�ycie adresu e-mail"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 msgid "Reconnecting to LDAP server..."
 msgstr "Ponowne nawi�zywanie po��czenia z serwerem LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1230
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr "Dodawanie karty na serwerze LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1336
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr "Usuwanie karty z serwera 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 "Modyfikowanie karty na serwerze LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2889
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "Pobieranie wynik�w wyszukiwania na LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2998
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 msgid "Error performing search"
 msgstr "B��d przy wykonywaniu wyszukiwania"
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Domy�lny adres do synchronizacji::"
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Nie mo�na wczyta� kursora\n"
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "Nie mo�na wczyta� 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 "Nie mo�na uruchomi� serwera 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 "Nie mo�na uruchomi� wombata"
 
-#: 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 "Nie mo�na odczyta� bloku aplikacji adresowej pilota"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Komponent Bonobo wyskakuj�cego okna z adresem."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Komponent Bonobo wy�wietlaj�cy adres."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Przyk�adowy komponent Bonobo wy�wietlaj�cy ksi��k� adresow�."
-
-#: 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 ""
-"Komponent Bonobo wy�wietlaj�cy miniaturow� kart� ksi��ki adresowej 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"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
 msgstr "Przegl�darka miniaturowych kart ksi��ki adresowej Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Komponent Evolution obs�uguj�cy kontakty."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Generator komponent�w miniatorowych kart ksi��ki adresowej"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Generator komponent�w wy�wietlaj�cych adres z ksi��ki adresowej"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Interfejs wyboru nazwy ksi��ki adresowej Evolution"
 
-#: 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:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
 msgstr ""
 "Generator komponent�w wy�wietlaj�cych wyskakuj�ce okno z adresem z ksi��ki "
 "adresowej"
 
-#: 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:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Przegl�darka miniaturowych kart ksi��ki adresowej Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "Factory for the sample Addressbook control"
-msgstr "Generator przyk�adowych komponent�w ksi��ki adresowej"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Przegl�darka miniaturowych kart ksi��ki adresowej Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Przegl�darka miniaturowych kart ksi��ki adresowej 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/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Przegl�darka miniaturowych kart ksi��ki adresowej 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 "Kontakty"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:76
 msgid "Folder containing contact information"
 msgstr "Folder zawieraj�cy informacje o kontaktach"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP Server"
 msgstr "Serwer LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP server containing contact information"
 msgstr "Serwer LDAP zawieraj�cy informacje o kontaktach"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public Contacts"
 msgstr "Kontakty"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public folder containing contact information"
 msgstr "Folder zawieraj�cy informacje o kontaktach"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Nowy 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
 msgid "Create a new contact"
 msgstr "Tworzy nowy kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Nowa lista kontakt�w"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "Lista _kontakt�w"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:569
 msgid "Create a new contact list"
 msgstr "Tworzy now� list� kontakt�w"
 
-#: addressbook/gui/component/addressbook-config.c:197
+#: addressbook/gui/component/addressbook-config.c:206
 msgid "Failed to connect to LDAP server"
 msgstr "Nie mo�na nawi�za� po��czenia z serwerem LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 msgid "Failed to authenticate with LDAP server"
 msgstr "Nie mo�na dokona� uwierzytelnienia na serwerze LDAP"
 
-#: 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 "B��d przy pobieraniu informacji o schemacie"
 
-#: addressbook/gui/component/addressbook-config.c:1184
+#: addressbook/gui/component/addressbook-config.c:1223
 msgid "Server did not respond with valid schema information"
 msgstr "Odpowied� serwera nie zawiera poprawnych informacji o schemacie"
 
-#: addressbook/gui/component/addressbook-config.c:1630
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "Ta kopia Evolution nie obs�uguje protoko�u LDAP"
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1637
 #, fuzzy
 msgid "Account Name"
 msgstr "Nazwa konta"
 
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1639
 #, fuzzy
 msgid "Server Name"
 msgstr "_Nazwa serwera:"
 
-#: 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 "Nie mo�na zainicjowa� gnome-vfs"
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "Ta kopia Evolution nie obs�uguje protoko�u LDAP"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
 msgid "Other Contacts"
 msgstr "Inne kontakty"
 
-#: addressbook/gui/component/addressbook.c:474
-msgid "Unable to open addressbook"
-msgstr "Nie mo�na otworzy� ksi��ki adresowej"
-
-#: 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."
@@ -592,7 +706,7 @@ msgstr ""
 "Nie mo�na otworzy� tej ksi��ki adresowej. Upewnij si�, �e �cie�ka\n"
 "ustnieje oraz �e ma ustawione odpowiednie uprawnienia."
 
-#: 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"
@@ -601,7 +715,7 @@ msgstr ""
 "Nie mo�na otworzy� tej ksi��ki adresowej. Mo�e to by� spowodowane\n"
 "u�yciem niepoprawnego URI lub nazwy serwera LDAP."
 
-#: 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"
@@ -612,7 +726,7 @@ msgstr ""
 "Aby m�c wykorzysta� LDAP, nale�y pobra� OpenLDAP spod podanego\n"
 "poni�ej adresu i ponownie skompilowa� Evolution ze �r�de�.\n"
 
-#: 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"
@@ -621,45 +735,48 @@ msgstr ""
 "Nie mo�na otworzy� tej ksi��ki adresowej. Mo�e to by� spowodowane\n"
 "u�yciem niepoprawnego URI lub niedost�pno�ci� serwera LDAP."
 
-#. 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 "Nie mo�na otworzy� ksi��ki adresowej"
+
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:625
+#: addressbook/gui/component/addressbook.c:667
 msgid "Failed to authenticate.\n"
 msgstr "Nie mo�na dokona� uwierzytelnienia.\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
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sWprowad� has�o dla %s (u�ytkownik %s)"
 
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:813
 msgid "Name begins with"
 msgstr "Nazwa rozpoczyna si� od"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:814
 msgid "Email begins with"
 msgstr "E-mail rozpoczyna si� od"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategori� jest"
 
 #. 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 "Jakiekolwiek pole zawiera"
 
-#: addressbook/gui/component/addressbook.c:786
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "Zaawansowane..."
 
-#: 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"
@@ -667,7 +784,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"
@@ -675,25 +792,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 "Dowolna kategoria"
 
-#: addressbook/gui/component/addressbook.c:1132
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr "URI kt�re ma wy�wietli� przegl�darka katalog�w"
 
@@ -702,132 +819,122 @@ msgstr "URI kt�re ma wy�wietli� przegl�darka katalog�w"
 #. * 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 "(brak)"
 
-#: 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 "G��wny e-mail"
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Wyb�r czynno�ci"
 
-#: 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 "Utw�rz nowy 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 "Dodaj adres do istniej�cego kontaktu \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Sprawdzanie ksi��ki adresowej..."
 
-#: 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 "Zmie� informacje o kontakcie"
 
-#: 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 "Dodaj do kontakt�w"
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Do��czenie adresu e-mail"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Wy��cz zapytania"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "W��cz zapytania (Niebezpieczne!)"
 
 #: 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 " Wy�wi_etl obs�ugiwane typy "
 
-#: addressbook/gui/component/ldap-config.glade.h:2
-msgid "1234"
-msgstr "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
 msgid "1:00"
 msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "2:30"
 msgstr "2:30"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
-msgid "380"
-msgstr "380"
-
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "5:00"
 msgstr "5:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
-msgid "666"
-msgstr "666"
-
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "<- _Remove"
-msgstr "<- _Usu�"
+#, fuzzy
+msgid "Add LDAP Server"
+msgstr "Serwer LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "<< Fewer Options"
-msgstr "<< Mniej opcji"
-
-#: 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 "�r�d�a ksi��ki adresowej"
 
-#: 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 "Zawsze"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Anonymously"
 msgstr "Anonimowo"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
-msgid "Associated LDAP Attribute"
-msgstr "Powi�zany atrybut LDAP"
-
-#: addressbook/gui/component/ldap-config.glade.h:18
-msgid "Attribute"
-msgstr "Atrybut"
-
-#: 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"
@@ -836,73 +943,58 @@ msgid ""
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
 msgstr "Nawi�zywanie po��czenia"
 
-#: 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 "Dopasowanie wyr�nionej nazwy"
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "_Usu�"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "_Wyr�niona nazwa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid "Edit LDAP Server"
+msgstr "Serwer LDAP"
+
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Email Address:"
 msgstr "Adres e-mail:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
-msgid "Evolution Attribute"
-msgstr "Atrybut 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 ""
 "Evolution wykorzysta przy uwierzytelnianiu na serwerze podan� wyr�nion� "
 "nazw� (DN)"
 
-#: 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 wykorzysta przy uwierzytelnianiu na serwerze podany adres e-mail."
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Finished"
 msgstr "Zako�czone"
 
-#: 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 "Og�lne"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "LDAP Attribute"
-msgstr "Atrybut LDAP"
-
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "LDAP Configuration Assistant"
 msgstr "Druid konfiguracji LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Mappings"
-msgstr "Odwzorowania"
-
-#: 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 "Nigdy"
 
-#: 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"
@@ -912,71 +1004,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 "Pojedyncze"
 
-#: 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 "_Zakres wyszukiwania: "
 
 #. 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 "Wyszukiwanie"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
-#, fuzzy
-msgid "Select"
-msgstr "Zaznacz wszystkie"
-
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Selected:"
 msgstr "Usuni�ty"
 
-#: 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"
@@ -987,7 +1042,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"
@@ -996,51 +1051,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 "Krok 1: Informacje o serwerze"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Step 2: Connecting to Server"
 msgstr "Krok 2: Nawi�zywanie po��czenia z serwerem"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr "Krok 3: Przeszukiwanie katalogu"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr "Krok 4: Wy�wietlana nazwa"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr "Podrz�dne"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Supported Search Bases"
 msgstr "Obs�ugiwane podstawy wyszukiwania"
 
-#: 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"
@@ -1048,7 +1096,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"
@@ -1057,7 +1105,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"
@@ -1065,17 +1113,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"
@@ -1085,20 +1133,20 @@ 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 "
@@ -1108,7 +1156,7 @@ msgstr ""
 "Zwr�� uwag� na fakt, �e ustawienie jej na \"Adres e-mail\" wymaga "
 "anonimowego dost�pu do serwera LDAP."
 
-#: 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"
@@ -1117,7 +1165,7 @@ msgstr ""
 "Jest to nazwa sewera, kt�ra b�dzie widoczna na li�cie folder�w Evolution.\n"
 "Nazwa ta przeznaczona jest tylko do wy�wietlania."
 
-#: 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"
@@ -1125,81 +1173,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 "Opcja ta kontroluje czas trwania wyszukiwania."
 
-#: 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 "U�y_cie SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr "U�ycie wyr�nionej nazwy (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using email address"
 msgstr "U�ycie adresu e-mail"
 
-#: 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 "_Dodaj"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-msgid "_Add ->"
-msgstr "_Dodaj ->"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-msgid "_Add Mapping"
-msgstr "_Dodaj odwzorowanie"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-msgid "_Add to DN"
-msgstr "_Dodaj do DN"
-
-#: addressbook/gui/component/ldap-config.glade.h:112
-msgid "_Always"
-msgstr "_Zawsze"
-
-#: addressbook/gui/component/ldap-config.glade.h:113
-msgid "_Delete Mapping"
-msgstr "_Usu� odwzorowanie"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Display name:"
 msgstr "_Wy�wietlana nazwa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_Distinguished Name (DN):"
-msgstr "_Wyr�niona nazwa (DN):"
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_Don't use SSL/TLS"
-msgstr "_Bez u�ycia SSL/TLS"
-
-#: 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
@@ -1209,192 +1220,140 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-msgid "_Edit Mapping"
-msgstr "_Zmodyfikuj odwzorowanie"
-
-#: addressbook/gui/component/ldap-config.glade.h:120
-msgid "_Evolution attribute:"
-msgstr "_Atrybut 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
-msgid "_More Options >>"
-msgstr "_Wi�cej opcji >>"
-
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Port number:"
 msgstr "Numer p_ortu:"
 
-#: 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 "_Podstawa wyszukiwania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "_Nazwa serwera:"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Timeout (minutes):"
 msgstr "_Czas oczekiwania (minuty):"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
-msgid "account-druid"
-msgstr "druid-konta"
-
-#: addressbook/gui/component/ldap-config.glade.h:132
-msgid "account-editor"
-msgstr "edytor-konta"
-
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "cards"
 msgstr "karty"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "connecting-tab"
 msgstr "zak�adka-nawi�zywanie po��czenia"
 
-#: addressbook/gui/component/ldap-config.glade.h:135
-msgid "dn-customization-tab"
-msgstr "zak�adka-dopasowywanie-db"
-
-#: 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 "zak�adka-og�lne"
 
-#: addressbook/gui/component/ldap-config.glade.h:138
-msgid "mappings-tab"
-msgstr "zak�adka-odwzorowania"
-
-#: addressbook/gui/component/ldap-config.glade.h:139
-msgid "objectclasses-tab"
-msgstr "zak�adka-klasy-obiekt�w"
-
-#: addressbook/gui/component/ldap-config.glade.h:140
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "searching-tab"
 msgstr "zak�adka-wyszukiwanie"
 
-#: 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 "Interfejs wyboru nazwy ksi��ki adresowej Evolution"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Generator interfejsu wyboru nazwy ksi��ki adresowej Evolution"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Usu� wszystko"
 
 #. 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 "Usu�"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
-msgid "Remove All"
-msgstr "Usu� wszystko"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+msgstr "Nowa lista kontakt�w"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact Info"
+msgstr "Zmie� informacje o kontakcie"
 
-#: 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 "Wys�anie listu w formacie HTML"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:405
-msgid "Edit Contact List"
-msgstr "Zmodyfikuj list� kontakt�w"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:423
-msgid "Unnamed Contact List"
-msgstr "Lista kontakt�w bez nazwy"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:440
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d niewy�wietlonych)"
-
-#: 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 "Kontakt bez nazwy"
 
-#: 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 "�r�d�o"
+
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr "Wyb�r kontakt�w z ksi��ki adresowej"
 
-#: 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
+#, fuzzy
+msgid "Find"
+msgstr "Znajd�:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "Wyb�r nazw"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "Selected Contacts:"
 msgstr "Wybrane kontakty:"
 
-#: 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 "_Kategoria:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr "_Folder:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "A_ssistant's name:"
 msgstr "_Nazwisko asystenta:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Add_ress..."
 msgstr "Adre_s..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr "_Rocznica:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Birthda_y:"
 msgstr "_Urodziny:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
-msgstr "_Kontakty..."
-
 #: 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_tegorie..."
@@ -1405,7 +1364,7 @@ msgstr "Wsp�praca"
 
 #. 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 "Edytor kontakt�w"
 
@@ -1414,7 +1373,7 @@ msgid "D_epartment:"
 msgstr "_Oddzia�:"
 
 #: 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 "Szczeg�y"
 
@@ -1456,1142 +1415,1190 @@ msgstr "_Organizacja:"
 msgid "P_rofession:"
 msgstr "Z_aw�d:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr "Typy telefon�w"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "S_pouse:"
 msgstr "_Ma��onek:"
 
-#: 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 "_To jest adres pocztowy"
 
-#: 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 "Chce otrzymywa� listy w HTML-u"
 
-#: 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 "_Usu�"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "Tytu� s�u�_bowy:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr "Nazwisko _szefa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "Przy_domek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_Biuro:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Public Calendar URL:"
 msgstr "URL publicznego _kalendarza:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Web page address:"
 msgstr "Adres strony _WWW:"
 
-#: 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 "Uaktywnij"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr "Stany Zjednoczone"
 
-#: 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 "Algieria"
 
-#: 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 Ameryka�ska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Andorra"
 msgstr "Andora"
 
-#: 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 "Antarktyka"
 
-#: 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 i 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 "Argentyna"
 
-#: 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 "Azerbejd�an"
 
-#: 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 "Bahamy"
 
-#: 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 "Bangladesz"
 
-#: 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 "Bia�ogu�"
 
-#: 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 "Bermudy"
 
-#: 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 "Boliwia"
 
-#: 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 "Bo�nia i Hercegowina"
 
-#: 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 "Wyspa Bouveta"
 
-#: 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 "Brazylia"
 
-#: 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 "Brytyjskie Terytorium Oceanu Spokojnego"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brunei Darussalam"
 msgstr "Su�tanat 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 "Bu�garia"
 
-#: 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 "Wyspy Zielonego Przyl�dka"
 
-#: 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 "Kajmany"
 
-#: 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 "Republika �rodkowej Afryki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Chad"
 msgstr "Czad"
 
-#: 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 "Chiny"
 
-#: 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 "Wyspa Bo�ego Narodzenia"
 
-#: 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 "Wyspy Kokosowe"
 
-#: 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 "Columbia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Comoros"
 msgstr "Komory"
 
-#: 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"
 
 # [cyba] Nie mam pewno�ci, ale jest zatoka Cooka, cie�nina, g�ry, wi�c chyba...
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cook Islands"
 msgstr "Wyspy Cooka"
 
-#: 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 "Kostaryka"
 
-#: 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 "Cote d'Ivoire"
 
-#: 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 "Chorwacja"
 
-#: 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 "Cypr"
 
-#: 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 "Republika Czeska"
 
-#: 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 "Dania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Djibouti"
 msgstr "D�ibuti"
 
-#: 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 "Republika Dominikany"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr "Wschodni 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 "Ekwador"
 
-#: 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 "Egipt"
 
-#: 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 "Salwador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "Gwinea R�wnikowa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Erytrea"
 
-#: 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 "Falklandy"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr "Wyspy Faroe"
 
-#: 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 "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 "Francja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "Gujana Francuska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "Polinezja Francuska"
 
-#: 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 "Francuskie terytoria po�udniowe"
 
-#: 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 "Niemcy"
 
-#: 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 "Grecja"
 
-#: 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 "Grenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "Gwadelupa"
 
-#: 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 "Gwatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guinea"
 msgstr "Gwinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea-bissau"
 msgstr "Gwinea Bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guyana"
 msgstr "Gujana"
 
-#: 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 "Wyspy Headra i McDonalda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr "Watykan"
 
-#: 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 "Hinduras"
 
-#: 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 "W�gry"
 
-#: 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 "Indie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Indonesia"
 msgstr "Indonezja"
 
-#: 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 "Irlandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Izrael"
 
-#: 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 "W�ochy"
 
-#: 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 "Jamajka"
 
-#: 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 "Kazahstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Kenia"
 
-#: 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 "Republika Korei"
 
-#: 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 "Kuwejt"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kyrgyzstan"
 msgstr "Kirgistan"
 
-#: 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 "Litwa"
 
-#: 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 "Libia"
 
-#: 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 "�otwa"
 
-#: 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 "Makao"
 
-#: 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 "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 "Malezja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Maldives"
 msgstr "Mo�dawia"
 
-#: 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 "Wyspy Marshalla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Martinique"
 msgstr "Martynika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mauritania"
 msgstr "Mauretania"
 
-#: 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 "Majotta"
 
-#: 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 "Meksyk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Micronesia"
 msgstr "Mikronezja"
 
-#: 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 "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 "Mozambik"
 
-#: 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 "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 "Holandia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Netherlands Antilles"
 msgstr "Antyle holenderskie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "New Caledonia"
 msgstr "Nowa Kaledonia"
 
-#: 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 "Nowa Zelandia"
 
-#: 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 "Wyspa Norfolk"
 
 # [cyba] S� Mariany, wi�c p�nocne pewnie te�...
-#: 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�nocne Mariany"
 
-#: 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 "Norwegia"
 
-#: 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 "Autonomia Palesty�ska"
 
-#: 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 Nowa 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 "Paragwaj"
 
-#: 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 "Filipiny"
 
-#: 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 "Polska"
 
-#: 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 "Portugalia"
 
-#: 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 "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 "Rumunia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Russian Federation"
 msgstr "Federacja rosyjska"
 
-#: 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 "St Kitts i 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 i Grenadyny"
 
-#: 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"
 
 # [cyba] Tak jest w moim atlasie, drugiej cz�ci nie ma
-#: 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"
 
-#: 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 Saudyjska"
 
-#: 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 "Szeszele"
 
-#: 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 "S�owacja"
 
-#: 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 "S�owenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Solomon Islands"
 msgstr "Wyspy Salomona"
 
-#: 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 "Po�udniowa Afryka"
 
-#: 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 "Po�udniowa Georgia i Sandwich Po�udniowy"
 
-#: 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 "Hiszpania"
 
-#: 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 "�wi�ta 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 i Miquelon"
 
-#: 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 "Wyspy Svalbard i 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 "Suazi"
 
-#: 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 "Szwecja"
 
-#: 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 "Szwajcaria"
 
-#: 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 "Tad�ykistan"
 
-#: 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 "Zjednoczona Republika Tanzanii"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Thailand"
 msgstr "Tajlandia"
 
-#: 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 "Trynidad i Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tunisia"
 msgstr "Tunezja"
 
-#: 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 "Turcja"
 
-#: 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 "Turks i 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 "Kanada"
 
-#: 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 "Zjednoczone Emiraty Arabskie"
 
-#: 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 "Zjednoczone Kr�lestwo"
 
-#: 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 "Oddalone drobne wyspy Stan�w Zjednoczonych"
 
-#: 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 "Urugwaj"
 
-#: 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 "Wenezuela"
 
-#: 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 "Wietnam"
 
-#: 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 "Brytyjskie Wyspy Dziewicze"
 
-#: 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 "Ameryka�skie Wyspy Dziewicze"
 
-#: 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 "Wyspy Wallis i 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 "Zachodnia Sachara"
 
-#: 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 "Jemen"
 
-#: 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 "Jugos�awia"
 
-#: 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 "Zimbabwe"
 
-#: 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 "Bodo"
+
+#: 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 "Samoch�d"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
+msgid "Is New Card"
 msgstr ""
-"Czy na pewno chcesz\n"
-"usun�� ten kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "Usun�� kontakt?"
+#: 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 "Czad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:826
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr "Edytor kategorii nie jest dost�pny."
 
-#: 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 "Ten kontakt przynale�y do nast�puj�cych kategorii:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1047
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr "Zapis kontaktu w formacie 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 ""
+"Czy na pewno chcesz\n"
+"usun�� ten kontakt?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Czy na pewno chcesz\n"
+"usun�� ten kontakt?"
+
+#: 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 "Nie mo�na odnale�� widgetu zwi�zanego z polem: \"%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 "Szybkie dodanie kontaku"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr "Pe�na edycja"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Pe�na nazwa"
-
-#: 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-mail"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, fuzzy, c-format
+msgid "Error saving %s: %s"
+msgstr "B��d przy zapisie pliku: %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 "karta.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:183
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 msgid "list"
 msgstr "lista"
 
-#: 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"
@@ -2600,151 +2607,148 @@ msgstr ""
 "%s istnieje.\n"
 "Czy chcesz go nadpisa�?"
 
-#: 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 "Nadpisa� plik?"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adres _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Sprawd� adres"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_Kraj:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr "_Miasto:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "Sk_rzynka pocztowa:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Stan/Prowincja:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "K_od pocztowy:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Check Full Name"
 msgstr "Pe�na nazwa"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Dr."
 msgstr "Dr"
 
 # Nie ma odpowiednika tego w j�zyku polskim (wypada�oby mie� pusty napis, ale ten ^$#& gettext...)
-#: 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 "II"
 
-#: 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 "Panna"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Pan"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Pani"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Panna"
 
-#: 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 "_Imi�:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Nazwisko:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Drugie:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Przyrostek:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Tytu�:"
 
-#: 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 "Nazwa _listy:"
 
-#: 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 "Cz�onkowie"
 
-#: 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 "Wprowad� adres e-mail lub przeci�gnij kontakt do poni�szej listy:"
 
-#: 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 "_Ukrywanie adres�w przy wysy�aniu do tej listy"
 
-#: 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 "_Usu�"
 
-#: 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 "Edytor listy kontakt�w"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+#, fuzzy
+msgid "Is New List"
+msgstr "Lista zada�"
+
 #. 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 "Edytor listy kontakt�w"
 
-#: 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 "Zapisz list� w formacie VCard"
 
@@ -2798,261 +2802,284 @@ msgstr ""
 "Folder zawiera ju� kontakt o tej samej nazwie lub adresie e-mail.\n"
 "Czy pomimo tego chcesz go doda�?"
 
-#: 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 "Zaawansowane wyszukiwanie"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr "Wyszukiwanie"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr "Brak kart"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr "liczba kart: 1"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:152
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr "liczba kart: %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 "Quimper"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 msgid "Error getting book view"
 msgstr "B��d przy pobieraniu widoku ksi��ki adresowej"
 
+#: 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 "B��d przy modyfikacji karty"
 
-#: 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 "Sukces"
 
-#: 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 "Nieznany b��d"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Repozytorium roz��czone"
 
-#: 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 "Brak uprawnie�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Nie odnaleziono karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Karta z tym ID ju� istnieje"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protok� nie jest obs�ugiwany"
 
-#: 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 "Anulowane"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr "Uwierzytelnienie nie powiod�o si�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr "Wymagane uwierzytelnienie"
 
-#: 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 "Ksi��ka adresowa nie istnieje"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Inny b��d"
 
-#: 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 "Czy chcesz zapisa� zmiany?"
 
-#: 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 "B��d przy dodawaniu listy"
 
-#: 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 "B��d przy dodawaniu karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:91
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "B��d przy modyfikacji listy"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "B��d przy usuwaniu listy"
 
-#: 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 "B��d przy usuwaniu karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
-msgid "Display Cards?"
-msgstr "Pytanie o wy�wietlenie kart"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-msgid "Display Cards"
-msgstr "Wy�wietlenie kart"
-
-#: 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 "Przeniesienie list�w do folderu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 #, fuzzy
 msgid "Copy card to"
 msgstr "Kopiuje zaznaczone zadanie"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:353
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 #, fuzzy
 msgid "Move cards to"
 msgstr "Brak kart"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:355
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Brak kart"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "Plik VCard z wieloma pozycjami"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "Plik VCard z pozycj� %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 "Typ"
+
+#: 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 "Ksi��ka adresowa"
 
-#: 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 "Zapisz w formacie VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "New Contact..."
 msgstr "Nowy kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "New Contact List..."
 msgstr "Nowa lista kontakt�w..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Go to Folder..."
 msgstr "Przejd� do folderu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Import..."
 msgstr "Zaimportuj..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Search for Contacts..."
 msgstr "Szukaj kontakt�w..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Addressbook Sources..."
 msgstr "�r�d�a ksi��ki adresowej..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Pilot Settings..."
 msgstr "Ustawienia pilota..."
 
-#: 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 "Prze�lij kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:815
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr "Wy�lij list do kontaktu"
 
-#: 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 "Wydrukuj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr "Wydrukuj kopert�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Copy to folder..."
 msgstr "Skopiuj do folderu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Move to folder..."
 msgstr "Przenie� do folderu..."
 
-#: 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 "Wytnij"
 
-#: 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 "Skopiuj"
 
-#: 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 "Wklej"
 
-#: 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 "Usu�"
 
-#: 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 "Bie��cy widok"
 
@@ -3060,7 +3087,7 @@ msgstr "Bie��cy widok"
 #. 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,�,�"
@@ -3069,12 +3096,12 @@ 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 ""
 ",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"
@@ -3142,20 +3169,61 @@ msgstr "Inny telefon"
 msgid "Primary Phone"
 msgstr "G��wny 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 "oraz %d innych kart."
 
-#: addressbook/gui/widgets/e-minicard-control.c:187
+#: addressbook/gui/widgets/e-minicard-control.c:206
 msgid "and one other card."
 msgstr "oraz jedna inna karta."
 
-#: addressbook/gui/widgets/e-minicard-control.c:316
+#: addressbook/gui/widgets/e-minicard-control.c:318
 msgid "Save in addressbook"
 msgstr "Zapisz w ksi��ce adresowej"
 
-#: 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 "Szeroko��:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+#, fuzzy
+msgid "Height"
+msgstr "Wysoko��:"
+
+#: 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 "Nazwisko panie�skie"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+#, fuzzy
+msgid "Text Model"
+msgstr "_Rozmiar tekstu"
+
+#: 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"
@@ -3169,7 +3237,7 @@ msgstr ""
 "\n"
 "Dwukrotne klikni�cie spowoduje utworzenie nowego kontaktu."
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 msgid ""
 "\n"
 "\n"
@@ -3179,21 +3247,41 @@ msgstr ""
 "\n"
 "Brak element�w do wy�wietlenia w tym widoku."
 
-#: 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 "Usuni�ty"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Porz�dek zada�"
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Widok karty"
 
-#: 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 "Widok tygodnia"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr "Wydrukuj kopert�"
 
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1130
 msgid "Print cards"
 msgstr "Wydrukuj karty"
 
-#: 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 "Wydrukuj kart�"
 
@@ -3266,7 +3354,6 @@ msgid "Include:"
 msgstr "Do��czanie:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Pejza�"
 
@@ -3286,17 +3373,16 @@ msgstr "Marginesy"
 msgid "Number of columns:"
 msgstr "Liczba kolumn:"
 
-#: 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 "Opcje"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "U�o�enie"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "Strona"
 
@@ -3312,9 +3398,7 @@ msgstr "Papier"
 msgid "Paper source:"
 msgstr "�r�d�o papieru:"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Portret"
 
@@ -3374,43 +3458,167 @@ msgstr "_Czcionka..."
 msgid "Untitled appointment"
 msgstr "Termin pozbawiony nazwy"
 
-#: 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 "Wysoki"
 
-#: 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 "Zwyk�y"
 
-#: 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 "Niski"
 
 #. 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 "Niezdefiniowany"
 
-#: 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 "B��d przy komunikacji z serwerem kalendarza"
 
-#: 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 "Nie mo�na odczyta� bloku aplikacji kalendarza pilota"
 
@@ -3418,84 +3626,76 @@ msgstr "Nie mo�na odczyta� bloku aplikacji kalendarza pilota"
 msgid "Default Priority:"
 msgstr "Domy�lny priorytet:"
 
-#: 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 "Nie mo�na odczyta� bloku aplikacji \"do zrobienia\" pilota"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "Komponent Bonobo wy�wietlaj�cy list� zada�."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Komponent Bonobo wy�wietlaj�cy kalendarz."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 msgid "Calendar and Tasks"
 msgstr "Kalendarz i zadania"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Formant konfiguracji kalendarza 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 "Konfiguracja strefy czasowej, kalendarza i listy zada�."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Przegl�darka kalendarza iTip/iMip"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalendarz i zadania"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Komponent Bonobo obs�uguj�cy kalendarz."
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Komponent wy�wietlania folderu pocztowego 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 "Generator formantu zada� Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the calendar iTip view control"
-msgstr "Generator formantu wy�wietlania iTip kalendarza"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-msgid "Factory for the sample Calendar control"
-msgstr "Generator przyk�adowego formantu kalendarza"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Przegl�darka kalendarza iTip/iMip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Generator centralizuj�cy okna edytora komponentu kalendarza"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Przegl�darka kalendarza iTip/iMip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
-msgid "Factory to create a component editor factory"
-msgstr "Generator tworz�cy generator komponentu edytora"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Edytor nowin Evolution"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "Us�uga przypominania za pomoc� alarmu"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Edytor nowin 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
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
 msgstr "Generator us�ugi przypominania za pomoc� alarmu"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Starting:"
 msgstr "Pocz�tek:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Ending:"
 msgstr "Koniec:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
 msgid "invalid time"
 msgstr "niepoprawny czas"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:274
 msgid "Evolution Alarm"
 msgstr "Alarm 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 o %s"
@@ -3517,11 +3717,17 @@ msgstr "Czas u�pienia (minuty)"
 msgid "_Edit appointment"
 msgstr "_Zmodyfikuj termin"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "Brak opisu."
 
-#: 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 "Ostrze�enie"
+
+#: 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"
@@ -3533,13 +3739,7 @@ msgstr ""
 "z powiadamianiem za po�rednictwem list�w. Zamiast tego\n"
 "zostanie wy�wietlone zwyk�e okno przypomnienia."
 
-#: 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 "Ostrze�enie"
-
-#: 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 "
@@ -3556,15 +3756,15 @@ msgstr ""
 "\n"
 "Czy na pewno chcesz uruchomi� ten program?"
 
-#: 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 "Bez pytania o ten program w przysz�o�ci."
 
-#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
-msgid "Could not initialize GNOME"
-msgstr "Nie mo�na zainicjowa� GNOME"
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize gnome-vfs"
+msgstr "Nie mo�na zainicjowa� 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 "Nie mo�na utworzy� generatora us�ugi przypominania za pomoc� alarmu"
 
@@ -3580,36 +3780,36 @@ msgstr "Opis zawiera"
 msgid "Comment contains"
 msgstr "Komentarz zawiera"
 
-#: 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 "Niedopasowane"
 
-#: 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"
 
@@ -3619,67 +3819,159 @@ msgid ""
 msgstr ""
 "Nie mo�na utworzy� widoku kalendarza.  Zweryfikuj ustawienia ORBita i OAF-a."
 
-#: 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 "Kalendarz"
+
+#: calendar/gui/calendar-component.c:71
+msgid "Folder containing appointments and events"
+msgstr "Folder zawieraj�cy terminy i zdarzenia"
+
+#: calendar/gui/calendar-component.c:75
+#, fuzzy
+msgid "Public Calendar"
+msgstr "URL publicznego _kalendarza:"
+
+#: calendar/gui/calendar-component.c:76
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Folder zawieraj�cy terminy i zdarzenia"
+
+#: 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 "Zadania"
+
+#: calendar/gui/calendar-component.c:81
+msgid "Folder containing to-do items"
+msgstr "Folder zawieraj�cy pozycje do wykonania"
+
+#: calendar/gui/calendar-component.c:85
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Wydruku zada�"
+
+#: calendar/gui/calendar-component.c:86
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Folder zawieraj�cy pozycje do wykonania"
+
+#: calendar/gui/calendar-component.c:730
+msgid "New appointment"
+msgstr "Nowy termin"
+
+#: calendar/gui/calendar-component.c:730
+msgid "_Appointment"
+msgstr "_Termin"
+
+#: calendar/gui/calendar-component.c:731
+msgid "Create a new appointment"
+msgstr "Tworzy nowy termin"
+
+#: calendar/gui/calendar-component.c:735
+msgid "New meeting"
+msgstr "Nowe spotkanie"
+
+#: calendar/gui/calendar-component.c:735
+msgid "_Meeting"
+msgstr "_Spotkanie"
+
+#: calendar/gui/calendar-component.c:736
+msgid "Create a new meeting request"
+msgstr "Tworzy now� pro�b� o spotkanie"
+
+#: calendar/gui/calendar-component.c:740
+msgid "New task"
+msgstr "Nowe zadanie"
+
+#: calendar/gui/calendar-component.c:740
+msgid "_Task"
+msgstr "_Zadanie"
+
+#: calendar/gui/calendar-component.c:741
+msgid "Create a new task"
+msgstr "Tworzy nowe zadanie"
+
+#: calendar/gui/calendar-component.c:745
+msgid "New All Day Appointment"
+msgstr "Nowy termin ca�odniowy"
+
+#: calendar/gui/calendar-component.c:745
+msgid "All _Day Appointment"
+msgstr "Nowy t_ermin ca�odniowy"
+
+#: calendar/gui/calendar-component.c:746
+msgid "Create a new all-day appointment"
+msgstr "Tworzy nowy termin ca�odniowy"
+
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
+#: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "Prywatny"
 
-#: 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 "Tajny"
 
-#: 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 "Publiczny"
 
-#: 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 "W"
 
-#: 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 "Wolny"
 
-#: 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 "Zaj�ty"
 
-#: 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 "Przed rozpocz�ciem"
 
-#: 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 "Trwaj�ce"
 
-#: 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 "Zako�czone"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3690,336 +3982,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 "Brak"
 
-#: calendar/gui/calendar-model.c:1723
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Powtarzanie"
 
-#: calendar/gui/calendar-model.c:1725
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Przyporz�dkowany"
 
-#: 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 "Tak"
 
-#: 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 "Nie"
 
-#: calendar/gui/calendar-view-factory.c:148
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Widok dnia"
 
-#: calendar/gui/calendar-view-factory.c:151
+#: calendar/gui/calendar-view-factory.c:121
 msgid "Work Week View"
 msgstr "Widok tygodnia roboczego"
 
-#: calendar/gui/calendar-view-factory.c:154
+#: calendar/gui/calendar-view-factory.c:124
 msgid "Week View"
 msgstr "Widok tygodnia"
 
-#: calendar/gui/calendar-view-factory.c:157
+#: calendar/gui/calendar-view-factory.c:127
 msgid "Month View"
 msgstr "Widok miesi�ca"
 
-#: 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 "Kalendarz"
-
-#: calendar/gui/component-factory.c:72
-msgid "Folder containing appointments and events"
-msgstr "Folder zawieraj�cy terminy i zdarzenia"
-
-#: calendar/gui/component-factory.c:76
+#: calendar/gui/comp-editor-factory.c:456
 #, fuzzy
-msgid "Public Calendar"
-msgstr "URL publicznego _kalendarza:"
-
-#: calendar/gui/component-factory.c:77
-#, fuzzy
-msgid "Public folder containing appointments and events"
-msgstr "Folder zawieraj�cy terminy i zdarzenia"
-
-#: 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 "Zadania"
-
-#: calendar/gui/component-factory.c:82
-msgid "Folder containing to-do items"
-msgstr "Folder zawieraj�cy pozycje do wykonania"
+msgid "Error while opening the calendar"
+msgstr "B��d przy komunikacji z serwerem kalendarza"
 
-#: calendar/gui/component-factory.c:86
-#, fuzzy
-msgid "Public Tasks"
-msgstr "Wydruku zada�"
+#: calendar/gui/comp-editor-factory.c:467
+msgid "Method not supported when opening the calendar"
+msgstr ""
 
-#: calendar/gui/component-factory.c:87
+#: calendar/gui/comp-editor-factory.c:473
 #, fuzzy
-msgid "Public folder containing to-do items"
-msgstr "Folder zawieraj�cy pozycje do wykonania"
-
-#: calendar/gui/component-factory.c:750
-msgid "New appointment"
-msgstr "Nowy termin"
-
-#: calendar/gui/component-factory.c:750
-msgid "_Appointment"
-msgstr "_Termin"
-
-#: calendar/gui/component-factory.c:751
-msgid "Create a new appointment"
-msgstr "Tworzy nowy termin"
-
-#: calendar/gui/component-factory.c:755
-msgid "New meeting"
-msgstr "Nowe spotkanie"
-
-#: calendar/gui/component-factory.c:755
-msgid "_Meeting"
-msgstr "_Spotkanie"
-
-#: calendar/gui/component-factory.c:756
-msgid "Create a new meeting request"
-msgstr "Tworzy now� pro�b� o spotkanie"
-
-#: calendar/gui/component-factory.c:760
-msgid "New task"
-msgstr "Nowe zadanie"
-
-#: calendar/gui/component-factory.c:760
-msgid "_Task"
-msgstr "_Zadanie"
-
-#: calendar/gui/component-factory.c:761
-msgid "Create a new task"
-msgstr "Tworzy nowe zadanie"
-
-#: calendar/gui/component-factory.c:765
-msgid "New All Day Appointment"
-msgstr "Nowy termin ca�odniowy"
-
-#: calendar/gui/component-factory.c:765
-msgid "All _Day Appointment"
-msgstr "Nowy t_ermin ca�odniowy"
-
-#: calendar/gui/component-factory.c:766
-msgid "Create a new all-day appointment"
-msgstr "Tworzy nowy termin ca�odniowy"
+msgid "Permission denied to open the calendar"
+msgstr "Brak uprawnie�"
 
-#: calendar/gui/control-factory.c:123
+#: calendar/gui/control-factory.c:119
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Nie mo�na otworzy� folderu o URI \"%s\""
 
-#: calendar/gui/control-factory.c:167
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "URI wy�wietlany przez kalendarz"
 
-#: 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 "Ustawienia alarmu d�wi�kowego"
 
-#: calendar/gui/dialogs/alarm-options.c:368
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Ustawienia alarmu z komunikatem"
 
-#: calendar/gui/dialogs/alarm-options.c:377
-msgid "Mail Alarm Options"
+#: calendar/gui/dialogs/alarm-options.c:438
+#, fuzzy
+msgid "Email Alarm Options"
 msgstr "Ustawienia alarmu z wys�aniem listu"
 
-#: calendar/gui/dialogs/alarm-options.c:386
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Ustawienia alarmu z uruchomieniem programu"
 
-#: calendar/gui/dialogs/alarm-options.c:395
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Ustawienia nieznanego alarmu"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Alarm Repeat"
 msgstr "Powt�rzenia alarmu"
 
-#: 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 ""
-"To jest przypomnienie za pomoc� listu, lecz Evolution nie obs�uguje jeszcze "
-"tego typu przypomnie�, wi�c modyfikacja jego opcji nie b�dzie mo�liwa."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Wy�wietlany komunikat"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "Tre�� listu"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "Odtwarzany d�wi�k:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "Powtarzanie alarmu"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "Uruchamiany program:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "Wy�lij"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr "Argumenty programu:"
 
-#: 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 "dni"
 
-#: 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 "dodatkowych razy co"
 
-#: 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 "godzin"
 
-#: 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 "minut"
 
-#: calendar/gui/dialogs/alarm-page.c:319
-#, c-format
-msgid "%d days"
-msgstr "%d dni"
-
-#: calendar/gui/dialogs/alarm-page.c:322
-msgid "1 day"
-msgstr "1 dzie�"
-
-#: calendar/gui/dialogs/alarm-page.c:327
-#, c-format
-msgid "%d weeks"
-msgstr "%d tygodni"
-
-#: calendar/gui/dialogs/alarm-page.c:330
-msgid "1 week"
-msgstr "1 tydzie�"
-
-#: calendar/gui/dialogs/alarm-page.c:335
-#, c-format
-msgid "%d hours"
-msgstr "%d godzin"
-
-#: calendar/gui/dialogs/alarm-page.c:338
-msgid "1 hour"
-msgstr "1 godzina"
-
-#: calendar/gui/dialogs/alarm-page.c:343
-#, c-format
-msgid "%d minutes"
-msgstr "%d minut"
-
-#: calendar/gui/dialogs/alarm-page.c:346
-msgid "1 minute"
-msgstr "1 minuta"
-
-#: calendar/gui/dialogs/alarm-page.c:351
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekund"
-
-#: calendar/gui/dialogs/alarm-page.c:354
-msgid "1 second"
-msgstr "1 sekunda"
-
-#: calendar/gui/dialogs/alarm-page.c:383
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
-msgstr "Odtworzenie d�wi�ku"
-
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
-msgstr "Wy�wietlenie komunikatu"
-
-#: calendar/gui/dialogs/alarm-page.c:391
-msgid "Send an email"
-msgstr "Wys�anie listu"
-
-#: calendar/gui/dialogs/alarm-page.c:395
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
-msgstr "Uruchomienie programu"
-
-#: calendar/gui/dialogs/alarm-page.c:401
-msgid "Unknown action to be performed"
-msgstr "Wykonanie nieznanej czynno�ci"
-
-#: calendar/gui/dialogs/alarm-page.c:413
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "%s %s przed pocz�tkiem terminu"
-
-#: calendar/gui/dialogs/alarm-page.c:416
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "%s %s po pocz�tku terminu"
-
-#: calendar/gui/dialogs/alarm-page.c:421
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr "%s na pocz�tku terminu"
-
-#: calendar/gui/dialogs/alarm-page.c:430
-#, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "%s %s przed ko�cem terminu"
-
-#: calendar/gui/dialogs/alarm-page.c:433
-#, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "%s %s po ko�cu terminu"
-
-#: calendar/gui/dialogs/alarm-page.c:438
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr "%s na ko�cu terminu"
-
-#: calendar/gui/dialogs/alarm-page.c:462
-#, c-format
-msgid "%s at %s"
-msgstr "%s o %s"
-
-#: calendar/gui/dialogs/alarm-page.c:468
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr "%s z nieznanym typem warunku"
-
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -4030,46 +4141,63 @@ msgstr "Proste"
 msgid "Date/Time:"
 msgstr "Data/Czas:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "Wy�wietlenie komunikatu"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "Odtworzenie d�wi�ku"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Przypominanie"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "Uruchomienie programu"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "Wys�anie listu"
+
+#: 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 "Zestawienie:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_Opcje..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "po"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "przed"
 
-#: 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 "dni"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "koniec terminu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "godzin"
 
-#: 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 "minut"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "pocz�tek terminu"
 
@@ -4093,7 +4221,7 @@ msgstr "30 minut"
 msgid "60 minutes"
 msgstr "60 minut"
 
-#: 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 "Alarmy"
 
@@ -4118,7 +4246,8 @@ msgid "Days"
 msgstr "Dni"
 
 #: 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 "Pi�tek"
 
@@ -4131,7 +4260,8 @@ msgid "Minutes"
 msgstr "Minut"
 
 #: 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 "Poniedzia�ek"
 
@@ -4140,7 +4270,8 @@ msgid "S_un"
 msgstr "_Nie"
 
 #: 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 "Sobota"
 
@@ -4153,7 +4284,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Wy�wietlanie _numer�w tygodni w przegl�darce dat"
 
 #: 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 "Niedziela"
 
@@ -4170,7 +4302,8 @@ msgid "Task List"
 msgstr "Lista zada�"
 
 #: 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 "Czwartek"
 
@@ -4187,7 +4320,8 @@ msgid "Time format:"
 msgstr "Format czasu:"
 
 #: 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 "Wtorek"
 
@@ -4196,7 +4330,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 "�roda"
 
@@ -4238,7 +4373,7 @@ msgid "_Fri"
 msgstr "_Pi�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "Og�_lne"
 
@@ -4279,153 +4414,157 @@ msgstr "�_ro"
 msgid "before every appointment"
 msgstr "przed ka�dym terminem"
 
-#: 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 "Czy na pewno chcesz anulowa� i usun�� to spotkanie?"
 
-#: 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 "Czy na pewno chcesz anulowa� i usun�� to zadanie?"
 
-#: 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 "Czy na pewno chcesz anulowa� i usun�� ten wpis dziennika?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Zdarzenie zosta�o usuni�te."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Zadanie zosta�o usuni�te."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Wpis dziennika zosta� usuni�ty."
 
-#: 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  Wprowadzono zmiany. Anulowa� je wszystkie i zamkn�� edytor?"
 
-#: 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 Nie wprowadzono �adnych zmian, zamkn�� edytor?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Zdarzenie zosta�o zmienione."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Zadanie zosta�o zmienione."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Wpis dziennika zosta� zmieniony."
 
-#: 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  Wprowadzono zmiany. Anulowa� je wszystkie i uaktualni� edytor?"
 
-#: 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 Nie wprowadzono �adnych zmian, uaktualni� edytor?"
 
-#: 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 "Nieznany b��d: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr " do "
 
-#: 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 " (Zako�czone "
 
-#: 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 "Zako�czone"
 
-#: 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 " (Nale�ne "
 
-#: 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 "Nale�ne "
 
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:328
 msgid "Could not update invalid object"
 msgstr "Nie mo�na uaktualni� niepoprawnego obiektu"
 
-#: calendar/gui/dialogs/comp-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr "Nie odnaleziono obiektu, bez aktualizacji"
 
-#: 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 "Brak uprawnie� do aktualizacji tego obiektu"
 
-#: calendar/gui/dialogs/comp-editor.c:352
+#: calendar/gui/dialogs/comp-editor.c:337
 msgid "Could not update object"
 msgstr "Nie mo�na uaktualni� obiektu"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Zmodyfikuj termin"
 
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "Zadanie - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Wpis dziennika - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "Brak zestawienia"
 
-#: 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 "Zapisz jako..."
 
-#: 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 "Nie mo�na uzyska� bie��cej wersji!"
 
@@ -4483,88 +4622,101 @@ msgstr "Oddelegowanie do:"
 msgid "Enter Delegate"
 msgstr "Oddelegowanie"
 
-#: 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 "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Przypominanie"
 
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Powtarzalno��"
 
-#: 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 "Planowanie"
 
-#: 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 "Spotkanie"
 
-#: 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 rozpocz�cia"
+
+#: 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 "Cza_s rozpocz�cia:"
+
+#: 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 "Wydarzenie ca�odni_owe"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "Z_aj�ty"
 
-#: 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 "Klasyfikacja"
 
-#: 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 "Taj_ny"
 
-#: 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 i czas"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "_Wolny"
 
 # FIXME (cyba): skr�t klawiszowy
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr "P_o�o�enie:"
 
-#: 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 "P_rywatny"
 
-#: 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_bliczny"
 
-#: 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 "Forma wy�wietlania czasu"
 
-#: 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 "Z_estawienie:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Kontakty..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "_Czas zako�czenia:"
@@ -4573,19 +4725,23 @@ msgstr "_Czas zako�czenia:"
 msgid "_Start time:"
 msgstr "Cza_s rozpocz�cia:"
 
-#: 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 "Wymagany jest organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr "Wymagany jest co najmniej jeden uczestnik."
 
-#: calendar/gui/dialogs/meeting-page.c:594
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr "Ta osoba ju� uczestniczy w spotkaniu!"
 
-#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr "_Oddeleguj do..."
 
@@ -4625,16 +4781,11 @@ msgid "Member"
 msgstr "Cz�onek"
 
 #: 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 "Rola"
-
 #: 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
@@ -4642,13 +4793,6 @@ msgstr "Rola"
 msgid "Status"
 msgstr "Stan"
 
-#: 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 "Typ"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4659,100 +4803,84 @@ msgid "_Change Organizer"
 msgstr "_Zmie� organizatora"
 
 #: 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 "_Zapro� innych..."
 
-#: 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
+#, fuzzy
+msgid "This and Future Instances"
+msgstr "Wyspy Wallis i 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 ""
 "Termin zawiera powt�rzenia, kt�rych nie mo�na zmienia� za pomoc� 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 "w"
 
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:977
 msgid "first"
 msgstr "pierwszy"
 
 # FIXME (drugi / sekunda)
-#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr "drugi"
 
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "third"
 msgstr "trzeci"
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "fourth"
 msgstr "czwarty"
 
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "last"
 msgstr "ostatni"
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1004
 msgid "Other Date"
 msgstr "Inna data"
 
-#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "dzie�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1270
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr "w"
 
-#: calendar/gui/dialogs/recurrence-page.c:1455
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr "powt�rzeniami"
 
@@ -4816,22 +4944,27 @@ msgstr "tygodni"
 msgid "year(s)"
 msgstr "lat"
 
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has been created. Send it?"
 msgstr "Zosta�a utworzona informacja o spotkaniu. Czy wys�a� j�?"
 
-#: 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 "Informacje o spotkaniu zosta�y zmienione. Czy wys�a� aktualn� wersj�?"
 
-#: 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 "Zosta�a utworzona informacja o przypisaniu zadania. Czy wys�a� j�?"
 
-#: 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 "Informacje o zadaniu zosta�y zmienione. Czy wys�a� aktualn� wersj�?"
 
+#: calendar/gui/dialogs/task-details-page.c:397
+#, fuzzy
+msgid "Completed date is wrong"
+msgstr "Zako�czone"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -4842,42 +4975,40 @@ msgstr "% zako�czenia"
 msgid "Date Completed:"
 msgstr "Data zako�czenia:"
 
-#: 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 "Wymaga dzia�ania"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Post�p"
 
-#: 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 "P_riorytet:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Stan:"
 
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "Proste"
 
-#: 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 "Przyporz�dkowanie"
 
-#: 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 "Opis:"
 
@@ -4885,135 +5016,232 @@ msgstr "Opis:"
 msgid "Sta_rt Date:"
 msgstr "Cza_s rozpocz�cia:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Kontakty..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Czas zako�czenia:"
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d dni"
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "1 dzie�"
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d tygodni"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 tydzie�"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d godzin"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 godzina"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d minut"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 minuta"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekund"
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "1 sekunda"
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "Wys�anie listu"
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr "Wykonanie nieznanej czynno�ci"
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s przed pocz�tkiem terminu"
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s po pocz�tku terminu"
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s na pocz�tku terminu"
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s przed ko�cem terminu"
+
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s po ko�cu terminu"
+
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s na ko�cu terminu"
+
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr "%s o %s"
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s z nieznanym typem warunku"
+
+#: 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 "Usuwanie zaznaczonych obiekt�w"
 
-#: 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 "_Otw�rz"
 
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:951
 msgid "_Save as..."
 msgstr "Z_apisz jako..."
 
-#: 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 "Wy_drukuj..."
 
-#: 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 "_Wytnij"
 
-#: 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 "S_kopiuj"
 
-#: 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 "Wk_lej"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:962
 msgid "_Assign Task"
 msgstr "P_rzypisz zadanie"
 
-#: calendar/gui/e-calendar-table.c:1000
+#: calendar/gui/e-calendar-table.c:963
 msgid "_Forward as iCalendar"
 msgstr "Prze�lij w formacie i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "_Oznacz jako zako�czone"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:965
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Oznacz zadania jako zako�czone"
 
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "_Usu� zaznaczone zadania"
 
-#: 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 "Aktualizowanie obiekt�w"
 
-#: 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 "Kliknij, aby doda� zadanie"
@@ -5022,8 +5250,8 @@ msgstr "Kliknij, aby doda� zadanie"
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: 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 "Zako�czone"
 
@@ -5052,8 +5280,8 @@ msgid "Start Date"
 msgstr "Data rozpocz�cia"
 
 #: 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 "Zestawienie"
 
@@ -5061,19 +5289,15 @@ msgstr "Zestawienie"
 msgid "Task sort"
 msgstr "Porz�dek zada�"
 
-#: 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 %H:%M:%S"
 
@@ -5088,135 +5312,214 @@ 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-minutowe przedzia�y czasu"
 
 #. 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 "Nowy _termin"
 
-#: 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 "Nowe zdarzenie _ca�odniowe"
 
-#: 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 "Nowe spotkanie"
 
-#: 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 "Nowe zadanie"
 
-#: 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 "Wydrukuj..."
 
-#: 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 "Przejd� do d_zisiaj"
 
-#: 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 "_Przejd� do daty..."
 
-#: 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 "_Opublikuj informacj� o zaj�to�ci"
 
-#: 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 "Ustawienia"
 
-#: 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 "Z_apisz jako..."
 
-#: 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 "Zap_lanuj spotkanie..."
 
-#: 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 "Prze�lij w formacie i_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
 msgid "Make this Occurrence _Movable"
 msgstr "Przekszta�� to wyst�pienie w p_rzesuwalne"
 
-#: 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 "Usu� to _wyst�pienie"
 
-#: 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 "Usu� w_szystkie wyst�pienia"
 
-#: calendar/gui/e-itip-control.c:615
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Yes. (Complex Recurrence)"
+msgstr "P_rosta powtarzalno��"
+
+#: calendar/gui/e-itip-control.c:716
+#, fuzzy
+msgid "Every day"
+msgstr "Co"
+
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "Every %d days"
+msgstr "%d dni"
+
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Every week"
+msgstr "Co"
+
+#: calendar/gui/e-itip-control.c:726
+#, fuzzy, c-format
+msgid "Every %d weeks"
+msgstr "%d tygodni"
+
+#: 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 tygodni"
+
+#: calendar/gui/e-itip-control.c:739
+#, fuzzy
+msgid " and "
+msgstr "Piasek"
+
+#: 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 "Jeden _miesi�c"
+
+#: 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 "Co"
+
+#: 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>Pocz�tek:</b> "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:831
 msgid "<b>Ends:</b> "
 msgstr "<b>Koniec:<b>"
 
-#: 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
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "<b>Opis:</b> %s"
 
-#: 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 "Informacje iKalendarza"
 
 #. Title
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr "B��d iKalendarza"
 
-#: 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 "Nieznana osoba"
 
 #. 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."
@@ -5224,342 +5527,343 @@ msgstr ""
 "<br> Przejrzyj wy�wietlone informacje, a nast�pnie wybierz czynno�� z "
 "poni�szego menu."
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Brak</i>"
 
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "Po�o�enie:"
 
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr "Stan:"
 
-#: 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 "Zaakceptowane"
 
-#: 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 "Pr�bna akceptacja"
 
-#: 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 "Odrzucone"
 
-#: 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 "Nieznany"
 
-#: 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 "Wyb�r czynno�ci:"
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Aktualizacja"
 
-#: 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 "Akceptacja"
 
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Pr�bna akceptacja"
 
-#: calendar/gui/e-itip-control.c:957
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Odrzucenie"
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Wys�anie informacji o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Pobranie stanu wezwanej osoby"
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Wys�anie naj�wie�szej informacji"
 
-#: 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 "Anuluj"
 
-#: 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 "Informacja o spotkaniu opublikowana przez <b>%s</b>."
 
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Informacje o spotkaniu"
 
-#: 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> zwraca si� o twoj� obecno�� na spotkaniu."
 
-#: 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> zwraca si� o twoj� obecno�� na spotkaniu."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Propozycja spotkania"
 
-#: 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> chce dodania do istniej�cego spotkania."
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Aktualizacja spotkania"
 
-#: 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> chce otrzyma� naj�wie�sze informacje o spotkaniu."
 
-#: calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "Zwr�cenie si� o aktualizacj� spotkania"
 
-#: 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> odpowiedzia� na zwr�cenie si� o spotkanie."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Odpowied� na spotkanie"
 
-#: 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> anulowa� spotkanie."
 
-#: calendar/gui/e-itip-control.c:1136
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Anulowanie spotkania"
 
-#: 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> wys�a� niezrozumia�� wiadomo��."
 
-#: calendar/gui/e-itip-control.c:1144
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Niepoprawna wiadomo�� o spotkaniu"
 
-#: 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 "Informacja o zadaniu opublikowana przez <b>%s</b>."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Informacje o zadaniu"
 
-#: 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> zwraca si� o wykonanie przez ciebie zadania."
 
-#: 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> zwraca si� o wykonanie przez ciebie zadania."
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Propozycja zadania"
 
-#: 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> chce dodania do istniej�cego zadania."
 
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Aktualizacja zadania"
 
-#: 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> chce otrzyma�  naj�wie�sze informacje o zadaniu."
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Zwr�cenie si� o aktualizacj� zadania"
 
-#: 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> odpowiedzia� na przypisanie zadania."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Odpowied� na zadanie"
 
-#: 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> anulowa� zadanie."
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Anulowanie zadania"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Niepoprawna wiadomo�� o zadaniu"
 
-#: 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 "Informacja o zaj�to�ci opublikowana przez <b>%s</b>."
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Informacja o zaj�to�ci"
 
-#: 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> zwraca si� o informacj� o zaj�to�ci."
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Zwr�cenie si� o informacj� o zaj�to�ci"
 
-#: 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> odpowiedzia� na zwr�cenie si� o informacj� o zaj�to�ci."
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Odpowied� z informacj� o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Niepoprawna wiadomo�� o zaj�to�ci"
 
-#: 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 "Forma listu jest niepoprawna"
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "Lista zawiera tylko nieobs�ugiwane ��dania."
 
-#: 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 "Za��cznik nie zawiera poprawnego komunikatu kalendarza"
 
-#: calendar/gui/e-itip-control.c:1441
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "Za��cznik nie zawiera daj�cych si� wy�wietli� element�w kalendarza"
 
-#: 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 "Nie mo�na odnale�� obiektu\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 "Brak uprawnie� do aktualizacji tego obiektu"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Aktualizacja zako�czona\n"
 
-#: calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "Nie mo�na uaktualni� pliku kalendarza!\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 ""
 "Nie mo�na uaktualni� stanu uczestnika, poniewa� element ju� nie istnieje"
 
-#: calendar/gui/e-itip-control.c:1727
+#: calendar/gui/e-itip-control.c:1972
 #, fuzzy
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Odpowied� nie pochodzi odaktualnego uczestnika. Czy doda� nadawc� jako "
 "uczestnika?"
 
-#: 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 ""
 "Nie mo�na uaktualni� stanu uczestnika, poniewa� jest on nieprawid�owy!\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 "Brak uprawnie� do aktualizacji tego obiektu"
 
-#: calendar/gui/e-itip-control.c:1766
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Stan uczestnika zosta� uaktualniony\n"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "Nie mo�na uaktualni� stanu uczestnika!\n"
 
-#: calendar/gui/e-itip-control.c:1804
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Usuni�cie zako�czone"
 
-#: 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 "Element zosta� wys�any!\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 "Nie mo�na wys�a� elementu!\n"
 
-#: calendar/gui/e-itip-control.c:1961
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr "Wyb�r folderu kalendarza"
 
-#: calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr "Wyb�r folderu zada�"
 
@@ -5600,220 +5904,224 @@ msgstr "data-pocz�tkowa"
 msgid "date-start"
 msgstr "data-ko�cowa"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr "Osoby przewodnicz�ce"
 
-#: 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 "Wymagani uczestnicy"
 
-#: calendar/gui/e-meeting-model.c:86
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr "Opcjonalni uczestnicy"
 
-#: calendar/gui/e-meeting-model.c:87
+#: calendar/gui/e-meeting-model.c:83
 msgid "Resources"
 msgstr "Zasoby"
 
-#: 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 "Osoba"
 
-#: 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 "Zas�b"
 
-#: 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 "Pomieszczenie"
 
-#: 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 "Przewodniczenie"
 
-#: 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 "Wymagany uczestnik"
 
-#: 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 "Opcjonalny uczestnik"
 
-#: 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 "Nie uczestnik"
 
-#: 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 "Wymaga dzia�ania"
+
+#: 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 "Pr�bnie zaakceptowane"
 
-#: 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 "Oddelegowane"
 
-#: 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 "W trakcie"
 
 #. 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 "Poza biurem"
 
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Brak informacji"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "Opcj_e"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Wy�wietlanie _tylko godzin roboczych"
 
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Wy�wietlanie w p_owi�kszeniu"
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "_Uaktualnij informacj� o zaj�to�ci"
 
-#: 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 "_Automatyczny wyb�r"
 
-#: 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 "_Wszyscy ludzie i zasoby"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Wszyscy _ludzie i jeden zas�b"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "Wy_magani ludzie"
 
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Wymagani ludzie i j_eden zas�b"
 
-#: calendar/gui/e-meeting-time-sel.c:654
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Czas p_ocz�tku spotkania:"
 
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Czas _ko�ca spotkania:"
 
-#: 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 "Otwieranie zada� z %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 "Nie mo�na wczyta� zadania w \"%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 "Metoda wymagana do odczytu \"%s\" nie jest obs�ugiwana"
 
-#: 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 "Nie mo�na otworzy� folderu w \"%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 "B��d przy uruchamianiu %s"
 
-#: calendar/gui/e-tasks.c:540
+#: calendar/gui/e-tasks.c:554
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data zako�czenia"
 
-#: calendar/gui/e-tasks.c:563
+#: calendar/gui/e-tasks.c:577
 msgid "Deleting selected objects..."
 msgstr "Usuwanie zaznaczonych obiekt�w..."
 
-#: calendar/gui/e-tasks.c:656
+#: calendar/gui/e-tasks.c:672
 msgid "Expunging"
 msgstr "Oczyszczanie"
 
-#: calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Nowy _termin..."
 
-#: calendar/gui/gnome-cal.c:1530
+#: calendar/gui/gnome-cal.c:1503
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nie mo�na otworzy� folderu w \"%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 "Metoda wymagana do otwarcia \"%s\" nie jest obs�ugiwana"
 
-#. 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 o %s"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5821,7 +6129,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"
@@ -5829,7 +6137,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 "Otwieranie kalendarza z %s"
@@ -5894,315 +6202,174 @@ msgstr "Pa�dziernik"
 msgid "September"
 msgstr "Wrzesie�"
 
-#: 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 "Nale�y poda� organizatora."
 
-#: calendar/gui/itip-utils.c:383
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "Wymagany jest co najmniej jeden uczestnik"
 
-#: 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 "Informacja o spotkaniu"
 
-#: 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 "Informacja o zadaniu"
 
-#: 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 "Informacja dziennika"
 
-#: 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 "Informacja o zaj�to�ci"
 
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Informacja kalendarza"
 
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr "Aktualizacja"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr "Od�wie�"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr "Kontrpropozycja"
 
-#: calendar/gui/itip-utils.c:586
+#: calendar/gui/itip-utils.c:513
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informacja o zaj�to�ci"
 
-#: calendar/gui/itip-utils.c:598
+#: calendar/gui/itip-utils.c:525
 #, fuzzy
 msgid "iCalendar information"
 msgstr "Informacja kalendarza"
 
-#: calendar/gui/itip-utils.c:756
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Musisz nale�e� do uczestnik�w zdarzenia."
 
-#: calendar/gui/main.c:70
-msgid "Could not activate Bonobo"
-msgstr "Nie mo�na uaktywni� Bonobo"
-
-#: calendar/gui/main.c:99
-msgid "Could not create the component editor factory"
-msgstr "Nie mo�na utworzy� generatora komponentu edytora"
-
-#: 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 "Ni"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "Po"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "Wt"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "�r"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "Cz"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "Pt"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "So"
 
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Wybrany dzie� dzie� (%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 "Wybrany tydzie� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr "Wybrany miesi�c (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr "Wybrany rok (%Y)"
 
-#: calendar/gui/print.c:2249
+#: calendar/gui/print.c:2267
 msgid "Task"
 msgstr "Zadanie"
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr "Stan: %s"
 
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorytet: %s"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2358
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procent zako�czenia: %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 "Kategorie: %s"
 
-#: calendar/gui/print.c:2375
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr "Kontakty: "
 
-#: calendar/gui/print.c:2430
-msgid "Print Calendar"
-msgstr "Wydrukuj kalendarz"
-
-#: 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 "Podgl�d wydruku"
 
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "Wydruk elementu"
 
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "Ustawienia wydruku"
 
-#: calendar/gui/tasks-control-factory.c:75
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Nie mo�na utworzy� widoku zada�.  Zweryfikuj ustawienia ORBita i OAF-a."
-
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr "URI folderu zada�, kt�ry nale�y wy�wietli�"
 
-#: 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 "
@@ -6216,90 +6383,51 @@ msgstr ""
 "\n"
 "Czy rzeczywi�cie usun�� te listy?"
 
-#: 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 "Bez pytania o to w przysz�o�ci."
 
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:615
 msgid "Print Tasks"
 msgstr "Wydruku zada�"
 
-#: 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 ""
-"Zadania umieszczone w folderze kalendarza zosta�y przez Evolution "
-"automatycznie przeniesione do nowego folderu zada�."
-
-#: 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 ""
-"Nast�pi�a pr�ba przeniesienia przez Evolution zada� umieszczonych w folderze "
-"kalendarza do nowego folderu zada�.\n"
-"Niekt�re z zada� nie mog�y zosta� przeniesione, wi�c proces mo�e si� w "
-"przysz�o�ci powt�rzy�."
-
-#: 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 ""
-"Nie mo�na otworzy� `%s'; �aden z element�w folderu kalendarza nie zosta� "
-"przeniesiony do folderu zada�."
-
-#: 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 ""
-"Metoda wymagana do odczytu \"%s\" nie jest obs�ugiwana. Nie przeniesiono "
-"�adnych element�w z folderu kalendarza do folderu zada�."
-
-#: 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 "NPW�CPS"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "Generator importu plik�w iCalendar do Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Przegl�darka kalendarza iTip/iMip"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "Importuje pliki iCalendar do Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Przegl�darka kalendarza iTip/iMip"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "Importuje pliki vCalendar do Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Przegl�darka kalendarza iTip/iMip"
 
-#: calendar/importers/icalendar-importer.c:168
-#, fuzzy, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr ""
-"Nie mo�na pobra� listu: %s z folderu %s\n"
-"  %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Komunikat kalendarza"
 
-#: calendar/importers/icalendar-importer.c:180
-#, fuzzy, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "Nie mo�na nawi�za� po��czenia z miejscem przechowywania: %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 "Przypomnienie!!"
 
-#: calendar/importers/icalendar-importer.c:697
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "Zdarzenia kalendarza"
 
-#: 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?"
@@ -6307,10 +6435,14 @@ msgstr ""
 "Odnaleziono pliki kalendarza GNOME.\n"
 "Czy chcesz zaimportowa� je do Evolution?"
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr "Kalendarz 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 wymaga 0 argument�w"
@@ -7964,30 +8096,40 @@ msgstr "Pacific/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: camel/camel-cipher-context.c:170
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje podpisywania"
 
-#: camel/camel-cipher-context.c:210
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje weryfikacji"
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje kodowania"
 
-#: camel/camel-cipher-context.c:296
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje rozkodowywania"
 
-#: camel/camel-data-cache.c:169
+#: camel/camel-cipher-context.c:342
+#, fuzzy
+msgid "You may not import keys with this cipher"
+msgstr "Ten rodzaj szyfrowania nie obs�uguje rozkodowywania"
+
+#: camel/camel-cipher-context.c:374
+#, fuzzy
+msgid "You may not export keys with this cipher"
+msgstr "Ten rodzaj szyfrowania nie obs�uguje rozkodowywania"
+
+#: camel/camel-data-cache.c:133
 #, fuzzy
 msgid "Unable to create cache path"
 msgstr ""
 "Nie mo�na utworzy� pliku wyj�ciowego: %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 "Nie mo�na otworzy� katalogu cache: %s"
@@ -8027,84 +8169,91 @@ msgstr "Przygotowywanie folderu \"%s\" do pracy bez pod��czenia"
 msgid "You must be working online to complete this operation"
 msgstr "Do zako�czenia tej operacji konieczne jest po��czenie z sieci�"
 
-#: 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
+#, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Nie mo�na utworzy� potoku do \"%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 "Nie mo�na utworzy� procesu potomnego \"%s\": %s"
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "Nie mo�na utworzy� katalogu %s: %s"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Synchronizowanie folder�w"
 
-#: 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 "B��d przy analizie sk�adni filtru: %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 "B��d przy wykonywaniu filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Nie mo�na otworzy� folderu kolejki"
 
-#: camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Nie mo�na przetworzy� folderu kolejki"
 
-#: camel/camel-filter-driver.c:966
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Pobieranie %d. listu (%d%%)"
 
-#: camel/camel-filter-driver.c:970
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Nie mo�na otworzy� listu"
 
-#: 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 "Niepowodzenie przy %d. li�cie"
 
-#: 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 "Synchronizowanie folderu"
 
-#: camel/camel-filter-driver.c:1058
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Pobieranie %d. listu z %d"
 
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Niepowodzenie przy li�cie %d z %d"
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 msgid "Failed to retrieve message"
 msgstr "Nie mo�na pobra� listu"
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 msgid "Invalid arguments to (system-flag)"
 msgstr "Niepoprawne argumenty funkcji (system-flag)"
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 msgid "Invalid arguments to (user-tag)"
 msgstr "Niepoprawne argumenty funkcji (user-tag)"
 
-#: camel/camel-filter-search.c:514
-#, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Nie mo�na utworzy� potoku do \"%s\": %s"
-
-#: camel/camel-filter-search.c:550
-#, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Nie mo�na utworzy� procesu potomnego \"%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 "B��d przy wykonywaniu wyszukiwania przez filtr: %s: %s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8113,7 +8262,7 @@ msgstr ""
 "B��d w wyra�eniu wyszukiwania: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8122,11 +8271,11 @@ msgstr ""
 "B��d przy wykonywaniu wyra�enia wyszukiwania %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) wymaga pojedynczego wyniku logicznego"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Wykonywanie zapytania na nieznanym nag��wku: %s"
@@ -8154,7 +8303,7 @@ msgstr "Przenoszenie list�w"
 msgid "Copying messages"
 msgstr "Kopiowanie list�w"
 
-#: camel/camel-gpg-context.c:697
+#: camel/camel-gpg-context.c:724
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8162,70 +8311,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 "Anulowano."
 
-#: 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 "Nieoczekiwana odpowied� od programu GnuPG: %s"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:814
 msgid "No data provided"
 msgstr "Nie podano danych"
 
-#: camel/camel-gpg-context.c:830
+#: camel/camel-gpg-context.c:857
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nie mo�na zaszyfrowa� listu: nie podano odbiorc�w"
 
-#: 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 "Nie mo�na zapisa� listu %s w cache: %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 "Nie mo�na zapisa� listu %s w cache: %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
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nie mo�na uruchomi� gpg: %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 "Nie mo�na uruchomi� gpg."
 
-#: 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 ""
@@ -8253,25 +8403,24 @@ msgstr ""
 msgid "Could not lock '%s'"
 msgstr "Nie mo�na zablokowa� \"%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 "Nie mo�na utworzy� pliku blokady dla %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 ""
 "Up�yn�� czas przeznaczony na uzyskanie blokady pliku %s. Spr�buj ponownie "
 "p�niej."
 
-#: camel/camel-lock.c:206
+#: camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Uzyskanie blokady za pomoc� fcntl(2) nie powiod�o si�: %s"
 
-#: camel/camel-lock.c:268
+#: camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Uzyskanie blokady za pomoc� flock(2) nie powiod�o si�: %s"
@@ -8281,51 +8430,51 @@ msgstr "Uzyskanie blokady za pomoc� flock(2) nie powiod�o si�: %s"
 msgid "Could not check mail file %s: %s"
 msgstr "Nie mo�na sprawdzi� pliku z listami %s: %s"
 
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nie mo�na otworzy� pliku z listami %s: %s"
 
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nie mo�na otworzy� tymczasowego pliku z listami %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 "Zapisanie listu w pliku tymczasowym %s nie powiod�o si�: %s"
 
-#: camel/camel-movemail.c:188
+#: camel/camel-movemail.c:187
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Utworzenie potoku nie powiod�o si�: %s"
 
-#: camel/camel-movemail.c:200
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nie mo�na utworzy� procesu: %s"
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:237
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "B��d programu przesy�aj�cego poczt�: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 msgid "(Unknown error)"
 msgstr "(Nieznany b��d)"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "B��d przy odczycie pliku z listem: %s"
 
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "B��d przy zapisie do tymczasowego pliku z listami: %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 "B��d przy kopiowaniu tymczasowego pliku z listami: %s"
@@ -8342,25 +8491,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 "To jest cz�� listu podpisana cyfrowo"
 
-#: camel/camel-multipart-signed.c:678
+#: camel/camel-multipart-signed.c:682
 msgid "parse error"
 msgstr "b��d sk�adniowy"
 
-#: 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 "Nie mo�na za�adowa� %s: System nie obs�uguje �adowania modu��w."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:141
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nie mo�na wczyta� %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 "Nie mo�na wczyta� %s: Brak kodu inicjuj�cego w module."
@@ -8417,11 +8566,11 @@ msgstr ""
 "Przy tej opcji po��czenie z serwerem nast�pi przy u�yciu has�a CRAM-MD5, o "
 "ile b�dzie ono obs�ugiwane przez serwer."
 
-#: 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."
@@ -8429,43 +8578,121 @@ msgstr ""
 "Przy tej opcji po��czenie z serwerem nast�pi przy u�yciu has�a DIGEST-MD5, o "
 "ile b�dzie ono obs�ugiwane przez serwer."
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Zbyt d�ugie wezwanie serwera (>2048 oktet�w)\n"
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr "Niepoprawne wezwanie serwera\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 ""
 "Wezwanie serwera zawiera�o niepoprawny token \"Quality of Protection"
 "\" (jako�� ochrony)\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 "Odpowied� serwera nie zawiera danych o autoryzacji\n"
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Odpowied� serwera zawiera niekompletne dane o autoryzacji\n"
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr "Niepotwierdzona odpowied� serwera\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 ""
+"Opcja ta spowoduje ��czenie z serwerem przy wykorzystaniu uwierzytelniania "
+"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 "Niepoprawna odpowied� serwera na uwierzytelnienie."
+
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "Nie mo�na utworzy� potoku do \"%s\": %s"
+
+#: camel/camel-sasl-gssapi.c:299
+#, fuzzy
+msgid "Unsupported security layer."
+msgstr "Nieobs�ugiwany typ"
+
+#: 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 ""
 "Opcja ta spowoduje ��czenie z serwerem przy wykorzystaniu uwierzytelniania "
 "Kerberos 4."
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -8474,11 +8701,6 @@ msgstr ""
 "Nie mo�na pobra� biletu Kerberosa:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1059
-msgid "Bad authentication response from server."
-msgstr "Niepoprawna odpowied� serwera na uwierzytelnienie."
-
 #: camel/camel-sasl-login.c:32
 #, fuzzy
 msgid "Login"
@@ -8532,7 +8754,7 @@ msgstr "Uwierzytelnianie POP przed SMTP z u�yciem nieznanego transportu"
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP przed SMTP przy u�yciu �r�d�a nie b�d�cego typu pop"
 
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Nie powiod�a si� kompilacja wyra�enia regularnego: %s: %s"
@@ -8552,37 +8774,37 @@ msgstr "W URL-u \"%s\" wymagana jest nazwa komputera"
 msgid "URL '%s' needs a path component"
 msgstr "W URL-u \"%s\" wymagana jest �cie�ka"
 
-#: camel/camel-service.c:743
+#: camel/camel-service.c:741
 #, c-format
 msgid "Resolving: %s"
 msgstr "Wyszukiwanie: %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 "Nie mo�na ustali� adresu odpowiadaj�cego nazwie: %s"
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 "Nie mo�na ustali� adresu odpowiadaj�cego nazwie: %s: nazwa nie istnieje"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 "Nie mo�na ustali� adresu odpowiadaj�cego nazwie: %s: przyczyna nieznana"
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 msgid "Resolving address"
 msgstr "Wyszukiwanie adresu"
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 msgid "Host lookup failed: host not found"
 msgstr "Nie mo�na ustali� adresu odpowiadaj�cego nazwie: nazwa nie istnieje"
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 msgid "Host lookup failed: unknown reason"
 msgstr "Nie mo�na ustali� adresu odpowiadaj�cego nazwie: przyczyna nieznana"
 
@@ -8594,12 +8816,12 @@ msgstr "Dostarczyciel poczty dla folder�w wirtualnych"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Do odczytu poczty jako zapytania na innym zbiorze folder�w"
 
-#: 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 "Brak dostarczyciela dla protoko�u \"%s\""
 
-#: camel/camel-session.c:545
+#: camel/camel-session.c:548
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8608,178 +8830,178 @@ msgstr ""
 "Nie mo�na utworzy� katalogu %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 "Podaj swoje has�o dla %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 ""
 "Wybierz przydomek zwi�zany z certyfikatem, kt�rego chcesz u�y� do podpisu."
 
-#: camel/camel-smime-context.c:209
+#: camel/camel-smime-context.c:207
 #, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr "Certyfikat podpisu dla \"%s\" nie istnieje."
 
-#: camel/camel-smime-context.c:249
+#: camel/camel-smime-context.c:247
 #, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "Certyfikat szyfruj�cy dla \"%s\" nie istnieje."
 
-#: 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 "Nie mo�na odnale�� certyfikatu dla \"%s\"."
 
-#: camel/camel-smime-context.c:556
+#: camel/camel-smime-context.c:554
 msgid "Failed to find a common bulk algorithm."
 msgstr "Nie mo�na odnale�� wsp�lnego algorytmu gromadz�cego."
 
-#: camel/camel-smime-context.c:810
+#: camel/camel-smime-context.c:808
 msgid "Failed to decode message."
 msgstr "Nie mo�na odkodowa� listu."
 
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
 msgid "Failed to verify certificates."
 msgstr "Nie mo�na zweryfikowa� certyfikatu."
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Nie mo�na pobra� folderu: Niepoprawna operacja na tym miejscu przechowywania"
 
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Nie mo�na utworzy� folderu: Niepoprawna operacja na tym miejscu "
 "przechowywania"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 #, fuzzy
 msgid "Unable to get issuer's certificate"
 msgstr "Nie mo�na zweryfikowa� certyfikatu."
 
-#: 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 "Nie mo�na rozszyfrowa� podpisu certyfikatu"
 
-#: 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 "Nie mo�na zapisa� pliku z podpisem."
 
-#: 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 "Certyfikat nie jest jeszcze wa�ny"
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr "Certyfikat uleg� przedawnieniu"
 
-#: 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 "B��d przy odczycie %s"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 msgid "Out of memory"
 msgstr "Brak pami�ci"
 
-#: 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 "Nie mo�na zweryfikowa� certyfikatu."
 
-#: 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 _certyfikatu:"
 
-#: 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 "Nieznana przyczyna"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 #, fuzzy
 msgid "Certificate untrusted"
 msgstr "ID _certyfikatu:"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr "Certyfikat odrzucony"
 
-#: 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"
@@ -8788,15 +9010,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"
@@ -8814,7 +9036,7 @@ msgstr ""
 "Czy pomimo tego chcesz go zaakceptowa�?"
 
 #. 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"
@@ -8829,35 +9051,35 @@ msgstr ""
 "\n"
 "Czy pomimo tego chcesz go zaakceptowa�?"
 
-#: 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 "Certyfikat uleg� przedawnieniu"
 
-#: 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 "Certyfikat uleg� przedawnieniu"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nie mo�na rozpozna� URL-a \"%s\""
@@ -8872,39 +9094,39 @@ msgstr "B��d przy uruchamianiu %s"
 msgid "No such message %s in %s"
 msgstr "Brak listu %s w %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 "Nie mo�na skopiowa� lub przenie�� list�w do folderu wirtualnego"
 
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nie mo�na usun�� folderu: %s: Niepoprawna operacja"
 
-#: camel/camel-vee-store.c:319
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nie mo�na usun�� folderu: %s: Folder nie istnieje"
 
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nie mo�na zmieni� nazwy folderu: %s: Niepoprawna operacja"
 
-#: camel/camel-vee-store.c:340
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nie mo�na zmieni� nazwy folderu %s: Folder nie istnieje"
 
 #: 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 "Operacja anulowana"
 
 #: 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 "Serwer nieoczekiwanie przerwa� po��czenie: %s"
@@ -8927,52 +9149,52 @@ msgstr "Nieoczekiwana odpowied� od serwera IMAP: %s"
 msgid "IMAP command failed: %s"
 msgstr "Nie powiod�o si� polecenie 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 "Odpowied� serwera zako�czy�a si� zbyt wcze�nie."
 
-#: 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 "Odpowied� serwera IMAP nie zawiera informacji %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 "Nieoczekiwana odpowied� OK od serwera 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 "Nie mo�na utworzy� katalogu %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 "Nie mo�na wczyta� zestawienia dla %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 "Folder na serwerze zosta� usuni�ty i utworzony ponownie."
 
 #. 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 "Wyszukiwanie zmodyfikowanych list�w"
 
-#: 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 "Nie mo�na pobra� listu: %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"
@@ -8981,24 +9203,24 @@ msgstr ""
 "Nie mo�na pobra� listu: %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 "Nie ma takiego listu"
 
-#: 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 "Ten list jest obecnie niedost�pny"
 
-#: 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 "Pobieranie informacji podsumowuj�cych nowe listy"
 
-#: 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 "Nie mo�na odnale�� tre�ci listu w odpowiedzi na FETCH."
 
@@ -9028,7 +9250,7 @@ msgstr "Sprawdzanie nowej poczty"
 msgid "Check for new messages in all folders"
 msgstr "Sprawdzanie nowych list�w we wszystkich folderach"
 
-#: 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 "Foldery"
 
@@ -9059,7 +9281,7 @@ msgstr "Do przegl�dania i przechowywania poczty na serwerach 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 "Has�o"
 
@@ -9079,60 +9301,59 @@ msgstr "Serwer IMAP %s"
 msgid "IMAP service for %s on %s"
 msgstr "us�uga %s dla %s na %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 "Anulowano po��czenie"
 
-#: 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 "Nie mo�na nawi�za� po��czenia z %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 ""
 "Nie mo�na nawi�za� po��czenia z serwerem POP.\n"
 "Wyst�pi� b��d przy wysy�aniu nazwy u�ytkownika: %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 "Rozszerzenie SSL/TLS nie jest obs�ugiwane."
 
-#: 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 "Negocjacja SSL nie powiod�a si�"
 
-#: 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 "Serwer IMAP-a %s nie obs�uguje wymaganego typu uwierzytelniania %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 "Brak obs�ugi typu uwierzytelniania %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 "%sPodaj has�o IMAP dla %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 "Nie wprowadzono has�a."
 
-#: 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"
@@ -9143,24 +9364,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 "Folder \"%s\" nie istnieje"
 
-#: 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 "Nazwa folderu \"%s\" jest niepoprawna, gdy� zawiera znak \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:1817
+#: camel/providers/imap/camel-imap-store.c:1851
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nieznany folder nadrz�dny: %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 "Folder nadrz�dny nie mo�e zawiera� folder�w podrz�dnych"
 
@@ -9239,8 +9460,8 @@ msgstr ""
 "w formacie mbox."
 
 #: 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 ""
@@ -9254,36 +9475,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 "Nie mo�na pobra� folderu: %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 "Lokalne miejsca przechowywania nie maj� skrzynki nadchodz�cej"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokalny plik z listami %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 "Nie mo�na zmieni� nazwy folderu %s na %s: %s"
 
-#: camel/providers/local/camel-local-store.c:363
+#: camel/providers/local/camel-local-store.c:365
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nie mo�na zmieni� nazwy \"%s\": %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 "Nie mo�na usun�� pliku z zestawieniem folderu \"%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 "Nie mo�na usun�� pliku \"%s\" z indeksem folderu: %s"
@@ -9293,7 +9514,7 @@ msgstr "Nie mo�na usun�� pliku \"%s\" z indeksem folderu: %s"
 msgid "Could not save summary: %s: %s"
 msgstr "Nie mo�na zapisa� zestawienia: %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 "Nie mo�na doda� listu do zestawienia: przyczyna nieznana"
 
@@ -9306,14 +9527,14 @@ msgstr "Anulowano do��czenie listu do katalogu Maildir"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nie mo�na do��czy� listu do folderu w formacie 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 "Niepoprawna zawarto�� listu"
 
 #: 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"
@@ -9325,7 +9546,7 @@ 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 "Folder \"%s\" nie istnieje."
@@ -9333,7 +9554,7 @@ msgstr "Folder \"%s\" nie istnieje."
 # y, c-format
 #: 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"
@@ -9348,68 +9569,68 @@ msgid "`%s' is not a maildir directory."
 msgstr "\"%s\" nie jest katalogiem z listami w formacie 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 "Nie mo�na usun�� folderu \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:169
 msgid "not a maildir directory"
 msgstr "to nie katalog z listami w formacie 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 "Nie mo�na przeszuka� folderu \"%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 "Nie mo�na otworzy� katalogu z listami ze scie�ki: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:539
+#: camel/providers/local/camel-maildir-summary.c:541
 msgid "Checking folder consistency"
 msgstr "Sprawdzanie sp�jno�ci folderu"
 
-#: camel/providers/local/camel-maildir-summary.c:640
+#: camel/providers/local/camel-maildir-summary.c:644
 msgid "Checking for new messages"
 msgstr "Wyszukiwanie nowych list�w"
 
-#: 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 "Zapisywanie folderu"
 
-#: 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 "Nie mo�na utworzy� blokady folderu dla %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 "Nie mo�na otworzy� skrzynki: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr "Anulowano do��czenie listu"
 
-#: 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 "Nie mo�na do��czy� listu do pliku 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"
@@ -9418,11 +9639,11 @@ msgstr ""
 "Nie mo�na pobra� listu: %s z folderu %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 "Folder jest uszkodzony w spos�b uniemo�liwiaj�cy napraw�."
 
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Utworzenie listu nie powiod�o si�: Uszkodzona skrzynka?"
 
@@ -9465,75 +9686,75 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Folder \"%s\" nie jest pusty. Nie zosta� usuni�ty."
 
-#: 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 "Nie mo�na otworzy� folderu %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 "Powa�ny b��d sk�adniowy na pozycji %ld w folderze %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 "Nie mo�na sprawdzi� folderu: %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 "Nie mo�na otworzy� pliku %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 "Nie mo�na otworzy� tymczasowej skrzynki: %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 "Nie mo�na zamkn�� folderu �r�d�owego %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 "Nie mo�na zamkn�� folderu tymczasowego: %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 "Nie mo�na zmieni� nazwy folderu: %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 "Niezgodno�� folderu z zestawieniem, nawet po synchronizacji"
 
-#: 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 "Nieznany b��d: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:883
+#: camel/providers/local/camel-mbox-summary.c:812
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Nie mo�na zapisa� folderu: %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 "B��d przy zapisie do tymczasowej skrzynki: %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 "Nie powi�d� si� zapis do tymczasowej skrzynki: %s: %s"
@@ -9552,67 +9773,67 @@ msgstr "Nie mo�na do��czy� listu do folderu mh: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "\"%s\" nie jest katalogiem."
 
-#: 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 "Nie mo�na otworzy� �cie�ki katalogu 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 "Nie mo�na otworzy� kolejki \"%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 "Kolejka \"%s\" nie jest zwyk�ym plikiem lub katalogiem"
 
-#: 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 "Folder \"%s/%s\" nie istnieje."
 
-#: 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\" nie jest zwyk�ym plikiem."
 
-#: 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 "Plik %s z kolejk� list�w"
 
-#: 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 "Nie mo�na zmienia� nazw folder�w kolejek"
 
-#: camel/providers/local/camel-spool-store.c:213
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr "Nie mo�na zmienia� nazw folder�w kolejek"
 
-#: camel/providers/local/camel-spool-store.c:221
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr "Nie mo�na usuwa� folder�w kolejek"
 
-#: 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 "Nie mo�na zsynchronizowa� folderu tymczasowego %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 "Nie mo�na zsynchronizowa� folderu kolejki %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 ""
@@ -9695,43 +9916,43 @@ msgid "Retrieving POP summary"
 msgstr "Pobieranie zestawienia 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
 msgid "User cancelled"
 msgstr "Operacja anulowana"
 
-#: 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 "Nie mo�na pobra� zestawienia POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:306
+#: camel/providers/pop3/camel-pop3-folder.c:308
 msgid "Expunging deleted messages"
 msgstr "Oczyszczanie z usuni�tych list�w"
 
-#: 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 "Brak listu o warto�ci 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 "Pobieranie %d. listu z serwera POP"
 
 # c-format
-#: 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 "Nie mo�na pobra� listu %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
 msgid "Unknown reason"
 msgstr "Nieznana przyczyna"
 
@@ -9748,7 +9969,7 @@ msgstr "Pozostawianie list�w na serwerze"
 msgid "Delete after %s day(s)"
 msgstr "Usuwanie po %s dniach"
 
-#: 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"
 
@@ -9775,26 +9996,26 @@ msgstr ""
 "u�yciu protoko�u APOP. Mo�e on nie funkcjonowa� dla wszystkich u�ytkownik�w, "
 "nawet, je�li serwer teoretycznie obs�uguje protok�."
 
-#: 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 "Nie mo�na nawi�za� po��czenia z serwerem 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 ""
 "Nie mo�na nawi�za� po��czenia z serwerem POP %s w trybie bezpiecznym: %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 "Nie mo�na nawi�za� po��czenia z serwerem 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 "
@@ -9803,28 +10024,28 @@ msgstr ""
 "Nie mo�na nawi�za� po��czenia z serwerem POP %s: Brak obs�ugi wymaganego "
 "mechanizmu uwierzytelniania."
 
-#: 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 "Nie powiod�o si� polecenie 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
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Nie mo�na przeprowadzi� uwierzytelnienia na serwerze 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 "%sPodaj has�o POP dla %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
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9833,13 +10054,13 @@ msgstr ""
 "Nie mo�na nawi�za� po��czenia z serwerem POP %s.\n"
 "Wyst�pi� b��d przy wysy�aniu has�a: %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 "Folder \"%s\" nie istnieje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9851,52 +10072,52 @@ msgstr ""
 "Do wysy�ania poczty poprzez przekazania jej dzia�aj�cemu lokalnie programowi "
 "\"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 "Nie mo�na rozpozna� URL-a \"%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 "Nie mo�na utworzy� potoku do programu sendmail: %s: nie wys�ano poczty"
 
-#: 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 ""
 "Nie mo�na utworzy� procesu dla programu sendmail: %s: nie wys�ano poczty"
 
-#: 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 "Nie mo�na wys�a� listu: %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 "Program sendmail zosta� przerwany przez sygna� %s: nie wys�ano poczty."
 
-#: 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 "Nie mo�na wykona� %s: nie wys�ano poczty."
 
-#: 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 ""
 "Program sendmail zosta� zako�czony z kodem stanu %d: nie wys�ano poczty."
 
-#: 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 "Wysy�anie list�w za pomoc� programu 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"
 
@@ -9906,137 +10127,137 @@ msgstr ""
 "Do wysy�ania poczty poprzez ��czenie si� ze zdalnym serwerem pocztowym przy "
 "u�yciu SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr "B��d sk�adniowy. Nie rozpoznano polecenia."
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr "B��d sk�adniowy w�r�d parametr�w lub argument�w"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr "Niezaimplementowane polecenie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr "Niezaimplementowany parametr polecenia"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr "Stan systemu lub odpowied� z pomoc� systemow�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr "Komunikat pomocy"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr "Us�uga gotowa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr "Us�uga zamyka kana� transmisyjny"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr "Us�uga nie jest dost�pna, zamykanie kana�u transmisyjnego"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr "Pomy�lnie wykonano ��dan� operacj� na li�cie"
 
-#: 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 "U�ytkownik nie jest lokalny; przes�anie do <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 "Nie wykonano ��danej operacji na li�cie: skrzynka jest niedost�pna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Nie wykonano ��danej operacji: skrzynka jest niedost�pna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr "Przerwano ��dan� czynno��: b��d przy przetwarzaniu"
 
-#: 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 "U�ytkownik nie jest lokalny; spr�buj <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 ""
 "Nie wykonano ��danej operacji: brak miejsca w miejscu przechowywania list�w"
 
-#: 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 "Przerwano ��dan� czynno��: przekroczony wykorzystany rozmiar"
 
-#: 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 "Nie wykonano ��danej operacji: niedozwolona nazwa skrzynki"
 
-#: 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 "Rozpocznij wprowadzanie listu; zako�cz poprzez <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr "Transakcja nie powiod�a si�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr "Potrzebna jest zmiana has�a"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr "Mechanizm uwierzytelniania jest zbyt s�aby"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr "��dany miechanizm uwierzytelniaj�cy wymaga szyfrowania"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr "Chwilowe niepowodzenie przy uwierzytelnianiu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "Wymagane uwierzytelnienie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 msgid "Welcome response error"
 msgstr "B��dna odpowied� na powitanie"
 
-#: 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 ""
 "Nie mo�na nawi�za� po��czenia z serwerem SMTP %s w trybie bezpiecznym: %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 "Wygl�da na to, �e serwer nie obs�uguje protoko�u 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 "Up�yn�� czas oczekiwania po STARTTLS: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 msgid "STARTTLS response error"
 msgstr "B��dna odpowied� na 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 "Serwer SMTP %s nie obs�uguje wymaganego typu uwierzytelniania %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 "%sPodaj has�o SMTP dla %s@%s"
@@ -10066,11 +10287,11 @@ msgstr "Wysy�anie list�w za pomoc� SMTP poprzez %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Nie mo�na wys�a� listu: niepoprawny adres nadawcy."
 
-#: 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 "Wysy�anie listu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:703
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr "Nie mo�na wys�a� listu: nie podano odbiorc�w"
 
@@ -10079,61 +10300,61 @@ msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Nie mo�na wys�a� listu: przynajmniej jeden z odbiorc�w jest niepoprawny"
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr "Powitanie 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 "Up�yn�� czas oczekiwania po HELO: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "HELO response error"
 msgstr "B��dna odpowied� na HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr "Uwierzytelnianie SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr "B��d przy tworzeniu obiektu uwierzytelniaj�cego 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 "Up�yn�� czas oczekiwania po AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr "Nie powiod�o si� wykonanie 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 "Niepoprawna odpowied� serwera na uwierzytelnienie.\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 "Up�yn�� czas oczekiwania po MAIL FROM: %s: nie wys�ano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 msgid "MAIL FROM response error"
 msgstr "B��dna odpowied� na 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 "Up�yn�� czas oczekiwania po RCPT TO: %s: nie wys�ano poczty"
 
-#: 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 "Up�yn�� czas oczekiwania po DATA: %s: nie wys�ano poczty"
@@ -10141,80 +10362,80 @@ msgstr "Up�yn�� czas oczekiwania po DATA: %s: nie wys�ano poczty"
 #. 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 "B��dna odpowied� na 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 ""
 "Up�yn�� czas oczekiwania na wys�anie DATA: przerwanie listu: %s: nie wys�ano "
 "poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Niepoprawna odpowied� serwera na uwierzytelnienie."
 
-#: 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 "Up�yn�� czas oczekiwania po RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 msgid "RSET response error"
 msgstr "B��dna odpowied� na 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 "Up�yn�� czas oczekiwania po QUIT: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 msgid "QUIT response error"
 msgstr "B��dna odpowied� na QUIT"
 
-#: 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 "za��cznik"
 
-#: 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 "Usuwa wybrane elementy z listy za��cznik�w"
 
-#: composer/e-msg-composer-attachment-bar.c:551
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Dodaj za��cznik..."
 
-#: composer/e-msg-composer-attachment-bar.c:552
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "Za��cza plik do listu"
 
-#: 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 "Nie mo�na za��czy� pliku %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 "Nie mo�na za��czy� pliku %s: to nie jest zwyk�y plik"
@@ -10232,11 +10453,15 @@ msgid "MIME type:"
 msgstr "Typ 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 "Sugerowanie automatycznego wy�wietlenia za��cznika"
 
-#: 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 "Kliknij tu aby otworzy� ksi��k� adresow�"
 
@@ -10247,45 +10472,45 @@ msgstr "Kliknij tu aby otworzy� ksi��k� adresow�"
 #. * 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 "Odpowied� do:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:411
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Temat:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Dla:"
 
-#: composer/e-msg-composer-hdrs.c:432
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Podaj adres odbiorcy listu"
 
-#: 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 "Podaj adresy, pod kt�re zostanie przes�ana kopia listu"
 
-#: 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."
@@ -10295,26 +10520,27 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:447
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "Przejd� do"
 
-#: composer/e-msg-composer-hdrs.c:449
+#: composer/e-msg-composer-hdrs.c:549
 #, fuzzy
 msgid "Posting destination"
 msgstr "Brak opisu"
 
-#: 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 "Za��czenie pliku"
 
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:533
 msgid "Could not create a PGP signature context"
 msgstr "Nie mo�na utworzy� kontekstu podpisu PGP"
 
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10323,34 +10549,30 @@ msgstr ""
 "B��d przy odczycie pliku %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1160
-msgid "Warning!"
-msgstr "Ostrze�enie!"
-
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Plik istnieje, nadpisa�?"
 
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "B��d przy zapisie pliku: %s"
 
-#: composer/e-msg-composer.c:1207
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "B��d przy odczycie pliku : %s"
 
-#: composer/e-msg-composer.c:1240
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "B��d przy dost�pie do pliku: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Nie mo�na pobra� listu z edytora"
 
-#: composer/e-msg-composer.c:1255
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10359,7 +10581,7 @@ msgstr ""
 "Nie mo�na zmieni� po�o�enia w pliku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10368,7 +10590,16 @@ msgstr ""
 "Nie mo�na przyci�� pliku: %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 ""
+"Nie mo�na zmieni� po�o�enia w pliku: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10377,7 +10608,7 @@ msgstr ""
 "B��d przy automatycznym zapisie listu: %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?"
@@ -10385,7 +10616,7 @@ msgstr ""
 "Odnaleziono niezapisane pliki z poprzedniej sesji Evolution.\n"
 "Czy chcesz spr�bowa� je odzyska�?"
 
-#: composer/e-msg-composer.c:1525
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10396,27 +10627,32 @@ msgstr ""
 "\n"
 "Czy chcesz zapisa� zmiany?"
 
-#: 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 "Uwaga: Zmodyfikowany list"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Otwarcie pliku"
 
-#: composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:2015
 msgid "Signature:"
 msgstr "Podpis:"
 
-#: 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 "Wygenerowany automatycznie"
 
-#: 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 "Tworzenie listu"
 
-#: 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."
@@ -10424,7 +10660,7 @@ msgstr ""
 "Nie mo�na otworzy� okna tworzenia listu:\n"
 "Nie mo�na uaktywni� formantu wyboru adresu."
 
-#: composer/e-msg-composer.c:2822
+#: composer/e-msg-composer.c:2931
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10435,7 +10671,7 @@ msgstr ""
 "Nie mo�na otworzy� okna tworzenia listu:\n"
 "Nie mo�na uaktywni� komponentu edytora HTML-a."
 
-#: 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."
@@ -10443,7 +10679,7 @@ msgstr ""
 "Nie mo�na otworzy� okna tworzenia listu:\n"
 "Nie mo�na uaktywni� komponentu edytora HTML-a."
 
-#: 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>"
@@ -10451,19 +10687,6 @@ msgstr ""
 "<b>(Edytor list�w zawiera tre�� nie b�d�c� tekstem, kt�ra nie mo�e podlega� "
 "modyfikacjom.)</b>"
 
-#: 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 ""
-"Nie mo�na otworzy� okna tworzenia listu, poniewa� w komponencie\n"
-"pocztowym nie zosta�y jeszcze skonfigurowane �adne to�samo�ci."
-
-#: composer/evolution-composer.c:408
-#, fuzzy
-msgid "Cannot initialize the Evolution composer."
-msgstr "Nie mo�na zainicjowa� edytora list�w Evolution."
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Evolution - pakiet do pracy grupowej"
@@ -10512,8 +10735,111 @@ msgstr "Temat zawiera"
 msgid "Subject does not contain"
 msgstr "Temat nie zawiera"
 
-#: 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 "Poza biurem"
+
+#: designs/OOA/ooa.glade.h:5
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Pocz�tek:</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 "Poza biurem"
+
+#: designs/OOA/ooa.glade.h:13
+#, fuzzy
+msgid "Yes, Change Status"
+msgstr "Stan"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:2
+#, fuzzy
+msgid "<b>Receiving Email</b>"
+msgstr "Odbieranie poczty"
+
+#: designs/read_receipts/read.glade.h:3
+#, fuzzy
+msgid "<b>Sending Email:</b>"
+msgstr "Wysy�anie list�w"
+
+#: 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 "Lista odbiorc�w"
+
+#: 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?"
@@ -10521,211 +10847,238 @@ msgstr ""
 "Plik o tej nazwie ju� istnieje.\n"
 "Nadpisa� go?"
 
-#: e-util/e-passwords.c:363
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "Nadpisa� plik?"
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Zapami�tanie has�a"
 
-#: e-util/e-passwords.c:365
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Zapami�tanie tego has�a na czas bie��cej sesji"
 
-#: 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 "Kategorie"
 
 #. 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 "sekund"
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr "1 sekunda"
 
-#: filter/filter-datespec.c:71
-msgid "minute"
-msgstr "minuta"
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr "%d sekund"
 
-#: filter/filter-datespec.c:72
-msgid "hour"
-msgstr "godzina"
+#: filter/filter-datespec.c:66
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 minuta"
 
-#: filter/filter-datespec.c:74
-msgid "week"
-msgstr "tydzie�"
+#: filter/filter-datespec.c:66
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "%d minut"
 
-#: filter/filter-datespec.c:74 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "tygodni"
+#: filter/filter-datespec.c:67
+#, fuzzy
+msgid "1 hour ago"
+msgstr "1 godzina"
+
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d godzin"
 
-#: filter/filter-datespec.c:75
-msgid "month"
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "1 day ago"
+msgstr "1 dzie�"
+
+#: filter/filter-datespec.c:68
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr "%d %s temu"
+
+#: filter/filter-datespec.c:69
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 tydzie�"
+
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d tygodni"
+
+#: filter/filter-datespec.c:70
+#, fuzzy
+msgid "1 month ago"
 msgstr "miesi�c"
 
-#: filter/filter-datespec.c:75 filter/filter.glade.h:23
-msgid "months"
-msgstr "miesi�cy"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr "%d %s temu"
 
-#: filter/filter-datespec.c:76
-msgid "year"
-msgstr "rok"
+#: filter/filter-datespec.c:71
+msgid "1 year ago"
+msgstr ""
 
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
-msgid "years"
-msgstr "lat"
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr "%d %s temu"
 
-#: filter/filter-datespec.c:174
+#: filter/filter-datespec.c:176
 #, fuzzy
 msgid "You must choose a date."
 msgstr "Nie zesta�a wybrana data."
 
-#: filter/filter-datespec.c:269
+#: filter/filter-datespec.c:275
 msgid "<click here to select a date>"
 msgstr "<kliknij, aby wybra� dat�>"
 
-#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
 msgid "now"
 msgstr "teraz"
 
 #. 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
 msgid "%d-%b-%Y"
 msgstr "%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 "%d %s temu"
-
-#: filter/filter-datespec.c:407
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Wyb�r czasu odniesienia"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Regu�y filtr�w"
 
-#: 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 "Nale�y nada� temu vFolderowi nazw�."
 
-#: 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 "Plik \"%s\" nie istnieje lub nie jest zwyk�ym plikiem."
 
-#: filter/filter-file.c:307
+#: filter/filter-file.c:298
 msgid "Choose a file"
 msgstr "Wyb�r pliku"
 
 #. and now for the action area
-#: filter/filter-filter.c:513
+#: filter/filter-filter.c:491
 msgid "Then"
 msgstr "Podejmowane czynno�ci"
 
-#: filter/filter-filter.c:527
-msgid "Add action"
-msgstr "Dodaj czynno��"
-
-#: 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 "Nale�y nada� temu vFolderowi nazw�."
 
-#: 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 "Wyb�r folderu"
 
-#: filter/filter-input.c:200
+#: filter/filter-input.c:191
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10734,74 +11087,72 @@ msgstr ""
 "B��d w wyra�eniu regularnym \"%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 "Wa�ny"
 
 #. 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 "Praca"
 
 #. 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 "Osobiste"
 
 #. 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 "Do zrobienia"
 
 #. 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 "P�niej"
 
-#: 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 "Nale�y nada� temu filtrowi nazw�."
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:751
 msgid "Rule name: "
 msgstr "Nazwa regu�y: "
 
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:755
 msgid "Untitled"
 msgstr "Bez nazwy"
 
-#: filter/filter-rule.c:785
+#: filter/filter-rule.c:772
 msgid "If"
 msgstr "Lista warunk�w"
 
-#: filter/filter-rule.c:803
+#: filter/filter-rule.c:790
 msgid "Execute actions"
 msgstr "Wykonywanie czynno�ci"
 
-#: filter/filter-rule.c:807
+#: filter/filter-rule.c:794
 msgid "if all criteria are met"
 msgstr "przy spe�nieniu wszystkich kryteri�w"
 
-#: filter/filter-rule.c:812
+#: filter/filter-rule.c:799
 msgid "if any criteria are met"
 msgstr "przy spe�nieniu kt�regokolwiek z kryteri�w"
 
-#: filter/filter-rule.c:823
-msgid "Add criterion"
-msgstr "Dodaj kryterium"
-
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "incoming"
 msgstr "nadchodz�ce"
 
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "outgoing"
 msgstr "wychodz�ce"
 
@@ -10853,7 +11204,7 @@ msgstr ""
 "Data listu b�dzie por�wnywana z czasem podanym\n"
 "poni�ej."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr "Wirtualne foldery"
 
@@ -10865,6 +11216,14 @@ msgstr "czasem podanym wzgl�dem bie��cego"
 msgid "ago"
 msgstr "temu"
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "miesi�cy"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr "sekund"
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "tylko okre�lone foldery"
@@ -10882,6 +11241,10 @@ msgstr "podanym czasem"
 msgid "vFolder Sources"
 msgstr "�r�d�a VFolder�w"
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "tygodni"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "ze wszystkimi aktywnymi zdalnymi folderami"
@@ -10894,6 +11257,10 @@ msgstr "ze wszystkimi lokalnymi i aktywnymi zdalnymi folderami"
 msgid "with all local folders"
 msgstr "ze wszystkimi lokalnymi folderami"
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "lat"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11023,7 +11390,7 @@ msgstr "nie jest"
 msgid "is not Flagged"
 msgstr "Oznaczony"
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 msgid "Label"
 msgstr ""
 
@@ -11053,7 +11420,7 @@ msgstr "Wy�lij list do kontaktu"
 msgid "Play Sound"
 msgstr "Odtwarzany d�wi�k:"
 
-#: 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 "Przeczytany"
 
@@ -11083,12 +11450,12 @@ msgstr "jest wi�kszy ni�"
 msgid "returns less than"
 msgstr "jest mniejszy ni�"
 
-#: 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 "Punkty"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "Nadawca"
 
@@ -11124,8 +11491,9 @@ msgstr "rozpoczyna si� od"
 msgid "Stop Processing"
 msgstr "Zatrzymanie przetwarzania"
 
-#: 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 "Temat"
 
@@ -11134,68 +11502,84 @@ msgstr "Temat"
 msgid "Unset Status"
 msgstr "Ustaw stan"
 
-#: filter/rule-editor.c:180
-msgid "Rules"
-msgstr "Regu�y"
-
-#: 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 "Regu�y"
+
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Dodaj regu��"
 
-#: filter/rule-editor.c:388
+#: filter/rule-editor.c:372
 msgid "Edit Rule"
 msgstr "Zmodyfikuj regu��"
 
-#: filter/score-editor.c:130
+#: filter/rule-editor.c:689
+#, fuzzy
+msgid "Rule name"
+msgstr "Nazwa regu�y: "
+
+#: filter/score-editor.c:114
 msgid "Score Rules"
 msgstr "Regu�y punktacji"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 msgid "You must name this vfolder."
 msgstr "Nale�y nada� temu vFolderowi nazw�."
 
-#: filter/vfolder-rule.c:215
+#: filter/vfolder-rule.c:222
 msgid "You need to to specify at least one folder as a source."
 msgstr "Nale�y poda� jako �r�d�o przynajmniej jeden folder."
 
-#: importers/elm-importer.c:95
+#: filter/vfolder-rule.c:499
+#, fuzzy
+msgid "VFolder source"
+msgstr "�r�d�a VFolder�w"
+
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuje star� poczt� Elma"
 
 #: 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 "Importowanie..."
 
 #: 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 "Poczekaj chwil�"
 
 #: 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 "Importowanie %s jako %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 "Analizowanie %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 "Poczta"
 
-#: 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?"
@@ -11203,7 +11587,7 @@ msgstr ""
 "Odnaleziono pliki pocztowe programu Elm.\n"
 "Czy chcesz zaimportowa� je do Evolution?"
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -11215,12 +11599,12 @@ msgstr ""
 "Odnaleziono pliki programu GnomeCard.\n"
 "Czy chcesz zaimportowa� je do 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 "Priorytet: %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"
@@ -11235,7 +11619,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"
@@ -11243,7 +11627,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"
@@ -11252,38 +11636,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 importuje stare dane Netscape'a"
 
 #. 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 "�mietnik"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Lokalny plik z listami %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 "Analizowanie katalogu"
 
-#: 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 "Rozpoczynanie importowania"
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 msgid "Mail Filters"
 msgstr "Filtry list�w"
 
-#: 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?"
@@ -11291,11 +11677,11 @@ msgstr ""
 "Odnaleziono pliki pocztowe programu Netscape.\n"
 "Czy chcesz zaimportowa� je do 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 importuje stare dane Pine'a"
 
-#: 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?"
@@ -11303,133 +11689,126 @@ msgstr ""
 "Odnaleziono pliki pocztowe programu Pine.\n"
 "Czy chcesz zaimportowa� je do 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 "Generator edytora list�w Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Generator formantu zada� Evolution"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Generator edytora list�w Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Generator edytora list�w 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 "Generator edytora list�w 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 ""
 "Pozwala na utworzenie i modyfikacj� kont pocztowych oraz innych ustawie�"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Komponent Evolution obs�uguj�cy poczt�."
+#: 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 "Generator formantu zada� Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Edytor list�w Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Evolution mail composer."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
 msgstr "Edytor list�w Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Komponent zestawienia wykonawczego poczty Evolution."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Generator formantu zada� Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Komponent wy�wietlania folderu pocztowego Evolution."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Interfejs konfiguracji poczty"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
-msgstr "Generator komponent�w folderu pocztowego Evolution."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Komponent wy�wietlania folderu pocztowego Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
-msgstr "Generator edytora list�w Evolution."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Generator formantu zada� Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
-msgstr "Generator komponentu zestawienia poczty."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Komponent zestawienia wykonawczego poczty Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 msgid "Font Preferences"
 msgstr "Ustawienia czcionek"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
 msgid "Mail Accounts"
 msgstr "Konta pocztowe"
 
-#: 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 "Ustawienia poczty"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-msgid "Mail configuration interface"
-msgstr "Interfejs konfiguracji poczty"
-
-#: mail/component-factory.c:102
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Folder zawieraj�cy poczt�"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public Mail"
 msgstr "Publiczny"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "Folder zawieraj�cy poczt�"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Wirtualny �mietnik"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Folder wirtualnego �mietnika"
 
-#: mail/component-factory.c:132
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Ten folder nie mo�e zawiera� list�w."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "W�a�ciwo�ci..."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Zmienia w�a�ciwo�ci folderu"
 
-#: 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."
@@ -11437,282 +11816,280 @@ msgstr ""
 "Wygl�da na to, �e cz�� twoich ustawie� poczty zosta�a uszkodzona. Upewnij "
 "si�, �e wszystko jest na miejscu."
 
-#: mail/component-factory.c:970
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "Nie zosta� ustawiony spos�b przekazywania list�w"
 
-#: 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 "Uwaga: Zmodyfikowany list"
-
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Nowy list"
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "L_ist"
 
-#: mail/component-factory.c:1041
+#: mail/component-factory.c:1061
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Tworzenie listu"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "New Message Post"
 msgstr "Nowy list"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "_Post Message"
 msgstr "Poprzedni list"
 
-#: mail/component-factory.c:1050
+#: mail/component-factory.c:1070
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Nowy list"
 
-#: mail/component-factory.c:1078
-#, fuzzy
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Nie mo�na zainicjowa� komponentu pocztowego Evolution."
-
-#: mail/component-factory.c:1087
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Nie mo�na zainicjowa� komponentu konfiguracji poczty Evolution."
-
-#: mail/component-factory.c:1093
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Nie mo�na zainicjowa� komponentu informacji o folderach Evolution."
-
-#: mail/component-factory.c:1334 mail/component-factory.c:1364
+#: mail/component-factory.c:1353
 msgid "Connecting..."
 msgstr "Nawi�zywanie po��czenia..."
 
-#: mail/component-factory.c:1375
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Nie mo�na zarejstrowa� w pow�oce miejsca przechowywania"
 
-#: mail/folder-browser-ui.c:471
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "W�a�ciwo�ci \"%s\""
 
-#: mail/folder-browser-ui.c:473
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "W�a�ciwo�ci"
 
-#: 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 "Nie mo�na utworzy� katalogu tymczasowego: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr "nowych: %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 "ukrytych: %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 "zaznaczonych: %d"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr "niewys�anych: %d"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d sent"
 msgstr "niewys�anych: %d"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr "og�em: %d"
 
-#: mail/folder-browser.c:1118
+#: mail/folder-browser.c:1182
 msgid "Create _Virtual Folder From Search..."
 msgstr "Utw�rz _wirtualny folder na podstawie wyszukiwania..."
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "VFolder w oparciu o _temat"
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "VFolder w oparciu o _nadawc�"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "VFolder w oparciu o _odbiorc�w"
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "VFolder w oparciu o _list� dyskusyjn�"
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "Filtr w oparciu o t_emat"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "Filtr w oparciu o n_adawc�"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "Filtr w oparciu o o_dbiorc�w"
 
-#: 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 "Filtr w oparciu o li_st� dyskusyjn�"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "Z_redaguj jako nowy list..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "Wy_drukuj"
 
-#: 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 "Odpo_wiedz nadawcy"
 
-#: 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 "Odpowiedz na _list�"
 
-#: 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 "Odpowiedz wszystki_m"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "_Prze�lij"
 
-#: 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 "Zako�czone"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1772
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Wyczy��"
 
 #. 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 "O_znacz jako przeczytane"
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1777
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Oznacz jako ni_eprzeczytane"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "Oz_nacz jako wa�ny"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1779
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Ozn_acz jako niewa�ne"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1784
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Cofnij usuni�cie"
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1788
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "P_rzenie� do folderu..."
 
-#: 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 "S_kopiuj do folderu..."
 
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1797
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Dodaj nadawc� do ksi��ki adresowej"
 
-#: mail/folder-browser.c:1774
+#: mail/folder-browser.c:1801
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Zastosuj filtry"
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1805
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "_Utw�rz regu�� na podstawie listu"
 
-#: mail/folder-browser.c:2036
+#: mail/folder-browser.c:2064
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VFolder w oparciu o list� dyskusyjn�"
 
-#: mail/folder-browser.c:2038
+#: mail/folder-browser.c:2066
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtr w oparciu o list� dyskusyjn� (%s)"
 
-#: mail/folder-browser.c:2039
+#: mail/folder-browser.c:2067
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VFolder w oparciu o list� dyskusyjn� (%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 "Domy�lny"
 
-#: mail/folder-info.c:71
+#: mail/folder-info.c:70
 msgid "Getting Folder Information"
 msgstr "Pobieranie informacji o folderze"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "Generator importu plik�w mbox do Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Edytor list�w Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Importuje pliki mbox do Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Edytor list�w Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Generator importu plik�w Outlook Express 4 do 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 "Importuje pliki Outlook Express 4 do Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Edytor list�w 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 "Edytor list�w Evolution."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -11750,97 +12127,97 @@ 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 "Nie zosta�y podane wszystkie wymagane informacje."
 
 #. 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 "Modyfikacja konta 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 "_Komputer:"
 
-#: 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 "Nazwa _u�ytkownika:"
 
-#: 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 "�_cie�ka:"
 
-#: mail/mail-account-gui.c:1847
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr "Nie mo�na utworzy� dw�ch kont o tej samej nazwie."
 
-#: mail/mail-accounts.c:224
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr "Czy na pewno chcesz usun�� to konto?"
 
-#: mail/mail-accounts.c:228
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "Nie usuwaj"
 
-#: mail/mail-accounts.c:231
-msgid "Really delete account?"
-msgstr "Rzeczywi�cie usun�� 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 "Unieaktywnij"
 
-#: 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 "Uaktywnij"
 
-#: 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 "Domy�lny"
+
+#: 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 "Aktywne"
 
-#: 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 "Nazwa konta"
 
-#: 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 "Protok�"
 
-#: mail/mail-autofilter.c:78
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "List do %s"
 
-#: mail/mail-autofilter.c:242
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Tematem jest %s"
 
-#: mail/mail-autofilter.c:258
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "List od %s"
 
-#: mail/mail-autofilter.c:275
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "lista dyskusyjna %s"
 
-#: mail/mail-autofilter.c:327
+#: mail/mail-autofilter.c:323
 msgid "Add Filter Rule"
 msgstr "Dodanie regu�y filtra"
 
-#: 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"
@@ -11852,7 +12229,12 @@ msgstr ""
 "   \"%s\"\n"
 "I zosta�y zaktualizowane."
 
-#: 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 "Bez wy�wietlania tego komunikatu w przysz�o�ci."
+
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11865,7 +12247,16 @@ msgstr ""
 "jakichkolwiek list�w.\n"
 "Czy chcesz przeprowadzi� j� teraz?"
 
-#: 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 ""
+"Przed wys�aniem listu nale�y skonfigurowa�\n"
+"wykorzystywan� to�samo��."
+
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11873,7 +12264,7 @@ msgstr ""
 "Przed wys�aniem listu nale�y skonfigurowa�\n"
 "wykorzystywan� to�samo��."
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11882,7 +12273,7 @@ msgstr ""
 "spos�b przekazywania list�w."
 
 #. 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"
@@ -11891,11 +12282,11 @@ msgstr ""
 "Zamierzasz wys�a� list zapisany w HTML-u, lecz wymienieni poni�ej odbiorcy "
 "�e nie chc� otrzymywa� list�w w tej postaci:\n"
 
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "Czy pomimo tego wys�a�?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11903,7 +12294,7 @@ msgstr ""
 "List nie zawiera tematu.\n"
 "Rzeczywi�cie wys�a�?"
 
-#: 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."
@@ -11912,11 +12303,11 @@ msgstr ""
 "ukrywa� adresy jej cz�onk�w, list zawiera� b�dzie tylko ukrytych adresat�w "
 "(bcc)."
 
-#: mail/mail-callbacks.c:360
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr "Ten list zawiera tylko ukrytych adresat�w (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"
@@ -11926,11 +12317,11 @@ msgstr ""
 "nag��wek Apparently-To.\n"
 "Czy pomimo tego wys�a�?"
 
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr "Przed wys�aniem listu nale�y poda� jego odbiorc�w."
 
-#: 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?"
@@ -11938,28 +12329,28 @@ msgstr ""
 "Nie mo�na otworzy� folderu poczty roboczej, zwi�zanego z tym kontem.\n"
 "Czy chcesz zamiast tego wykorzysta� domy�lny folder Poczta robocza?"
 
-#: mail/mail-callbacks.c:1207
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "nieznany nadawca"
 
-#: mail/mail-callbacks.c:1211
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "W li�cie z %a, %d-%m-%Y, godz. %H:%M, %%s pisze: "
 
-#: 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 "Przeniesienie list�w do folderu"
 
-#: 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 "Kopiowanie list�w do folderu"
 
-#: mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Czy na pewno chcesz zredagowa� wszystkie %d list�w?"
 
-#: mail/mail-callbacks.c:2406
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11967,7 +12358,7 @@ msgstr ""
 "Mo�liwe jest redagowanie wy��cznie\n"
 "list�w zapisanych w folderze Poczta robocza."
 
-#: mail/mail-callbacks.c:2445
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11975,42 +12366,46 @@ msgstr ""
 "Listy zapisane w folderze Wys�ane\n"
 "mo�na tylko wys�a� ponownie."
 
-#: mail/mail-callbacks.c:2459
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Czy na pewno chcesz ponownie wys�a� wszystkie %d list�w?"
 
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "Nie zaznaczono �adnego listu"
 
-#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
-msgid "Overwrite file?"
-msgstr "Nadpisa� plik?"
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"Nie mo�na pobra� listu: %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 istnieje.\n"
+"Czy chcesz go nadpisa�?"
+
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "Zapis listu pod podan� nazw�"
 
-#: mail/mail-callbacks.c:2586
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "Zapis list�w pod podan� nazw�"
 
-#: mail/mail-callbacks.c:2655
+#: mail/mail-callbacks.c:2687
 #, fuzzy
-msgid "Go to next folder with unread messages?"
-msgstr "Wy�wietla kolejny nieprzeczytany list"
-
-#: 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 ""
@@ -12020,7 +12415,7 @@ msgstr ""
 "\n"
 "Czy rzeczywi�cie usun�� te listy?"
 
-#: mail/mail-callbacks.c:3018
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12029,62 +12424,63 @@ msgstr ""
 "B��d przy wczytywaniu informacji o filtrze:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3030
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtry"
 
-#: mail/mail-callbacks.c:3074
+#: mail/mail-callbacks.c:2831
 #, c-format
 msgid "Page %d of %d"
 msgstr "Strona %d z %d"
 
-#: mail/mail-callbacks.c:3129
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "Wydruk listu"
 
-#: mail/mail-callbacks.c:3156
-msgid "US-Letter"
-msgstr "Listowy-US"
-
-#: mail/mail-callbacks.c:3197
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "Wydrukowanie listu nie powiod�o si�"
 
-#: 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 "Czy na pewno chcesz otworzy� wszystkie %d list�w w osobnych oknach?"
 
-#: 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
+msgid "Unnamed"
+msgstr "Bez nazwy"
 
-#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
-#: mail/mail-composer-prefs.c:416
-msgid " [script]"
-msgstr " [skrypt]"
+#: mail/mail-composer-prefs.c:335
+#, fuzzy
+msgid "You must specify a valid script name."
+msgstr "Nale�y nada� temu vFolderowi nazw�."
 
-#: 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 " [skrypt]"
 
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
-msgid "Unnamed"
-msgstr "Bez nazwy"
+#: mail/mail-composer-prefs.c:864
+#, fuzzy
+msgid "Language(s)"
+msgstr "J�zyk"
 
-#: mail/mail-composer-prefs.c:875
+#: mail/mail-composer-prefs.c:906
 #, fuzzy
 msgid "Add script signature"
 msgstr "Dodaj kryterium"
 
-#: mail/mail-composer-prefs.c:876
+#: mail/mail-composer-prefs.c:926
 #, fuzzy
-msgid "Add Signature"
+msgid "Signature(s)"
 msgstr "Plik z p_odpisem:"
 
-#: mail/mail-config-druid.c:146
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr "To�samo��"
+
+#: mail/mail-config-druid.c:382
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -12096,7 +12492,12 @@ msgstr ""
 "chyba, �e chcesz, aby znajduj�ce si� w nich informacje by�y zawarte w "
 "wysy�anych listach."
 
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "Odbieranie poczty"
+
+#: mail/mail-config-druid.c:390
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -12106,11 +12507,16 @@ msgstr ""
 "pewno�ci co do tych informacji,\n"
 "zapytaj administratora lub dostawc� Internetu (ISP)."
 
-#: mail/mail-config-druid.c:150
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Wybierz spo�r�d poni�szych opcji"
 
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:400
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Wysy�anie list�w"
+
+#: mail/mail-config-druid.c:402
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -12120,7 +12526,11 @@ msgstr ""
 "pewno�ci co do tych informacji,\n"
 "zapytaj administratora lub dostawc� Internetu (ISP)."
 
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "Zarz�dzanie kontami"
+
+#: mail/mail-config-druid.c:409
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -12137,153 +12547,136 @@ msgstr ""
 "Nazwa b�dzie u�ywana tylko przy wy�wietlaniu celem rozr�nienia go od innych "
 "kont."
 
-#. set window title
-#: mail/mail-config-druid.c:637
-msgid "Evolution Account Assistant"
-msgstr "Druid kont Evolution"
-
-#: mail/mail-config.c:622
-#, c-format
-msgid "Account %d"
-msgstr "Konto %d"
-
-#: mail/mail-config.c:2316
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Sprawdzanie us�ugi"
 
-#: 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 "Nawi�zywanie po��czenia z serwerem..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr " _Sprawd� obs�ugiwane typy "
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(Ta kopia Evolution nie obs�uguje SSL-a)"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Ta kopia Evolution nie obs�uguje SSL-a)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Przy wysy�aniu zaszyfrowanych list�w _szyfrowanie zawsze do siebie"
 
-#: 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 "Edytor kont"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Informacje o koncie"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "Zarz�dzanie kontami"
-
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Wy_drukuj..."
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Zapisz podpis"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Przy wysy�aniu zaszyfrowanych list�w _szyfrowanie zawsze do siebie"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "_Podpisywanie wszystkich list�w wychodz�cych przy u�yciu tego konta"
 
-#: 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 "Za��cza plik do listu"
 
-#: 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 "Za��cznik"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Automatyczne sprawdzanie nowych list�w"
 
-#: 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 "Nieznany zestaw znak�w: %s"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "C_olors"
 msgstr "K_olory"
 
-#: 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 "Sprawdzanie nowej poczty"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Kolor dzisiejszych zada�"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Tworzenie list�w"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: 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 ""
 "Konfiguracja poczty zako�czy�a si� sukcesem.\n"
 "\n"
@@ -12291,287 +12684,284 @@ msgstr ""
 "\n"
 "Kliknij \"Zako�cz\", aby zapisa� ustawienia."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "D_omy�lne"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Domy�lne zachowanie"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Domy�lne _kodowanie znak�w:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Usuwanie poczty"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digital IDs..."
 msgstr "Identyfikatory cyfrowe..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Nie mo�na otworzy� listu"
 
-#: 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 "Gotowe"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Folder ze _szkicami:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "U_aktywnij"
 
-#: 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 "Konta pocztowe"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "Adres _e-mail:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "_Opr�nianie folder�w �mietnika przy zako�czeniu"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr "Druid kont Evolution"
+
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Wykonywanie czynno�ci"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "ko�czy si� na"
 
-#: 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
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Przes�ane listy"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr "Pobierz identyfikator cyfrowy..."
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Oznaczanie cytat�w za pomoc� koloru"
 
-#: 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 "To�samo��"
-
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Tre�� listu"
 
-#: 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
 msgid "Labels and Colors"
 msgstr "Etykiety i kolory"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Pobieranie obraz�w"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Konfiguracja poczty"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Po�o�enie skrzynki"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Listy"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Wy�wietlanie listu"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "List zawiera"
+
+#: 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 "Powiadamianie o nowej poczcie"
 
-#: 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 "Informacje opcjonalne"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Or_ganization:"
 msgstr "_Organizacja:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _klucza PGP/GPG:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Wyb�r koloru"
 
-#: 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 "Potwierdzanie przy wysy�aniu listu tylko z _ukrytymi adresatami (bcc)"
 
-#: 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 "Drukowane czcionki"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr "Katalog maildir Qmaila"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Quote original message"
 msgstr "Nie mo�na otworzy� listu"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr "Jako cytat"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr "_Zapami�tanie has�a"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Odpowied� 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 "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Opcje odbioru"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Zapami�tanie has�a"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "Wymagane informacje"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Domy�lny"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "S_ecurity"
 msgstr "B_ezpiecze�stwo"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "Bezpieczne MIME (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 "Wysy�anie list�w"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "Folder z _wys�anymi listami:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "Listy wys�ane i szkice"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr "Serwer wymaga _uwierzytelnienia"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Konfiguracja serwera"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "_Typ serwera:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Skr�ty"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nazwa stylu:"
 
-#: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
-msgstr ""
-
 #: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
@@ -12606,10 +12996,11 @@ msgid "V_ariable-width:"
 msgstr "Zmienny"
 
 #: 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 ""
 "Witaj w druidzie konfiguracji poczty Evolution.\n"
 "\n"
@@ -12682,119 +13073,124 @@ msgid "_Enable"
 msgstr "Uaktywnij"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr ""
-
-#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Prze�lij jako"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "_Pe�na nazwa:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Listy napisane w HTML-u"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr "_To�samo��"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "_Pobieranie obraz�w, je�li nadawca jest w ksi��ce adresowej"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Ustawienie jako konto _domy�lne"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "O_znaczanie list�w jako \"przeczytanych\" po up�ywie"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Nazwa:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "_Bez pobierania jakichkolwiek obraz�w z sieci"
 
-#: 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 ""
 "Potwierdzanie przy wysy�aniu list�w w formacie HTML do os�b, kt�re ich nie "
 "chc�"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Potwierdzanie przy wysy�aniu listu bez _tematu"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Wszystkim"
 
-#: 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 "_Bezpiecze�stwo"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Wysy�anie list�w"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Forma wy�wietlania czasu"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "Plik z p_odpisem:"
 
+#: 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 "Wykorzystanie bezpiecznego po��czenia (_SSL)"
+msgid "_Terminal Font:"
+msgstr "Oryginalny kontakt:"
 
 #: mail/mail-config.glade.h:176
 #, fuzzy
-msgid "_Variable-width:"
-msgstr "Zmienny"
+msgid "_Use secure connection (SSL):"
+msgstr "Wykorzystanie bezpiecznego po��czenia (_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 "_co"
 
-#: 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 "opis"
 
@@ -12819,188 +13215,190 @@ msgstr "Nie mo�na utworzy� kontekstu otoczki S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nie mo�na utworzy� kontekstu dekodowania S/MIME."
 
-#: mail/mail-display.c:321
+#: mail/mail-display.c:193
+#, fuzzy, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Plik o tej nazwie ju� istnieje.\n"
+"Nadpisa� go?"
+
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Zapis za��cznika"
 
-#: mail/mail-display.c:386
+#: mail/mail-display.c:406
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Nie mo�na utworzy� katalogu tymczasowego: %s"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:454
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Zapis za��cznika"
 
-#: mail/mail-display.c:433
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr "Wy�wietl na miejscu"
 
-#: mail/mail-display.c:434
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "Otw�rz za pomoc� programu %s..."
 
-#: mail/mail-display.c:494
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Wy�wietl na miejscu (za pomoc� programu %s)"
 
-#: mail/mail-display.c:498
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "Ukryj"
 
-#: mail/mail-display.c:519
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "Zewn�trzna przegl�darka"
 
-#: mail/mail-display.c:1319
+#: mail/mail-display.c:1365
 msgid "Downloading images"
 msgstr "Pobieranie obraz�w"
 
-#: mail/mail-display.c:1496
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "Wczytywanie tre�ci listu"
 
-#: mail/mail-display.c:1783
+#: mail/mail-display.c:1879
 #, fuzzy
 msgid "Overdue:"
 msgstr "Z_aleg�e zadania:"
 
-#: mail/mail-display.c:1787
+#: mail/mail-display.c:1883
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d %b %k:%M"
 
-#: mail/mail-display.c:2114
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Otw�rz odno�nik w przegl�darce"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Skopiuj adres odno�nika"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Zapisz odno�nik jako (FIXME)"
 
-#: mail/mail-display.c:2119
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Zapisz obraz jako..."
 
-#: mail/mail-folder-cache.c:743
+#: mail/mail-folder-cache.c:744
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Analizowanie %s"
 
-#: mail/mail-format.c:656
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr "Za��cznik: %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 ""
 "Nie mo�na przetworzy� jako list MIME. Wy�wietlanie w postaci �r�d�owej."
 
-#: 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 "Niepoprawny adres"
 
-#: 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 "Od"
 
-#: mail/mail-format.c:917
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Odpowied� 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 "Dla"
 
-#: 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"
-"Dostarczyciel poczty: "
-
-#: mail/mail-format.c:1848
+#: mail/mail-format.c:1451
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "List zosta� podpisany cyfrowo. Kliknij ikon� k��dki, aby uzyska� wi�cej "
 "informacji."
 
-#: mail/mail-format.c:1875
+#: mail/mail-format.c:1479
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nie mo�na utworzy� kontekstu weryfikacji PGP."
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "List zosta� podpisany cyfrowo i potwierdzono jego autentyczno��."
 
-#: 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 ""
 "List zosta� podpisany cyfrowo lecz nie potwierdzono jego autentyczno�ci."
 
-#: mail/mail-format.c:2157
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wska�nik do witryny 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 "Wska�nik do lokalnego pliku (%s) poprawny na witrynie \"%s\""
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wska�nik do lokalnego pliku (%s)"
 
-#: mail/mail-format.c:2205
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Wska�nik na zdalne dane (%s)"
 
-#: mail/mail-format.c:2213
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Wska�nik na nieznane zewn�trzne dane (typu \"%s\")"
 
-#: mail/mail-format.c:2218
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr "Niepoprawna forma cz�ci external-body."
 
-#: mail/mail-local.c:539 mail/mail-local.c:541
+#: mail/mail-local.c:537 mail/mail-local.c:539
 #, c-format
 msgid "Local folders/%s"
 msgstr "Lokalne foldery/%s"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr "Przekonfigurowywanie folderu"
 
-#: 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"
@@ -13009,12 +13407,12 @@ msgstr ""
 "Nie mo�na zapisa� metainformacji zwi�zanych z folderem; prawdopodobnie\n"
 "otwarcie folderu nie b�dzie ju� mo�liwe: %s: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:804
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nie mo�na zapisa� metadanych zwi�zanych z folderem w %s: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Nie mo�na usun�� metadanych zwi�zanych z folderem: %s: %s"
@@ -13024,7 +13422,7 @@ msgstr "Nie mo�na usun�� metadanych zwi�zanych z folderem: %s: %s"
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Konwertowanie folderu \"%s\" na 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."
@@ -13032,12 +13430,12 @@ msgstr ""
 "Je�li otwarcie tej skrzynki nie b�dzie ju� mo�liwe,\n"
 "w�wczas mo�e by� konieczne r�czne jej naprawienie."
 
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Zmiana konfiguracji /%s"
 
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
 msgstr "Nie mo�na zmieni� formatu zdalnego folderu."
 
@@ -13059,108 +13457,108 @@ msgstr ""
 "B��d przy wykonywaniu operacji:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Przetwarzanie"
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Filtrowanie folderu"
 
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Pobieranie poczty"
 
-#: 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 "Mimo wszystko, list zosta� wys�any pomy�lnie."
 
-#: mail/mail-ops.c:618
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Wysy�anie \"%s\""
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Wysy�anie %d. listu z %d"
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Niepowodzenie przy %d. li�cie z %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 "Gotowe."
 
-#: mail/mail-ops.c:853
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Zapisywanie listu w folderze"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Przenoszenie list�w do %s"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiowanie list�w do %s"
 
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizowanie folder�w w \"%s\""
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Przes�ane listy"
 
-#: mail/mail-ops.c:1277
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otwieranie folderu %s"
 
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "Otwieranie miejsca przechowywania %s"
 
-#: mail/mail-ops.c:1422
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Usuwanie folderu %s"
 
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Zapisywanie folderu \"%s\""
 
-#: mail/mail-ops.c:1567
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Od�wie�anie folderu"
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1594
 msgid "Expunging folder"
 msgstr "Oczyszczanie folderu"
 
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Pobieranie listu %s"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Pobieranie %d list�w"
 
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1801
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Zapisywanie %d list�w"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13169,7 +13567,7 @@ msgstr ""
 "Nie mo�na utworzy� pliku wyj�ciowego: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13178,11 +13576,11 @@ msgstr ""
 "B��d przy zapisie list�w do: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "Zapisywanie za��cznika"
 
-#: mail/mail-ops.c:2041
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13191,54 +13589,54 @@ msgstr ""
 "Nie mo�na utworzy� pliku wyj�ciowego: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2071
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie mo�na zapisa� danych: %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Od��czanie od %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponowne nawi�zywanie po��czenia z %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "_Znajd�"
-
-#: mail/mail-search.c:137
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(List bez nazwy)"
 
-#: mail/mail-search.c:240
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "List bez nazwy"
 
-#: mail/mail-search.c:244
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "Pusty list"
 
-#: mail/mail-search.c:291
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "Wyszukiwanie w li�cie"
 
-#: mail/mail-search.c:321
+#: mail/mail-search.c:285
+msgid "Search"
+msgstr "Wyszukiwanie"
+
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "Z rozr�nianiem ma�ych i wielkich liter"
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr "Wyszukiwanie w prz�d"
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "Znajd�:"
 
-#: mail/mail-search.c:346
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "Dopasowania:"
 
@@ -13246,69 +13644,65 @@ msgstr "Dopasowania:"
 msgid "Cancelling..."
 msgstr "Anulowanie..."
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serwer: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "�cie�ka: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:252
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:293
+#: mail/mail-send-recv.c:297
 msgid "Send & Receive Mail"
 msgstr "Wysy�anie i odbi�r poczty"
 
-#: mail/mail-send-recv.c:295
+#: mail/mail-send-recv.c:299
 msgid "Cancel All"
 msgstr "Anuluj wszystko"
 
-#: mail/mail-send-recv.c:355
+#: mail/mail-send-recv.c:378
 msgid "Updating..."
 msgstr "Aktualizowanie..."
 
-#: 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 "Oczekiwanie..."
 
-#: mail/mail-session.c:221
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr "Operacja anulowana przez u�ytkownika."
 
-#: mail/mail-session.c:272
-msgid "_Remember this password"
-msgstr "_Zapami�tanie has�a"
-
-#: mail/mail-session.c:273
-#, fuzzy
-msgid "_Remember this password for the remainder of this session"
-msgstr "Zapami�tanie tego has�a na czas bie��cej sesji"
-
-#: mail/mail-session.c:330
+#: mail/mail-session.c:258
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Wprowad� has�o dla %s"
 
-#: mail/mail-session.c:333
+#: mail/mail-session.c:260
 msgid "Enter Password"
 msgstr "Wprowad� has�o"
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-session.c:280
+msgid "_Remember this password"
+msgstr "_Zapami�tanie has�a"
+
+#: mail/mail-session.c:281
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Zapami�tanie tego has�a na czas bie��cej sesji"
+
+#: mail/mail-signature-editor.c:80
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Nie mo�na zapisa� pliku z podpisem."
 
-#: mail/mail-signature-editor.c:175
-msgid "Save signature"
-msgstr "Zapisz podpis"
-
-#: 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"
@@ -13318,43 +13712,51 @@ msgstr ""
 "\n"
 "Czy chcesz je zapisa�?"
 
-#: 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 "Zapisz podpis"
+
+#: mail/mail-signature-editor.c:389
 #, fuzzy
 msgid "Edit signature"
 msgstr "Dodaj kryterium"
 
-#: 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 "Nazwa:"
 
-#: mail/mail-tools.c:262
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Przes�any list - %s"
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "Przes�any list"
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "Przes�any list"
 
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ustawianie vfolderu: %s"
 
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Aktualizowanie vfolder�w pod uri: %s"
 
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13367,97 +13769,97 @@ msgstr ""
 "   \"%s\"\n"
 "I zosta�y zaktualizowane."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "VFoldery"
 
-#: mail/mail-vfolder.c:819
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "vFoldery"
 
-#: mail/mail-vfolder.c:861
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Modyfikacja VFoldera"
 
-#: mail/mail-vfolder.c:877
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pr�ba zmodyfikowania vfoldera \"%s\", kt�ry nie istnieje"
 
-#: mail/mail-vfolder.c:931
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Nowy VFolder"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(Brak tematu)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - List"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:740
 msgid "Unseen"
 msgstr "Niewidziany"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:741
 msgid "Seen"
 msgstr "Widziany"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr "Z odpowiedzi�"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:743
 msgid "Multiple Unseen Messages"
 msgstr "Wiele niewidzianych list�w"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:744
 msgid "Multiple Messages"
 msgstr "Wiele list�w"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:748
 msgid "Lowest"
 msgstr "Najni�szy"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:749
 msgid "Lower"
 msgstr "Ni�szy"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:753
 msgid "Higher"
 msgstr "Wy�szy"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:754
 msgid "Highest"
 msgstr "Najwy�szy"
 
-#: 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 "Dzi� %k:%M"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Wczoraj %k:%M"
 
-#: mail/message-list.c:1094
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1102
+#: mail/message-list.c:1116
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: 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 "Aktualizowanie zestawienia list�w"
 
@@ -13491,47 +13893,47 @@ msgstr "Odebrany"
 msgid "Size"
 msgstr "Rozmiar"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:62
 #, fuzzy
 msgid "Call"
 msgstr "Telefon kontaktowy"
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Prze�lij"
 
-#: 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 "Informacje o �r�dle"
 
-#: 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 "Prze�lij"
 
-#: 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 "Odpowiedz"
 
-#: 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 "Wszystkim"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:71
 #, fuzzy
 msgid "Review"
 msgstr "Podgl�d"
 
-#: 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 ""
 
@@ -13561,53 +13963,44 @@ msgstr "Nale�ne "
 msgid "_Flag:"
 msgstr "Oznaczony"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Analizowanie folder�w pod %s na \"%s\""
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Analizowanie g��wnych folder�w na \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Subskrybowanie folderu \"%s\""
 
-#: mail/subscribe-dialog.c:338
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Odsubskrybowywanie folderu \"%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 "Folder"
 
-#: mail/subscribe-dialog.c:1450
+#: mail/subscribe-dialog.c:1389
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Zapisz w folderze..."
 
-#: mail/subscribe-dialog.c:1557
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Nie wybrano serwera"
 
-#: mail/subscribe-dialog.c:1621
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Wybierz serwer."
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "All folders"
-msgstr "Wszystkie foldery"
-
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "Apri file"
-msgstr "Kwiecie�"
-
 #: 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
@@ -13618,62 +14011,46 @@ msgid "Close"
 msgstr "Zamknij"
 
 #: mail/subscribe-dialog.glade.h:4
-msgid "Display Options"
-msgstr "Opcje wy�wietlania"
-
-#: mail/subscribe-dialog.glade.h:5
-msgid "Folders whose names begin with:"
-msgstr "Foldery o nazwach rozpoczynaj�cych si� od:"
-
-#: mail/subscribe-dialog.glade.h:6
 msgid "Manage Subscriptions"
 msgstr "Zarz�dzanie subskrybcjami"
 
-#: 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 "Od�wie� list�"
 
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:6
 #, fuzzy
 msgid "S_elect server: "
 msgstr "Usuni�ty"
 
-#: mail/subscribe-dialog.glade.h:9
-#, fuzzy
-msgid "Salve file"
-msgstr "Wyb�r pliku"
-
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "_Zasubskrybuj"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "O_dsubskrybuj"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Configuration control for the Evolution Summary."
-msgstr "Formant konfiguracji Zestawienia Evolution"
-
-#: 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 "Konfiguracja  wygl�du Zestawienia Evolution"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
-msgid "Evolution Summary component."
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Summary"
 msgstr "Komponent Zestawienia 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 "Generator formantu zada� Evolution"
+msgid "Evolution Summary component"
+msgstr "Komponent Zestawienia 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 "Generator komponentu zestawienia poczty."
+msgid "Evolution Summary configuration control"
+msgstr "Generator formantu zada� Evolution"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 msgid "Summary Preferences"
 msgstr "Ustawienia zestawienia"
 
@@ -17076,7 +17453,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 "Hail"
 
@@ -18771,6000 +19148,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 "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-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 "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 "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 "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 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 "Naha 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 "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 "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 "North 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 "North 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 "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"
 
 # [cyba] Nie mam pewno�ci, ale jest zatoka Cooka, cie�nina, g�ry, wi�c chyba...
-#: 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 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 "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 "People's Republic of China"
 
-#: 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 "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 "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 ""
 
-#: 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-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 "Russia"
 
-#: 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-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 "South Carolina"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
 msgid "South Dakota"
 msgstr "South 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 ""
 
-#: 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 ""
 
-#: 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 "United Arab Emirates "
 
-#: 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 "Folder zawieraj�cy Zestawienie 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 "Terminy"
 
-#: my-evolution/e-summary-calendar.c:382
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
 msgstr "Brak termin�w"
 
-#: my-evolution/e-summary-calendar.c:418
+#: my-evolution/e-summary-calendar.c:405
 msgid "%k:%M %d %B"
 msgstr "%d %B, %k:%M"
 
 # [cyba] Wypada zostawi� ten format 12-godzinny, bo jest te� alternatywa (z %k) wybierana przez program
-#: 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 "%d %B, %l:%M"
 
-#: my-evolution/e-summary-calendar.c:438
+#: my-evolution/e-summary-calendar.c:425
 msgid "No description"
 msgstr "Brak opisu"
 
-#: my-evolution/e-summary-mail.c:153
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "Zestawienie poczty"
 
-#: 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 "Lokalne foldery"
 
-#. 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 "EPGD:EPKK:EPWA"
-
-#: my-evolution/e-summary-preferences.c:584
+#: my-evolution/e-summary-preferences.c:356
 msgid "Dictionary.com Word of the Day"
 msgstr "S�owo dnia Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:602
+#: my-evolution/e-summary-preferences.c:374
 msgid "Quotes of the Day"
 msgstr "Cytaty dnia"
 
-#: my-evolution/e-summary-preferences.c:840
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr "Nowe �r�d�o nowo�ci"
 
-#: 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 "Podaj URL �r�d�a nowo�ci, kt�re chcesz doda�"
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr "B��d przy pobieraniu RDF-a"
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr "�r�d�o nowo�ci"
 
-#: 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 "Dodaj"
 
-#: 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 "�nieg"
 
-#: my-evolution/e-summary-tasks.c:328
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "Brak zada�"
 
-#: my-evolution/e-summary-tasks.c:372
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(Brak opisu)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:73
 msgid "My Weather"
 msgstr "Moja pogoda"
 
-#: 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 "Pogoda"
 
-#: 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 "EPGD:EPKK:EPWA"
+
+#: 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 "Poczekaj chwil�..."
 
-#: 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 "Wydrukuj"
 
-#: my-evolution/e-summary.c:640
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Wydrukowanie zestawienia nie powiod�o si�"
 
-#: my-evolution/main.c:68
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "Komponent zestawienia wykonawczego nie m�g� zainicjowa� Bonobo.\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 "w�z�y"
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "kph"
 msgstr "km/h"
 
 # [cyba] mo�e raczej calHg??
-#: 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 "mile"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "kilometers"
 msgstr "kilometry"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Clear sky"
 msgstr "Czyste niebo"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Broken clouds"
 msgstr "Fragmentaryczne chmury"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Scattered clouds"
 msgstr "Rzadkie chmury"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Few clouds"
 msgstr "Kilka chmur"
 
-#: my-evolution/metar.c:48
+#: my-evolution/metar.c:49
 msgid "Overcast"
 msgstr "Zachmurzenie"
 
-#: 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 "Niepoprawna warto��"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Variable"
 msgstr "Zmienny"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North"
 msgstr "P�noc"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North - NorthEast"
 msgstr "P�noc - p�nocny wsch�d"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Northeast"
 msgstr "P�nocny wsch�d"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - NorthEast"
 msgstr "Wsch�d - p�nocny wsch�d"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East"
 msgstr "Wsch�d"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East - Southeast"
 msgstr "Wsch�d - po�udniowy wsch�d"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southeast"
 msgstr "Po�udniowy wsch�d"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southeast"
 msgstr "Po�udnie - po�udniowy wsch�d"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South"
 msgstr "Po�udnie"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South - Southwest"
 msgstr "Po�udnie - po�udniowy zach�d"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Southwest"
 msgstr "Po�udniowy zach�d"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Southwest"
 msgstr "Zach�d - po�udniowy zach�d"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West"
 msgstr "Zach�d"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West - Northwest"
 msgstr "Zach�d - p�nocny zach�d"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "Northwest"
 msgstr "P�nocny zach�d"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "North - Northwest"
 msgstr "P�noc - p�nocny zach�d"
 
 #. DRIZZLE
-#: my-evolution/metar.c:127
+#: my-evolution/metar.c:128
 msgid "Drizzle"
 msgstr "M�awka"
 
-#: my-evolution/metar.c:128
+#: my-evolution/metar.c:129
 msgid "Drizzle in the vicinity"
 msgstr "Nadchodz�ca m�awka"
 
-#: my-evolution/metar.c:129
+#: my-evolution/metar.c:130
 msgid "Light drizzle"
 msgstr "Lekka m�awka"
 
-#: my-evolution/metar.c:130
+#: my-evolution/metar.c:131
 msgid "Moderate drizzle"
 msgstr "Umiarkowana m�awka"
 
-#: my-evolution/metar.c:131
+#: my-evolution/metar.c:132
 msgid "Heavy drizzle"
 msgstr "Obfita m�awka"
 
-#: my-evolution/metar.c:132
+#: my-evolution/metar.c:133
 msgid "Shallow drizzle"
 msgstr "S�aba m�awka"
 
-#: my-evolution/metar.c:133
+#: my-evolution/metar.c:134
 msgid "Patches of drizzle"
 msgstr "�agodna m�awka"
 
-#: my-evolution/metar.c:134
+#: my-evolution/metar.c:135
 msgid "Partial drizzle"
 msgstr "Cz�ciowa m�awka"
 
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
 msgid "Thunderstorm"
 msgstr "Burza"
 
-#: my-evolution/metar.c:136
+#: my-evolution/metar.c:137
 msgid "Windy drizzle"
 msgstr "Wietrzna m�awka"
 
-#: my-evolution/metar.c:137
+#: my-evolution/metar.c:138
 msgid "Showers"
 msgstr "Kr�tkotrwa�a m�awka"
 
-#: my-evolution/metar.c:138
+#: my-evolution/metar.c:139
 msgid "Drifting drizzle"
 msgstr "Zbli�aj�ca si� m�awka"
 
-#: my-evolution/metar.c:139
+#: my-evolution/metar.c:140
 msgid "Freezing drizzle"
 msgstr "Utrzymuj�ca si� m�awka"
 
 #. RAIN
-#: my-evolution/metar.c:142
+#: my-evolution/metar.c:143
 msgid "Rain"
 msgstr "Deszcz"
 
-#: my-evolution/metar.c:143
+#: my-evolution/metar.c:144
 msgid "Rain in the vicinity"
 msgstr "Nadchodz�cy deszcz"
 
-#: my-evolution/metar.c:144
+#: my-evolution/metar.c:145
 msgid "Light rain"
 msgstr "Lekki deszcz"
 
-#: my-evolution/metar.c:145
+#: my-evolution/metar.c:146
 msgid "Moderate rain"
 msgstr "Umiarkowany deszcz"
 
-#: my-evolution/metar.c:146
+#: my-evolution/metar.c:147
 msgid "Heavy rain"
 msgstr "Obfity deszcz"
 
-#: my-evolution/metar.c:147
+#: my-evolution/metar.c:148
 msgid "Shallow rain"
 msgstr "S�aby deszcz"
 
-#: my-evolution/metar.c:148
+#: my-evolution/metar.c:149
 msgid "Patches of rain"
 msgstr "�agodny deszcz"
 
-#: my-evolution/metar.c:149
+#: my-evolution/metar.c:150
 msgid "Partial rainfall"
 msgstr "Cz�ciowe opady deszczu"
 
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:152
 msgid "Blowing rainfall"
 msgstr "Szalej�ce opady deszczu"
 
-#: my-evolution/metar.c:152
+#: my-evolution/metar.c:153
 msgid "Rain showers"
 msgstr "Kr�tkotrwa�y deszcz"
 
-#: my-evolution/metar.c:153
+#: my-evolution/metar.c:154
 msgid "Drifting rain"
 msgstr "Zbli�aj�cy si� deszcz"
 
-#: my-evolution/metar.c:154
+#: my-evolution/metar.c:155
 msgid "Freezing rain"
 msgstr "Utrzymuj�cy si� deszcz"
 
 #. SNOW
-#: my-evolution/metar.c:157
+#: my-evolution/metar.c:158
 msgid "Snow"
 msgstr "�nieg"
 
-#: my-evolution/metar.c:158
+#: my-evolution/metar.c:159
 msgid "Snow in the vicinity"
 msgstr "Nadchodz�cy �nieg"
 
-#: my-evolution/metar.c:159
+#: my-evolution/metar.c:160
 msgid "Light snow"
 msgstr "Lekki �nieg"
 
-#: my-evolution/metar.c:160
+#: my-evolution/metar.c:161
 msgid "Moderate snow"
 msgstr "Umiarkowany �nieg"
 
-#: my-evolution/metar.c:161
+#: my-evolution/metar.c:162
 msgid "Heavy snow"
 msgstr "Obfity �nieg"
 
-#: my-evolution/metar.c:162
+#: my-evolution/metar.c:163
 msgid "Shallow snow"
 msgstr "S�aby �nieg"
 
-#: my-evolution/metar.c:163
+#: my-evolution/metar.c:164
 msgid "Patches of snow"
 msgstr "�agodny �nieg"
 
-#: my-evolution/metar.c:164
+#: my-evolution/metar.c:165
 msgid "Partial snowfall"
 msgstr "Cz�ciowe opady �niegu"
 
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr "Burza �nie�na"
 
-#: my-evolution/metar.c:166
+#: my-evolution/metar.c:167
 msgid "Blowing snowfall"
 msgstr "Szalej�ce opady �niegu"
 
-#: my-evolution/metar.c:167
+#: my-evolution/metar.c:168
 msgid "Snow showers"
 msgstr "Kr�tkotrwa�y �nieg"
 
-#: my-evolution/metar.c:168
+#: my-evolution/metar.c:169
 msgid "Drifting snow"
 msgstr "Zbli�aj�cy si� �nieg"
 
-#: my-evolution/metar.c:169
+#: my-evolution/metar.c:170
 msgid "Freezing snow"
 msgstr "Utrzymuj�cy si� �nieg"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:172
+#: my-evolution/metar.c:173
 msgid "Snow grains"
 msgstr "Ziarna �niegu"
 
-#: my-evolution/metar.c:173
+#: my-evolution/metar.c:174
 msgid "Snow grains in the vicinity"
 msgstr "Nadchodz�ce ziarna �niegu"
 
-#: my-evolution/metar.c:174
+#: my-evolution/metar.c:175
 msgid "Light snow grains"
 msgstr "Lekkie ziarna �niegu"
 
-#: my-evolution/metar.c:175
+#: my-evolution/metar.c:176
 msgid "Moderate snow grains"
 msgstr "Umiarkowane ziarna �niegu"
 
-#: my-evolution/metar.c:176
+#: my-evolution/metar.c:177
 msgid "Heavy snow grains"
 msgstr "Obfite ziarna �niegu"
 
-#: my-evolution/metar.c:177
+#: my-evolution/metar.c:178
 msgid "Shallow snow grains"
 msgstr "S�abe ziarna �niegu"
 
-#: my-evolution/metar.c:178
+#: my-evolution/metar.c:179
 msgid "Patches of snow grains"
 msgstr "�agodne ziarna �niegu"
 
-#: my-evolution/metar.c:179
+#: my-evolution/metar.c:180
 msgid "Partial snow grains"
 msgstr "Cz�ciowe ziarna �niegu"
 
-#: my-evolution/metar.c:181
+#: my-evolution/metar.c:182
 msgid "Blowing snow grains"
 msgstr "Szalej�ce ziarna �niegu"
 
-#: my-evolution/metar.c:182
+#: my-evolution/metar.c:183
 msgid "Snow grain showers"
 msgstr "Kr�tkotrwa�e ziarna �niegu"
 
-#: my-evolution/metar.c:183
+#: my-evolution/metar.c:184
 msgid "Drifting snow grains"
 msgstr "Zbli�aj�ce si� ziarna �niegu"
 
-#: my-evolution/metar.c:184
+#: my-evolution/metar.c:185
 msgid "Freezing snow grains"
 msgstr "Utrzymuj�ce si� ziarna �niegu"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:187
+#: my-evolution/metar.c:188
 msgid "Ice crystals"
 msgstr "Kryszta�ki lodowe"
 
-#: my-evolution/metar.c:188
+#: my-evolution/metar.c:189
 msgid "Ice crystals in the vicinity"
 msgstr "Nadchodz�ce kryszta�ki lodowe"
 
-#: my-evolution/metar.c:189
+#: my-evolution/metar.c:190
 msgid "Few ice crystals"
 msgstr "Nieco kryszta�k�w lodowych"
 
-#: my-evolution/metar.c:190
+#: my-evolution/metar.c:191
 msgid "Moderate ice crystals"
 msgstr "Umiarkowane kryszta�ki lodowe"
 
-#: my-evolution/metar.c:191
+#: my-evolution/metar.c:192
 msgid "Heavy ice crystals"
 msgstr "Obfite kryszta�ki lodowe"
 
-#: my-evolution/metar.c:193
+#: my-evolution/metar.c:194
 msgid "Patches of ice crystals"
 msgstr "�agodne kryszta�ki lodowe"
 
-#: my-evolution/metar.c:194
+#: my-evolution/metar.c:195
 msgid "Partial ice crystals"
 msgstr "Cz�ciowe kryszta�ki lodowe"
 
-#: my-evolution/metar.c:195
+#: my-evolution/metar.c:196
 msgid "Ice crystal storm"
 msgstr "Burza z kryszta�kami lodowymi"
 
-#: my-evolution/metar.c:196
+#: my-evolution/metar.c:197
 msgid "Blowing ice crystals"
 msgstr "Szalej�ce kryszta�ki lodowe"
 
-#: my-evolution/metar.c:197
+#: my-evolution/metar.c:198
 msgid "Showers of ice crystals"
 msgstr "Kr�tkotrwa�e kryszta�ki lodu"
 
-#: my-evolution/metar.c:198
+#: my-evolution/metar.c:199
 msgid "Drifting ice crystals"
 msgstr "Zbli�aj�ce si� kryszta�ki lodu"
 
-#: my-evolution/metar.c:199
+#: my-evolution/metar.c:200
 msgid "Freezing ice crystals"
 msgstr "Utrzymuj�ce si� krzyszta�ki lodu"
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:202
+#: my-evolution/metar.c:203
 msgid "Ice pellets"
 msgstr "Kulki lodowe"
 
-#: my-evolution/metar.c:203
+#: my-evolution/metar.c:204
 msgid "Ice pellets in the vicinity"
 msgstr "Nadchodz�ce kulki lodowe"
 
-#: my-evolution/metar.c:204
+#: my-evolution/metar.c:205
 msgid "Few ice pellets"
 msgstr "Nieco kulek lodowych"
 
-#: my-evolution/metar.c:205
+#: my-evolution/metar.c:206
 msgid "Moderate ice pellets"
 msgstr "Umiarkowane kulki lodowe"
 
-#: my-evolution/metar.c:206
+#: my-evolution/metar.c:207
 msgid "Heavy ice pellets"
 msgstr "Obfite kulki lodowe"
 
-#: my-evolution/metar.c:207
+#: my-evolution/metar.c:208
 msgid "Shallow ice pellets"
 msgstr "S�abe kulki lodowe"
 
-#: my-evolution/metar.c:208
+#: my-evolution/metar.c:209
 msgid "Patches of ice pellets"
 msgstr "�agodne kulki lodowe"
 
-#: my-evolution/metar.c:209
+#: my-evolution/metar.c:210
 msgid "Partial ice pellets"
 msgstr "Cz�ciowe kulki lodowe"
 
-#: my-evolution/metar.c:210
+#: my-evolution/metar.c:211
 msgid "Ice pellet storm"
 msgstr "Burza z kulkami lodowymi"
 
-#: my-evolution/metar.c:211
+#: my-evolution/metar.c:212
 msgid "Blowing ice pellets"
 msgstr "Szalej�ce kulki lodowe"
 
-#: my-evolution/metar.c:212
+#: my-evolution/metar.c:213
 msgid "Showers of ice pellets"
 msgstr "Kr�tkotrwa�e kulki lodowe"
 
-#: my-evolution/metar.c:213
+#: my-evolution/metar.c:214
 msgid "Drifting ice pellets"
 msgstr "Zbli�aj�ce si� kulki lodowe"
 
-#: my-evolution/metar.c:214
+#: my-evolution/metar.c:215
 msgid "Freezing ice pellets"
 msgstr "Utrzymuj�ce si� kulki lodowe"
 
-#: my-evolution/metar.c:218
+#: my-evolution/metar.c:219
 msgid "Hail in the vicinity"
 msgstr "Nadchodz�cy grad"
 
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
+#: my-evolution/metar.c:220 my-evolution/metar.c:235
 msgid "Light hail"
 msgstr "Lekki grad"
 
-#: my-evolution/metar.c:220
+#: my-evolution/metar.c:221
 msgid "Moderate hail"
 msgstr "Umiarkowany grad"
 
-#: my-evolution/metar.c:221
+#: my-evolution/metar.c:222
 msgid "Heavy hail"
 msgstr "Obfity grad"
 
-#: my-evolution/metar.c:222
+#: my-evolution/metar.c:223
 msgid "Shallow hail"
 msgstr "S�aby grad"
 
-#: my-evolution/metar.c:223
+#: my-evolution/metar.c:224
 msgid "Patches of hail"
 msgstr "�agodny grad"
 
-#: my-evolution/metar.c:224
+#: my-evolution/metar.c:225
 msgid "Partial hail"
 msgstr "Cz�ciowy grad"
 
-#: my-evolution/metar.c:225
+#: my-evolution/metar.c:226
 msgid "Hailstorm"
 msgstr "Burza gradowa"
 
-#: my-evolution/metar.c:226
+#: my-evolution/metar.c:227
 msgid "Blowing hail"
 msgstr "Szalej�cy grad"
 
-#: my-evolution/metar.c:227
+#: my-evolution/metar.c:228
 msgid "Hail showers"
 msgstr "Kr�tkotrwa�y grad"
 
-#: my-evolution/metar.c:228
+#: my-evolution/metar.c:229
 msgid "Drifting hail"
 msgstr "Zbli�aj�cy si� grad"
 
-#: my-evolution/metar.c:229
+#: my-evolution/metar.c:230
 msgid "Freezing hail"
 msgstr "Utrzymuj�cy si� grad"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:232
+#: my-evolution/metar.c:233
 msgid "Small hail"
 msgstr "Gradzik"
 
-#: my-evolution/metar.c:233
+#: my-evolution/metar.c:234
 msgid "Small hail in the vicinity"
 msgstr "Nadchodz�cy gradzik"
 
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:236
 msgid "Moderate small hail"
 msgstr "Umiarkowany gradzik"
 
-#: my-evolution/metar.c:236
+#: my-evolution/metar.c:237
 msgid "Heavy small hail"
 msgstr "Obfity gradzik"
 
-#: my-evolution/metar.c:237
+#: my-evolution/metar.c:238
 msgid "Shallow small hail"
 msgstr "S�aby gradzik"
 
-#: my-evolution/metar.c:238
+#: my-evolution/metar.c:239
 msgid "Patches of small hail"
 msgstr "�agodny gradzik"
 
-#: my-evolution/metar.c:239
+#: my-evolution/metar.c:240
 msgid "Partial small hail"
 msgstr "Cz�ciowy gradzik"
 
-#: my-evolution/metar.c:240
+#: my-evolution/metar.c:241
 msgid "Small hailstorm"
 msgstr "Ma�a burza gradowa"
 
-#: my-evolution/metar.c:241
+#: my-evolution/metar.c:242
 msgid "Blowing small hail"
 msgstr "Szalej�cy gradzik"
 
-#: my-evolution/metar.c:242
+#: my-evolution/metar.c:243
 msgid "Showers of small hail"
 msgstr "Kr�tkotrwa�y gradzik"
 
-#: my-evolution/metar.c:243
+#: my-evolution/metar.c:244
 msgid "Drifting small hail"
 msgstr "Zbli�aj�cy si� gradzik"
 
-#: my-evolution/metar.c:244
+#: my-evolution/metar.c:245
 msgid "Freezing small hail"
 msgstr "Utrzymuj�cy si� gradzik"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:247
+#: my-evolution/metar.c:248
 msgid "Unknown precipitation"
 msgstr "Nieznane opady"
 
-#: my-evolution/metar.c:248
+#: my-evolution/metar.c:249
 msgid "Precipitation in the vicinity"
 msgstr "Nadchodz�ce opady"
 
-#: my-evolution/metar.c:249
+#: my-evolution/metar.c:250
 msgid "Light precipitation"
 msgstr "Lekkie opady"
 
-#: my-evolution/metar.c:250
+#: my-evolution/metar.c:251
 msgid "Moderate precipitation"
 msgstr "Umiarkowane opady"
 
-#: my-evolution/metar.c:251
+#: my-evolution/metar.c:252
 msgid "Heavy precipitation"
 msgstr "Obfite opady"
 
-#: my-evolution/metar.c:252
+#: my-evolution/metar.c:253
 msgid "Shallow precipitation"
 msgstr "S�abe opady"
 
-#: my-evolution/metar.c:253
+#: my-evolution/metar.c:254
 msgid "Patches of precipitation"
 msgstr "�agodne opady"
 
-#: my-evolution/metar.c:254
+#: my-evolution/metar.c:255
 msgid "Partial precipitation"
 msgstr "Cz�ciowe opady"
 
-#: my-evolution/metar.c:255
+#: my-evolution/metar.c:256
 msgid "Unknown thunderstorm"
 msgstr "Nieznana burza"
 
-#: my-evolution/metar.c:256
+#: my-evolution/metar.c:257
 msgid "Blowing precipitation"
 msgstr "Szalej�ce opady"
 
-#: my-evolution/metar.c:257
+#: my-evolution/metar.c:258
 msgid "Showers, type unknown"
 msgstr "Kr�tkotrwa�e opady"
 
-#: my-evolution/metar.c:258
+#: my-evolution/metar.c:259
 msgid "Drifting precipitation"
 msgstr "Zbli�aj�ce si� opady"
 
-#: my-evolution/metar.c:259
+#: my-evolution/metar.c:260
 msgid "Freezing precipitation"
 msgstr "Utrzymuj�ce si� opady"
 
 #. MIST
-#: my-evolution/metar.c:262
+#: my-evolution/metar.c:263
 msgid "Mist"
 msgstr "Mgie�ka"
 
-#: my-evolution/metar.c:263
+#: my-evolution/metar.c:264
 msgid "Mist in the vicinity"
 msgstr "Nadchodz�ca mgie�ka"
 
-#: my-evolution/metar.c:264
+#: my-evolution/metar.c:265
 msgid "Light mist"
 msgstr "Lekka mgie�ka"
 
-#: my-evolution/metar.c:265
+#: my-evolution/metar.c:266
 msgid "Moderate mist"
 msgstr "Umiarkowana mgie�ka"
 
-#: my-evolution/metar.c:266
+#: my-evolution/metar.c:267
 msgid "Thick mist"
 msgstr "G�sta mgie�ka"
 
-#: my-evolution/metar.c:267
+#: my-evolution/metar.c:268
 msgid "Shallow mist"
 msgstr "S�aba mgie�ka"
 
-#: my-evolution/metar.c:268
+#: my-evolution/metar.c:269
 msgid "Patches of mist"
 msgstr "�agodna mgie�ka"
 
-#: my-evolution/metar.c:269
+#: my-evolution/metar.c:270
 msgid "Partial mist"
 msgstr "Cz�ciowa mgie�ka"
 
-#: my-evolution/metar.c:271
+#: my-evolution/metar.c:272
 msgid "Mist with wind"
 msgstr "Mgie�ka z wiatrem"
 
-#: my-evolution/metar.c:273
+#: my-evolution/metar.c:274
 msgid "Drifting mist"
 msgstr "Zbli�aj�ca si� mgie�ka"
 
-#: my-evolution/metar.c:274
+#: my-evolution/metar.c:275
 msgid "Freezing mist"
 msgstr "Utrzymuj�ca si� mgie�ka"
 
 #. FOG
-#: my-evolution/metar.c:277
+#: my-evolution/metar.c:278
 msgid "Fog"
 msgstr "Mg�a"
 
-#: my-evolution/metar.c:278
+#: my-evolution/metar.c:279
 msgid "Fog in the vicinity"
 msgstr "Nadchodz�ca mg�a"
 
-#: my-evolution/metar.c:279
+#: my-evolution/metar.c:280
 msgid "Light fog"
 msgstr "Lekka mg�a"
 
-#: my-evolution/metar.c:280
+#: my-evolution/metar.c:281
 msgid "Moderate fog"
 msgstr "Umiarkowana mg�a"
 
-#: my-evolution/metar.c:281
+#: my-evolution/metar.c:282
 msgid "Thick fog"
 msgstr "G�sta mg�a"
 
-#: my-evolution/metar.c:282
+#: my-evolution/metar.c:283
 msgid "Shallow fog"
 msgstr "S�aba mg�a"
 
-#: my-evolution/metar.c:283
+#: my-evolution/metar.c:284
 msgid "Patches of fog"
 msgstr "�agodna mg�a"
 
-#: my-evolution/metar.c:284
+#: my-evolution/metar.c:285
 msgid "Partial fog"
 msgstr "Cz�ciowa mg�a"
 
-#: my-evolution/metar.c:286
+#: my-evolution/metar.c:287
 msgid "Fog with wind"
 msgstr "Mg�a z wiatrem"
 
-#: my-evolution/metar.c:288
+#: my-evolution/metar.c:289
 msgid "Drifting fog"
 msgstr "Zbli�aj�ca si� mg�a"
 
-#: my-evolution/metar.c:289
+#: my-evolution/metar.c:290
 msgid "Freezing fog"
 msgstr "Utrzymuj�ca si� mg�a"
 
 #. SMOKE
-#: my-evolution/metar.c:292
+#: my-evolution/metar.c:293
 msgid "Smoke"
 msgstr "Dym"
 
-#: my-evolution/metar.c:293
+#: my-evolution/metar.c:294
 msgid "Smoke in the vicinity"
 msgstr "Nadchodz�cy dym"
 
-#: my-evolution/metar.c:294
+#: my-evolution/metar.c:295
 msgid "Thin smoke"
 msgstr "Rzadki dym"
 
-#: my-evolution/metar.c:295
+#: my-evolution/metar.c:296
 msgid "Moderate smoke"
 msgstr "Umiarkowany dym"
 
-#: my-evolution/metar.c:296
+#: my-evolution/metar.c:297
 msgid "Thick smoke"
 msgstr "G�sty dym"
 
-#: my-evolution/metar.c:297
+#: my-evolution/metar.c:298
 msgid "Shallow smoke"
 msgstr "S�aby dym"
 
-#: my-evolution/metar.c:298
+#: my-evolution/metar.c:299
 msgid "Patches of smoke"
 msgstr "�agodny dym"
 
-#: my-evolution/metar.c:299
+#: my-evolution/metar.c:300
 msgid "Partial smoke"
 msgstr "Cz�ciowy dym"
 
-#: my-evolution/metar.c:300
+#: my-evolution/metar.c:301
 msgid "Thunderous smoke"
 msgstr "Og�uszaj�cy dym"
 
-#: my-evolution/metar.c:301
+#: my-evolution/metar.c:302
 msgid "Smoke with wind"
 msgstr "Dym z wiatrem"
 
-#: my-evolution/metar.c:303
+#: my-evolution/metar.c:304
 msgid "Drifting smoke"
 msgstr "Zbli�aj�cy si� dym"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:307
+#: my-evolution/metar.c:308
 msgid "Volcanic ash"
 msgstr "Popi� wulkaniczny"
 
-#: my-evolution/metar.c:308
+#: my-evolution/metar.c:309
 msgid "Volcanic ash in the vicinity"
 msgstr "Nadchodz�cy popi� wulkaniczny"
 
-#: my-evolution/metar.c:310
+#: my-evolution/metar.c:311
 msgid "Moderate volcanic ash"
 msgstr "Umiarkowany popi� wulkaniczny"
 
-#: my-evolution/metar.c:311
+#: my-evolution/metar.c:312
 msgid "Thick volcanic ash"
 msgstr "G�sty popi� wulkaniczny"
 
-#: my-evolution/metar.c:312
+#: my-evolution/metar.c:313
 msgid "Shallow volcanic ash"
 msgstr "S�aby popi� wulkaniczny"
 
-#: my-evolution/metar.c:313
+#: my-evolution/metar.c:314
 msgid "Patches of volcanic ash"
 msgstr "�agodny popi� wulaniczny"
 
-#: my-evolution/metar.c:314
+#: my-evolution/metar.c:315
 msgid "Partial volcanic ash"
 msgstr "Cz�ciowy popi� wulkaniczny"
 
-#: my-evolution/metar.c:315
+#: my-evolution/metar.c:316
 msgid "Thunderous volcanic ash"
 msgstr "Og�uszaj�cy popi� wulkaniczny"
 
-#: my-evolution/metar.c:316
+#: my-evolution/metar.c:317
 msgid "Blowing volcanic ash"
 msgstr "Szalej�cy popi� wulkaniczny"
 
-#: my-evolution/metar.c:317
+#: my-evolution/metar.c:318
 msgid "Showers of volcanic ash"
 msgstr "Kr�tkotrwa�y popi� wulkaniczny"
 
-#: my-evolution/metar.c:318
+#: my-evolution/metar.c:319
 msgid "Drifting volcanic ash"
 msgstr "Zbli�aj�cy si� popi� wulkaniczny"
 
-#: my-evolution/metar.c:319
+#: my-evolution/metar.c:320
 msgid "Freezing volcanic ash"
 msgstr "Utrzymuj�cy si� popi� wulkaniczny"
 
 #. SAND
-#: my-evolution/metar.c:322
+#: my-evolution/metar.c:323
 msgid "Sand"
 msgstr "Piasek"
 
-#: my-evolution/metar.c:323
+#: my-evolution/metar.c:324
 msgid "Sand in the vicinity"
 msgstr "Nadchodz�cy piasek"
 
-#: my-evolution/metar.c:324
+#: my-evolution/metar.c:325
 msgid "Light sand"
 msgstr "Lekki piasek"
 
-#: my-evolution/metar.c:325
+#: my-evolution/metar.c:326
 msgid "Moderate sand"
 msgstr "Umiarkowany piasek"
 
-#: my-evolution/metar.c:326
+#: my-evolution/metar.c:327
 msgid "Heavy sand"
 msgstr "Obfity piasek"
 
-#: my-evolution/metar.c:328
+#: my-evolution/metar.c:329
 msgid "Patches of sand"
 msgstr "�agodny piasek"
 
-#: my-evolution/metar.c:329
+#: my-evolution/metar.c:330
 msgid "Partial sand"
 msgstr "Cz�ciowy piasek"
 
-#: my-evolution/metar.c:331
+#: my-evolution/metar.c:332
 msgid "Blowing sand"
 msgstr "Szalej�cy piasek"
 
-#: my-evolution/metar.c:333
+#: my-evolution/metar.c:334
 msgid "Drifting sand"
 msgstr "Zbli�aj�cy si� piasek"
 
 #. HAZE
-#: my-evolution/metar.c:337
+#: my-evolution/metar.c:338
 msgid "Haze"
 msgstr "Zamglenie"
 
-#: my-evolution/metar.c:338
+#: my-evolution/metar.c:339
 msgid "Haze in the vicinity"
 msgstr "Nadchodz�ce zamglenie"
 
-#: my-evolution/metar.c:339
+#: my-evolution/metar.c:340
 msgid "Light haze"
 msgstr "Lekkie zamglenie"
 
-#: my-evolution/metar.c:340
+#: my-evolution/metar.c:341
 msgid "Moderate haze"
 msgstr "Umiarkowane zamglenie"
 
-#: my-evolution/metar.c:341
+#: my-evolution/metar.c:342
 msgid "Thick haze"
 msgstr "G�ste zamglenie"
 
-#: my-evolution/metar.c:342
+#: my-evolution/metar.c:343
 msgid "Shallow haze"
 msgstr "S�abe zamglenie"
 
-#: my-evolution/metar.c:343
+#: my-evolution/metar.c:344
 msgid "Patches of haze"
 msgstr "�agodne zamglenie"
 
-#: my-evolution/metar.c:344
+#: my-evolution/metar.c:345
 msgid "Partial haze"
 msgstr "Cz�ciowe zamglenie"
 
-#: my-evolution/metar.c:346
+#: my-evolution/metar.c:347
 msgid "Haze with wind"
 msgstr "Zamglenie z wiatrem"
 
-#: my-evolution/metar.c:348
+#: my-evolution/metar.c:349
 msgid "Drifting haze"
 msgstr "Zbli�aj�ce si� zamglenie"
 
-#: my-evolution/metar.c:349
+#: my-evolution/metar.c:350
 msgid "Freezing haze"
 msgstr "Utrzymuj�ce si� zamglenie"
 
 #. SPRAY
-#: my-evolution/metar.c:352
+#: my-evolution/metar.c:353
 msgid "Spray"
 msgstr "Py� wodny"
 
-#: my-evolution/metar.c:353
+#: my-evolution/metar.c:354
 msgid "Spray in the vicinity"
 msgstr "Nadchodz�cy py� wodny"
 
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
 msgid "Light spray"
 msgstr "Lekki py� wodny"
 
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
 msgid "Moderate spray"
 msgstr "Umiarkowany py� wodny"
 
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
 msgid "Heavy spray"
 msgstr "Obfity py� wodny"
 
-#: my-evolution/metar.c:357
+#: my-evolution/metar.c:358
 msgid "Shallow spray"
 msgstr "S�aby py� wodny"
 
-#: my-evolution/metar.c:358
+#: my-evolution/metar.c:359
 msgid "Patches of spray"
 msgstr "�agodny py� wodny"
 
-#: my-evolution/metar.c:359
+#: my-evolution/metar.c:360
 msgid "Partial spray"
 msgstr "Cz�ciowy py� wodny"
 
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
 msgid "Blowing spray"
 msgstr "Szalej�cy py� wodny"
 
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
 msgid "Drifting spray"
 msgstr "Zbli�aj�cy si� py� wodny"
 
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
 msgid "Freezing spray"
 msgstr "Utrzymuj�cy si� py� wodny"
 
 #. DUST
-#: my-evolution/metar.c:367
+#: my-evolution/metar.c:368
 msgid "Dust"
 msgstr "Tumany kurzu"
 
-#: my-evolution/metar.c:368
+#: my-evolution/metar.c:369
 msgid "Dust in the vicinity"
 msgstr "Nadchodz�ce tumany kurzu"
 
-#: my-evolution/metar.c:369
+#: my-evolution/metar.c:370
 msgid "Light dust"
 msgstr "Lekkie tumany kurzu"
 
-#: my-evolution/metar.c:370
+#: my-evolution/metar.c:371
 msgid "Moderate dust"
 msgstr "Umiarkowane tumany kurzu"
 
-#: my-evolution/metar.c:371
+#: my-evolution/metar.c:372
 msgid "Heavy dust"
 msgstr "Obfite tumany kurzu"
 
-#: my-evolution/metar.c:373
+#: my-evolution/metar.c:374
 msgid "Patches of dust"
 msgstr "�agodne tumany kurzu"
 
-#: my-evolution/metar.c:374
+#: my-evolution/metar.c:375
 msgid "Partial dust"
 msgstr "Cz�ciowe tumany kurzu"
 
-#: my-evolution/metar.c:376
+#: my-evolution/metar.c:377
 msgid "Blowing dust"
 msgstr "Szalej�ce tumany kurzu"
 
-#: my-evolution/metar.c:378
+#: my-evolution/metar.c:379
 msgid "Drifting dust"
 msgstr "Zbli�aj�ce si� tumany kurzu"
 
 #. SQUALL
-#: my-evolution/metar.c:382
+#: my-evolution/metar.c:383
 msgid "Squall"
 msgstr "Nawa�nica"
 
-#: my-evolution/metar.c:383
+#: my-evolution/metar.c:384
 msgid "Squall in the vicinity"
 msgstr "Nadchodz�ca nawa�nica"
 
-#: my-evolution/metar.c:384
+#: my-evolution/metar.c:385
 msgid "Light squall"
 msgstr "Lekka nawa�nica"
 
-#: my-evolution/metar.c:385
+#: my-evolution/metar.c:386
 msgid "Moderate squall"
 msgstr "Umiarkowana nawa�nica"
 
-#: my-evolution/metar.c:386
+#: my-evolution/metar.c:387
 msgid "Heavy squall"
 msgstr "Obfita nawa�nica"
 
-#: my-evolution/metar.c:389
+#: my-evolution/metar.c:390
 msgid "Partial squall"
 msgstr "�agodna nawa�nica"
 
-#: my-evolution/metar.c:390
+#: my-evolution/metar.c:391
 msgid "Thunderous squall"
 msgstr "Og�uszaj�ca nawa�nica"
 
-#: my-evolution/metar.c:391
+#: my-evolution/metar.c:392
 msgid "Blowing squall"
 msgstr "Szalej�ca nawa�nica"
 
-#: my-evolution/metar.c:393
+#: my-evolution/metar.c:394
 msgid "Drifting squall"
 msgstr "Zbli�aj�ca si� nawa�nica"
 
-#: my-evolution/metar.c:394
+#: my-evolution/metar.c:395
 msgid "Freezing squall"
 msgstr "Utrzymuj�ca si� nawa�nica"
 
 #. SANDSTORM
-#: my-evolution/metar.c:397
+#: my-evolution/metar.c:398
 msgid "Sandstorm"
 msgstr "Burza piaskowa"
 
-#: my-evolution/metar.c:398
+#: my-evolution/metar.c:399
 msgid "Sandstorm in the vicinity"
 msgstr "Nadchodz�ca burza piaskowa"
 
-#: my-evolution/metar.c:399
+#: my-evolution/metar.c:400
 msgid "Light standstorm"
 msgstr "Lekka burza piaskowa"
 
-#: my-evolution/metar.c:400
+#: my-evolution/metar.c:401
 msgid "Moderate sandstorm"
 msgstr "Umiarkowana burza piaskowa"
 
-#: my-evolution/metar.c:401
+#: my-evolution/metar.c:402
 msgid "Heavy sandstorm"
 msgstr "Obfita burza piaskowa"
 
-#: my-evolution/metar.c:402
+#: my-evolution/metar.c:403
 msgid "Shallow sandstorm"
 msgstr "S�aba burza piaskowa"
 
-#: my-evolution/metar.c:404
+#: my-evolution/metar.c:405
 msgid "Partial sandstorm"
 msgstr "�agodna burza piaskowa"
 
-#: my-evolution/metar.c:405
+#: my-evolution/metar.c:406
 msgid "Thunderous sandstorm"
 msgstr "Og�uszaj�ca burza piaskowa"
 
-#: my-evolution/metar.c:406
+#: my-evolution/metar.c:407
 msgid "Blowing sandstorm"
 msgstr "Szalej�ca burza piaskowa"
 
-#: my-evolution/metar.c:408
+#: my-evolution/metar.c:409
 msgid "Drifting sandstorm"
 msgstr "Zbli�aj�ca si� burza piaskowa"
 
-#: my-evolution/metar.c:409
+#: my-evolution/metar.c:410
 msgid "Freezing sandstorm"
 msgstr "Utrzymuj�ca si� burza piaskowa"
 
 #. DUSTSTORM
-#: my-evolution/metar.c:412
+#: my-evolution/metar.c:413
 msgid "Duststorm"
 msgstr "Kurzawa"
 
-#: my-evolution/metar.c:413
+#: my-evolution/metar.c:414
 msgid "Duststorm in the vicinity"
 msgstr "Nadchodz�ca kurzawa"
 
-#: my-evolution/metar.c:414
+#: my-evolution/metar.c:415
 msgid "Light duststorm"
 msgstr "Lekka kurzawa"
 
-#: my-evolution/metar.c:415
+#: my-evolution/metar.c:416
 msgid "Moderate duststorm"
 msgstr "Umiarkowana kurzawa"
 
-#: my-evolution/metar.c:416
+#: my-evolution/metar.c:417
 msgid "Heavy duststorm"
 msgstr "Obfita kurzawa"
 
-#: my-evolution/metar.c:417
+#: my-evolution/metar.c:418
 msgid "Shallow duststorm"
 msgstr "S�aba kurzawa"
 
-#: my-evolution/metar.c:419
+#: my-evolution/metar.c:420
 msgid "Partial duststorm"
 msgstr "�agodna kurzawa"
 
-#: my-evolution/metar.c:420
+#: my-evolution/metar.c:421
 msgid "Thunderous duststorm"
 msgstr "Og�uszaj�ca kurzawa"
 
-#: my-evolution/metar.c:421
+#: my-evolution/metar.c:422
 msgid "Blowing duststorm"
 msgstr "Szalej�ca kurzawa"
 
-#: my-evolution/metar.c:423
+#: my-evolution/metar.c:424
 msgid "Drifting duststorm"
 msgstr "Zbli�aj�ca si� kurzawa"
 
-#: my-evolution/metar.c:424
+#: my-evolution/metar.c:425
 msgid "Freezing duststorm"
 msgstr "Utrzymuj�ca si� kurzawa"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
+#: my-evolution/metar.c:428
 msgid "Funnel cloud"
 msgstr "Tr�ba powietrzna"
 
-#: my-evolution/metar.c:428
+#: my-evolution/metar.c:429
 msgid "Funnel cloud in the vicinity"
 msgstr "Nadchodz�ca tr�ba powietrzna"
 
-#: my-evolution/metar.c:429
+#: my-evolution/metar.c:430
 msgid "Light funnel cloud"
 msgstr "Lekka tr�ba powietrzna"
 
-#: my-evolution/metar.c:430
+#: my-evolution/metar.c:431
 msgid "Moderate funnel cloud"
 msgstr "Umiarkowana tr�ba powietrzna"
 
-#: my-evolution/metar.c:431
+#: my-evolution/metar.c:432
 msgid "Thick funnel cloud"
 msgstr "G�sta tr�ba powietrzna"
 
-#: my-evolution/metar.c:432
+#: my-evolution/metar.c:433
 msgid "Shallow funnel cloud"
 msgstr "S�aba tr�ba powietrzna"
 
-#: my-evolution/metar.c:433
+#: my-evolution/metar.c:434
 msgid "Patches of funnel clouds"
 msgstr "�agodna tr�ba powietrzna"
 
-#: my-evolution/metar.c:434
+#: my-evolution/metar.c:435
 msgid "Partial funnel clouds"
 msgstr "Cz�ciowa tr�ba powietrzna"
 
-#: my-evolution/metar.c:436
+#: my-evolution/metar.c:437
 msgid "Funnel cloud w/ wind"
 msgstr "Tr�ba powietrzna z wiatrem"
 
-#: my-evolution/metar.c:438
+#: my-evolution/metar.c:439
 msgid "Drifting funnel cloud"
 msgstr "Zbli�aj�ca si� tr�ba powietrzna"
 
 #. 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 "Nadchodz�ce tornado"
 
-#: my-evolution/metar.c:445
+#: my-evolution/metar.c:446
 msgid "Moderate tornado"
 msgstr "Umiarkowane tornado"
 
-#: my-evolution/metar.c:446
+#: my-evolution/metar.c:447
 msgid "Raging tornado"
 msgstr "Rozszala�e tornado"
 
-#: my-evolution/metar.c:449
+#: my-evolution/metar.c:450
 msgid "Partial tornado"
 msgstr "Cz�ciowe tornado"
 
-#: my-evolution/metar.c:450
+#: my-evolution/metar.c:451
 msgid "Thunderous tornado"
 msgstr "Og�uszaj�ce tornado"
 
-#: my-evolution/metar.c:453
+#: my-evolution/metar.c:454
 msgid "Drifting tornado"
 msgstr "Zbli�aj�ce si� tornado"
 
-#: my-evolution/metar.c:454
+#: my-evolution/metar.c:455
 msgid "Freezing tornado"
 msgstr "Utrzymuj�ce si� tornado"
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:457
+#: my-evolution/metar.c:458
 msgid "Dust whirls"
 msgstr "Wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:458
+#: my-evolution/metar.c:459
 msgid "Dust whirls in the vicinity"
 msgstr "Nadchodz�ce wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:459
+#: my-evolution/metar.c:460
 msgid "Light dust whirls"
 msgstr "Lekkie wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:460
+#: my-evolution/metar.c:461
 msgid "Moderate dust whirls"
 msgstr "Umiarkowane wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:461
+#: my-evolution/metar.c:462
 msgid "Heavy dust whirls"
 msgstr "Obfite wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:462
+#: my-evolution/metar.c:463
 msgid "Shallow dust whirls"
 msgstr "S�abe wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:463
+#: my-evolution/metar.c:464
 msgid "Patches of dust whirls"
 msgstr "�agodne wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:464
+#: my-evolution/metar.c:465
 msgid "Partial dust whirls"
 msgstr "Cz�ciowe wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:466
+#: my-evolution/metar.c:467
 msgid "Blowing dust whirls"
 msgstr "Szalej�ce wiruj�ce tumany kurzu"
 
-#: my-evolution/metar.c:468
+#: my-evolution/metar.c:469
 msgid "Drifting dust whirls"
 msgstr "Zbli�aj�ce si� wiruj�ce tumany kurzu"
 
@@ -24861,31 +25229,33 @@ msgstr "P_lanowanie"
 msgid "_Weather"
 msgstr "Pogod_a"
 
-#: 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 "Evolution Shell"
+msgstr "Pow�oka Evolution."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Generator formantu zada� Evolution"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
 msgid "Folder Settings"
 msgstr "Ustawienia folder�w"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "The Evolution shell."
-msgstr "Pow�oka Evolution."
-
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr "Wy�wietl szczeg�y"
 
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
 msgid "Cancel Operation"
 msgstr "Anuluj operacj�"
 
-#: shell/e-folder-dnd-bridge.c:53
+#: shell/e-folder-dnd-bridge.c:55
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24894,53 +25264,37 @@ msgstr ""
 "Nie mo�na przenie�� folderu:\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 "Otw�rz za pomoc� programu %s..."
 
-#: shell/e-folder-list.c:312
+#: shell/e-folder-list.c:338
 msgid "Add a Folder"
 msgstr "Dodanie folderu"
 
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
 msgid "Drafts"
 msgstr "Szkice"
 
-#: 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 "Nadchodz�ce"
 
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:181
 msgid "Outbox"
 msgstr "Wychodz�ce"
 
-#: shell/e-local-storage.c:181
+#: shell/e-local-storage.c:182
 msgid "Sent"
 msgstr "Wys�ane"
 
-#: shell/e-setup.c:126
-msgid "Evolution installation"
-msgstr "Instalacja Evolution"
-
-#: shell/e-setup.c:130
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Uruchomiona w�a�nie nowa wersja Evolution wymaga zainstalowania\n"
-"dodatkowych plik�w w osobistym katalogu Evolution"
-
-#: shell/e-setup.c:131
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr "Kliknij \"OK\" aby zainstalowa� pliki lub \"Anuluj\" aby zako�czy�."
-
-#: shell/e-setup.c:171
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "Nie mo�na poprawnie uaktualni� plik�w"
 
-#: shell/e-setup.c:194
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -24951,7 +25305,7 @@ msgstr ""
 "%s\n"
 "B��d: %s"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -24960,40 +25314,7 @@ msgstr ""
 "Wyst�pi� b��d przy kopiowaniu plik�w do\n"
 "\"%s\"."
 
-#: shell/e-setup.c:282
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Nie mo�na utworzy� katalogu\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 ""
-"Katalog %s\n"
-"ma niew�a�ciwe uprawnienia. Ustaw prawa do jego odczytu\n"
-"oraz wykonania i uruchom Evolution ponownie."
-
-#: 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 ""
-"Aby Evolution mog�o poprawnie dzia�a�, nale�y usun��\n"
-"plik %s.\n"
-"Usu� ten plik i uruchom Evolution ponownie."
-
-#: shell/e-setup.c:329
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -25004,20 +25325,7 @@ msgstr ""
 "Przenie� go w inne miejsce, aby umo�liwi�\n"
 "instalacj� plik�w u�ytkownika 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 ""
-"Wykryto stary katalog Executive-Summary.\n"
-"Aby uruchomi� Evolution, konieczne jest\n"
-"jego usuni�cie.\n"
-"Czy chcesz usun�� ten katalog?"
-
-#: shell/e-setup.c:368
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25032,27 +25340,27 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Dostarczone przez"
 
-#: shell/e-shell-config-autocompletion.c:106
+#: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
 msgstr "Data zako�czenia"
 
-#: shell/e-shell-config-default-folders.c:133
+#: shell/e-shell-config-default-folders.c:149
 #, fuzzy
 msgid "Select Default Folder"
 msgstr "Wyb�r folderu"
 
-#: shell/e-shell-config-folder-settings.c:71
+#: shell/e-shell-config-folder-settings.c:70
 #, fuzzy
 msgid "Default Folders"
 msgstr "Foldery specjalne"
 
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
 #, fuzzy
 msgid "Offline Folders"
 msgstr "Filtrowanie folderu"
 
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 #, fuzzy
 msgid "Autocompletion Folders"
 msgstr "Lokalne foldery"
@@ -25062,42 +25370,42 @@ msgstr "Lokalne foldery"
 msgid "Cannot copy folder: %s"
 msgstr "Nie mo�na skopiowa� folderu: %s"
 
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
 #, c-format
 msgid "Cannot move folder: %s"
 msgstr "Nie mo�na przenie�� folderu: %s"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr "Nie mo�na przenie�� folderu do niego samego."
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr "Nie mo�na skopiowa� folderu do niego samego."
 
-#: 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 "Nie mo�na skopiowa� folderu do jego folderu podrz�dnego."
 
-#: 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 "Wybierz folder, do kt�rego chcesz skopiowa� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:325
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr "Kopiowanie folderu"
 
-#: 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 "Wybierz folder, do kt�rego chcesz przenie�� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:369
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "Przeniesienie folderu"
 
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25106,19 +25414,19 @@ msgstr ""
 "Nie mo�na usun�� folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:406
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Usuni�cie \"%s\""
-
-#: shell/e-shell-folder-commands.c:407
+#: shell/e-shell-folder-commands.c:405
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr ""
 "Nie mo�na usun�� folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:412
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Usuni�cie \"%s\""
+
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25127,26 +25435,26 @@ msgstr ""
 "Nie mo�na zmieni� nazwy folderu:\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 "Zmiana nazwy folderu \"%s\" na:"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr "Zmiana nazwy folderu"
 
-#: 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 "Podana nazwa folderu nie jest poprawna: %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"
@@ -25155,7 +25463,7 @@ msgstr ""
 "Nie mo�na zmieni� nazwy folderu:\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"
@@ -25164,24 +25472,20 @@ msgstr ""
 "Nie mo�na utworzy� podanego folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:308
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Utw�rz _nowy folder..."
 
-#: shell/e-shell-folder-selection-dialog.c:393
-msgid "New..."
-msgstr "Nowy..."
-
-#: 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 "(Bez nazwy)"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid "Choose the type of importer to run:"
 msgstr "Wybierz typ uruchamianego importera:"
 
-#: 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"
@@ -25195,11 +25499,11 @@ msgstr ""
 "Je�li nie znasz typu pliku, wybierz \"Automatycznie\", a Evolution spr�buje "
 "go rozpozna�."
 
-#: 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 "Wybierz informacje, kt�re chcesz zaimportowa�:"
 
-#: 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"
@@ -25208,22 +25512,22 @@ msgstr ""
 "Importowanie %s\n"
 "Importowanie %d. elementu."
 
-#: shell/e-shell-importer.c:355
+#: shell/e-shell-importer.c:351
 #, fuzzy
 msgid "Select importer"
 msgstr "Wyb�r folderu"
 
-#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "Plik %s nie istnieje."
 
-#: 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 "B��d 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"
@@ -25232,11 +25536,11 @@ msgstr ""
 "�aden z importer�w nie potrafi obs�u�y� pliku\n"
 "%s"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "Importowanie"
 
-#: shell/e-shell-importer.c:522
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25245,17 +25549,17 @@ msgstr ""
 "Importowanie %s.\n"
 "Rozpoczynanie %s"
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "B��d przy uruchamianiu %s"
 
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "B��d przy odczycie %s"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25264,31 +25568,31 @@ msgstr ""
 "Importowanie %s\n"
 "Importowanie 1. elementu."
 
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Nazwa pliku:"
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Wyb�r pliku"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Typ pliku:"
 
-#: shell/e-shell-importer.c:716
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "Import danych i ustawie� ze starszych program�w"
 
-#: shell/e-shell-importer.c:720
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "Import pojedynczego pliku"
 
-#: 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"
@@ -25296,32 +25600,32 @@ msgstr ""
 "Poczekaj chwil�...\n"
 "Trwa analizowanie istniej�cej konfiguracji"
 
-#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Uruchamianie inteligentnych importer�w"
 
-#: 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 "Od %s:"
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Wyb�r folderu"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Wybierz folder, do kt�rego powinny zosta� zaimportowane te dane"
 
-#: 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 "Import"
 
-#: shell/e-shell-offline-handler.c:582
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "Zamykanie po��cze�..."
 
-#: shell/e-shell-offline-sync.c:161
+#: shell/e-shell-offline-sync.c:163
 #, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
@@ -25330,156 +25634,158 @@ msgstr ""
 "B��d podczas synchronizacji \"%s\":\n"
 "%s"
 
-#: shell/e-shell-offline-sync.c:239
+#: shell/e-shell-offline-sync.c:232
 msgid "Syncing Folder"
 msgstr "Synchronizowanie folderu"
 
 #. 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
 msgid "Evolution Settings"
 msgstr "Ustawienia 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 "Wybierz serwer."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 msgid "Opening Folder"
 msgstr "Otwieranie folderu"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:364
+#: shell/e-shell-shared-folder-picker-dialog.c:380
 #, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Otwieranie folderu \"%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 "Otw�rz za pomoc� programu %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 "Nie mo�na zmieni� nazwy folderu: %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 ""
 "Nie mo�na utworzy� podanego folderu:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:159
-#, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-"Nie mo�na uruchomi� interfejsu druida pocztowego Evolution\n"
-"(%s)"
-
-#: shell/e-shell-startup-wizard.c:169
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "Nie mo�na uruchomi� interfejsu druida pocztowego 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 "Nowy"
 
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Nie podano nazwy folderu."
 
-#: shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr "Nazwa folderu nie mo�e zawiera� znaku ko�ca wiersza."
 
-#: shell/e-shell-utils.c:127
-msgid "Folder name cannot contain slashes."
-msgstr "Nazwa folderu nie mo�e zawiera� uko�nik�w."
+#: shell/e-shell-utils.c:129
+#, fuzzy
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "Nazwa folderu nie mo�e zawiera� znaku ko�ca wiersza."
+
+#: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "Nazwa folderu nie mo�e zawiera� znaku ko�ca wiersza."
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" oraz \"..\" s� zarezerwowanymi nazwami folder�w."
 
-#: 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 "W systemie nie jest zainstalowany GNOME Pilot tools."
 
-#: shell/e-shell-view-menu.c:102
+#: shell/e-shell-view-menu.c:97
 #, c-format
 msgid "Error executing %s."
 msgstr "B��d przy wykonywaniu %s."
 
-#: shell/e-shell-view-menu.c:196
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug buddy nie znajduje si� w �cie�ce."
+#: shell/e-shell-view-menu.c:193
+#, fuzzy
+msgid "Bug buddy is not installed."
+msgstr "Nie mo�na uruchomi� Bug buddy."
 
-#: shell/e-shell-view-menu.c:204
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
 msgstr "Nie mo�na uruchomi� Bug buddy."
 
-#: shell/e-shell-view-menu.c:248
+#: shell/e-shell-view-menu.c:247
 msgid "About Ximian Evolution"
 msgstr "Informacje o programie Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:503
+#: shell/e-shell-view-menu.c:502
 msgid "Go to folder..."
 msgstr "Przej�cie do innego folderu..."
 
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:503
 msgid "Select the folder that you want to open"
 msgstr "Wybierz folder, kt�ry chcesz otworzy�"
 
-#: shell/e-shell-view-menu.c:625
+#: shell/e-shell-view-menu.c:617
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Tworzy nowy skr�t"
 
-#: 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 "Wybierz folder, na kt�ry ma wskazywa� skr�t:"
 
-#: shell/e-shell-view-menu.c:788
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr "Praca _z pod��czeniem"
 
-#: 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 "Praca _bez pod��czenia"
 
-#: 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 "Praca bez pod��czenia"
 
-#: shell/e-shell-view.c:226
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "(Nie wy�wietlono folderu)"
 
-#: 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 "(Brak)"
 
-#: 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 dzia�a obecnie w trybie z pod��czeniem do sieci. Aby "
 "przej�� w tryb bez pod��czenia, kliknij ten przycisk."
 
-#: 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 przechodzi obecnie w tryb bez pod��czenia do sieci."
 
-#: 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 ""
@@ -25498,12 +25804,12 @@ msgstr ""
 "Opis b��du otrzymany od systemu aktywacji:\n"
 "%s"
 
-#: shell/e-shell.c:739
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nie mo�na ustawi� lokalnego miejsca przechowywania -- %s"
 
-#: shell/e-shell.c:1877
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25514,150 +25820,144 @@ msgstr ""
 "nieoczekiwanie zako�czy� dzia�anie. Aby ponownie uzyska� dost�p do\n"
 "danych, nale�y zako�czy� Evolution, a nast�pnie uruchomi� ponownie."
 
-#: shell/e-shell.c:2178
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Niepoprawny argumenty"
 
-#: shell/e-shell.c:2180
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "Nie mo�na dokona� rejestracji na serwerze OAF"
 
-#: shell/e-shell.c:2182
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "Nie odnaleziono bazy danych konfiguracji"
 
-#: shell/e-shell.c:2184 shell/e-storage.c:571
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "B��d og�lny"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:80
 msgid "Create new shortcut group"
 msgstr "Tworzenie nowej grupy skr�t�w"
 
-#: shell/e-shortcuts-view.c:77
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
 msgstr "Nazwa grupy:"
 
-#: 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 ""
 "Czy na pewno chcesz usun�� z paska skr�t�w\n"
 "grup� \"%s\"?"
 
-#: shell/e-shortcuts-view.c:178
-msgid "Don't remove"
-msgstr "Nie usuwaj"
-
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr "Zmiana nazwy grupy skr�t�w"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr "Zmie� nazw� wybranej grupy skr�t�w na:"
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "_Ma�e ikony"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr "Wy�wietla skr�ty jako ma�e ikony"
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr "_Du�e ikony"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr "Wy�wietla skr�ty jako du�e ikony"
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr "_Nowa grupa..."
 
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr "Tworzy now� grup� skr�t�w"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
 msgstr "_Usu� grup�..."
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr "Usuwa t� grup� skr�t�w"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
 msgstr "_Zmie� nazw� grupy..."
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr "Zmienia nazw� grupy skr�t�w"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ukryj pasek skr�t�w"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr "Ukrywa pasek skr�t�w"
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:281
 #, fuzzy
 msgid "Create _Default Shortcuts"
 msgstr "Tworzy nowy skr�t"
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:282
 #, fuzzy
 msgid "Create Default Shortcuts"
 msgstr "Tworzy nowy skr�t"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr "Zmiana nazwy skr�tu"
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr "Zmie� nazw� wybranego skr�tu na:"
 
-#: shell/e-shortcuts-view.c:408
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr "Otwiera folder powi�zany ze skr�tem"
 
-#: 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 "Otw�rz w nowym _oknie"
 
-#: 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 "Otwiera w nowym oknie folder powi�zany ze skr�tem"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr "_Zmie� nazw�"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr "Zmienia nazw� skr�tu"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Re_move"
 msgstr "_Usu�"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Usuwa skr�t z paska skr�t�w"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr "B��d przy zapisywaniu skr�t�w."
 
-#: shell/e-shortcuts.c:1080
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr "Skr�ty"
 
@@ -25665,73 +25965,73 @@ msgstr "Skr�ty"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:569
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "bez b��du"
 
-#: shell/e-storage.c:573
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr "Folder o tej nazwie ju� istnieje"
 
-#: shell/e-storage.c:575
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr "Podany typ folderu nie jest poprawny"
 
-#: shell/e-storage.c:577
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "B��d We/Wy"
 
-#: shell/e-storage.c:579
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr "Brak miejsca na utworzenie folderu"
 
-#: shell/e-storage.c:581
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr "Folder nie jest pusty"
 
-#: shell/e-storage.c:583
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr "Nie odnaleziono okre�lonego folderu"
 
-#: shell/e-storage.c:585
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr "Funkcja nie zosta�a zaimplementowana dla tego miejsca przechowywania"
 
-#: shell/e-storage.c:589
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr "Nieobs�ugiwana operacja"
 
-#: shell/e-storage.c:591
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr "Podany typ nie jest obs�ugiwany dla tego miejsca przechowywania"
 
-#: shell/e-storage.c:593
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr "Nie mo�na zmodyfikowa� ani usun�� podanego folderu"
 
-#: shell/e-storage.c:595
+#: shell/e-storage.c:596
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Nie mo�na ustawi� folderu jako potomka jednego z folder�w podrz�dnych"
 
-#: shell/e-storage.c:597
+#: shell/e-storage.c:598
 msgid "Cannot create a folder with that name"
 msgstr "Nie mo�na utworzy� folderu o tej nazwie"
 
-#: 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 (zako�czono %d%%)"
 
-#: shell/evolution-folder-selector-button.c:94
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<kliknij, aby wybra� folder> "
 
@@ -25772,86 +26072,83 @@ msgstr ""
 "Opis b��du otrzymany od systemu aktywacji:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1145
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "B��d Corby"
 
-#: shell/evolution-shell-component.c:1147
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Przerwane"
 
-#: shell/evolution-shell-component.c:1149
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Niepoprawny argument"
 
-#: shell/evolution-shell-component.c:1151
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "Ma ju� w�a�ciciela"
 
-#: shell/evolution-shell-component.c:1153
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Brak w�a�ciciela"
 
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Nie odnaleziono"
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Nieobs�ugiwany typ"
 
-#: shell/evolution-shell-component.c:1159
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Nieobs�ugiwany schemat"
 
-#: shell/evolution-shell-component.c:1161
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Nieobs�ugiwana operacja"
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "B��d wewn�trzny"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Istnieje"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "Niepoprawny URI"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Zawiera foldery podrz�dne"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Brak miejsca"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "Poprzedni w�a�ciciel zako�czy� dzia�anie"
 
-#: shell/evolution-test-component.c:49
+#: shell/evolution-test-component.c:63
 #, fuzzy
 msgid "Test type"
 msgstr "Typ pliku:"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr "Aktywne po��czenia"
+#: shell/evolution-test-component.c:703
+#, fuzzy
+msgid "Evolution Test Component"
+msgstr "Komponent Zestawienia 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 ""
 "Kliknij OK, aby zamkn�� powy�sze po��czenia i przej�� w tryb bez pod��czenia "
 "do sieci"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "Komputer"
-
-#: 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 "Obecnie aktywne s� nast�puj�ce po��czenia:"
 
@@ -25871,15 +26168,15 @@ msgstr "_Poczta:"
 msgid "_Tasks:"
 msgstr "_Zadania:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder name:"
 msgstr "Nazwa folderu:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder type:"
 msgstr "Typ folderu:"
 
-#: 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 "Okre�l miejsce utworzenia folderu:"
 
@@ -25900,29 +26197,30 @@ msgstr "Nazwa f_olderu:"
 msgid "_User:"
 msgstr "Nazwa _u�ytkownika:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Druid ustawie� Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Importowanie plik�w"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Strefa czasowa"
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Witaj"
 
-#: 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 ""
 "Witaj w Evolution. Na kolejnych kilku ekranach mo�esz poda�\n"
 "informacje, kt�re pozwol� na ��czenie si� z twoimi kontami\n"
@@ -25930,13 +26228,13 @@ msgstr ""
 "\n"
 "Aby kontynuowa�, kliknij \"Naprz�d\"."
 
-#: 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 ""
 "Zosta�y wprowadzone wszystkie informacje, potrzebne do\n"
 "ustawienia Evolution.\n"
@@ -25979,41 +26277,42 @@ msgstr ""
 "Druid ten przeprowadzi ci� przez proces importu do\n"
 "Evolution zewn�trznych plik�w w wybranym formacie."
 
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
 msgid "Importers"
 msgstr "Importery"
 
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Nie importuj"
 
-#: shell/importer/intelligent.c:198
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Nie pytaj o to ponownie"
 
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
 msgstr "Mo�na zaimportowa� do Evolution dane z nast�puj�cych plik�w:"
 
-#: 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 ko�czy prac�..."
 
-#: 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"
@@ -26023,7 +26322,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:250
+#: shell/main.c:290
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -26031,72 +26330,107 @@ msgstr ""
 "Dzi�kujemy\n"
 "Zesp� Ximian Evolution\n"
 
-#: shell/main.c:259
+#: shell/main.c:298
 msgid "Don't tell me again"
 msgstr "Bez wy�wietlania tego ponownie"
 
-#: shell/main.c:394
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nie mo�na uzyska� dost�pu do pow�oki Ximian Evolution."
 
-#: shell/main.c:403
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nie mo�na zainicjowa� pow�oki Ximian Evolution: %s"
 
-#: shell/main.c:485
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Ukrywa okno powitalne"
 
-#: shell/main.c:487
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Rozpoczynanie importowania"
 
-#: shell/main.c:489
+#: shell/main.c:532
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Uruchamianie inteligentnych importer�w"
 
-#: 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 ""
 "Zapisuje do pliku informacje dotycz�ce przebiegu wykonania komponent�w."
 
-#: 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 "Nie mo�na zainicjowa� systemu komponent�w 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 "B��d przy odczycie domy�lnej ksi��ki adresowej."
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Plik wej�ciowy"
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "Plik wy�ciowy"
-
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Nie podano nazwy pliku."
 
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "Dodaj za��cznik..."
+
+#: 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 "Opis zawiera"
+
+#: 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 "Wycina zaznaczone listy do schowka"
+
+#. 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 "Nie mo�na zmieni� nazwy \"%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 "Kopiuje kontakty do innego folderu..."
@@ -26185,7 +26519,7 @@ msgstr "Wy�wietla bie��cy 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 "C_zynno�ci"
 
@@ -26304,7 +26638,7 @@ msgid "Print this item"
 msgstr "Drukuje bie��cy 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 "Zapisz"
 
@@ -26331,7 +26665,7 @@ msgstr "Zapisuje bie��cy element na dysku"
 #: 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 "_Plik"
 
@@ -26588,7 +26922,7 @@ msgstr "Prze��cza grupowanie list�w w w�tki"
 msgid "_Expunge"
 msgstr "Wy_czy��"
 
-#: 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 "_Folder"
 
@@ -26856,7 +27190,7 @@ msgstr "Odpowied� na zadanie"
 
 #: 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 "Sprawdzanie nowych list�w we wszystkich folderach"
 
 #: ui/evolution-mail-message.xml.h:64
@@ -27019,7 +27353,7 @@ msgstr "Jako cytat"
 msgid "_Resend..."
 msgstr "_Zmie� nazw�..."
 
-#: 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 "_Narz�dzia"
 
@@ -27034,12 +27368,12 @@ msgstr "Zamyka bie��ce okno"
 #: 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 "Zam_knij"
 
 #: 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 "_Widok"
 
@@ -27047,6 +27381,10 @@ msgstr "_Widok"
 msgid "Attach"
 msgstr "Za��cz"
 
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Za��czenie pliku"
+
 #: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Zamyka bie��cy plik"
@@ -27216,7 +27554,7 @@ msgstr "_HTML"
 msgid "Save the current file and close the window"
 msgstr "Zapisuje bie��cy plik i zamyka okno"
 
-#: 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 "Pomo_c"
 
@@ -27401,128 +27739,118 @@ msgstr "_Ustawienia pilota..."
 
 #: ui/evolution.xml.h:27
 #, fuzzy
-msgid "Pilot Con_duit Settings..."
-msgstr "Ustawienia pilota..."
-
-#: ui/evolution.xml.h:28
-#, fuzzy
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "Utw�rz _nowy folder..."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "Wy�lij / Odbierz"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Wysy�a listy w kolejce i pobiera nowe"
 
-#: ui/evolution.xml.h:31
-#, fuzzy
-msgid "Set up Pilot conduit configuration"
-msgstr "Konfiguracja poczty"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Konfiguracja poczty"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr "Wy�wietla informacje o programie Ximian Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Wy�lij zg�oszenie b��du"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "Wy�lij zg�oszenie _b��du"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Wysy�a zg�oszenie b��du za pomoc� Bug Buddy"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "Prze��cz"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "Prze��cza wy�wietlanie paska folder�w"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Prze��cza wy�wietlanie paska skr�t�w"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr ""
 "Prze��cza pomi�dzy trybami pracy z pod��czeniem i bez pod��czenia do sieci."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "Wy�wietla zaznaczony folder"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "Ximian Evolution _FAQ"
 msgstr "_Najcz�ciej zadawane pytania"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 msgid "_About Ximian Evolution..."
 msgstr "_Informacje o programie Ximian Evolution..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "S_kopiuj..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Pasek f_older�w"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Folder..."
 msgstr "_Folder..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "_Przejd� do folderu..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr "Za_importuj..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "_Przenie�..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "_Nowy"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "_Nowy folder"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Remove Other User's Folder"
 msgstr "Utw�rz _nowy folder..."
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_Zmie� nazw�..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "Wy�lij / _Odbierz"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "Pasek _skr�t�w"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 msgid "_Shortcut..."
 msgstr "_Skr�t..."
 
@@ -27600,9 +27928,8 @@ msgstr "Wraz z kategoriami"
 msgid "_Tasks"
 msgstr "_Zadania"
 
-#. 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"
 
@@ -27628,20 +27955,20 @@ msgstr ""
 "stref� czasow�.\n"
 "Przyci�ni�cie prawego przycisku przywraca zwyk�e powi�kszenie."
 
-#: widgets/menus/gal-view-menus.c:295
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr "_Bie��cy widok"
 
 #. 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 "Dowolny widok"
 
-#: 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 "Zdefiniuj widoki"
 
@@ -27652,19 +27979,19 @@ msgid "MTWTFSS"
 msgstr "PW�CPSN"
 
 #. 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 "Teraz"
 
-#: 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 "Dzi�"
 
-#: 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 "Czas musi by� podany w formacie: %s"
@@ -27673,81 +28000,81 @@ msgstr "Czas musi by� podany w formacie: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Warto�� procentowa musi si� zawiera� w przedziale od 0 do 100 w��cznie"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "Ba�tycki"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "�rodkowoeuropejski"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "Chi�ski"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "Cyrylica"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr "Grecki"
 
-#: 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 "Japo�ski"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "Korea�ski"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "Turecki"
 
-#: 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 "Zachodnioeuropejski"
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "Tradycyjny"
 
-#: 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 "Uproszczony"
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "Ukrai�ski"
 
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:97
 #, fuzzy
 msgid "Visual"
 msgstr "Unieaktywnij"
 
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Nieznany zestaw znak�w: %s"
 
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr "Podaj wykorzystywany zestaw znak�w"
 
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "Inny..."
 
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr "Standard kodowania znak�w"
 
@@ -27755,11 +28082,12 @@ msgstr "Standard kodowania znak�w"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:189
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr "Edytor wyszukiwa�"
 
-#: widgets/misc/e-filter-bar.c:211
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "Zapisz wyszukiwanie"
 
@@ -27776,66 +28104,584 @@ msgstr "Dodaj do zapisanych wyszukiwa�"
 msgid "_Advanced..."
 msgstr "_Zaawansowane..."
 
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
 msgid "Information"
 msgstr "Informacje"
 
-#: widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:168
 msgid "Error"
 msgstr "B��d"
 
-#: widgets/misc/e-messagebox.c:173
+#: widgets/misc/e-messagebox.c:175
 msgid "Question"
 msgstr "Pytanie"
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
 msgid "Message"
 msgstr "List"
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
-msgstr "Bez wy�wietlania tego komunikatu w przysz�o�ci."
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "_Znajd�"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:537
 #, fuzzy
 msgid "_Find Now"
 msgstr "Znajd�"
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 #, fuzzy
 msgid "_Clear"
 msgstr "Wyczy��"
 
-#: 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 "Wyczy��"
 
-#: widgets/misc/e-search-bar.c:897
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Znajd�"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Osobisty serwer ksi��ki adresowej"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Przegl�darka miniaturowych kart ksi��ki adresowej 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 "Przegl�darka kalendarza iTip/iMip"
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Przegl�darka miniaturowych kart ksi��ki adresowej Evolution"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Generator importu plik�w z LDIF do Evolution."
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Importuje pliki LDIF do Evolution."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Generator importu plik�w VCard do Evolution."
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Importuje pliki VCard do Evolution."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "Komponent Bonobo wyskakuj�cego okna z adresem."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Komponent Bonobo wy�wietlaj�cy adres."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Przyk�adowy komponent Bonobo wy�wietlaj�cy ksi��k� adresow�."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr ""
+#~ "Komponent Bonobo wy�wietlaj�cy miniaturow� kart� ksi��ki adresowej "
+#~ "Evolution."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Komponent Evolution obs�uguj�cy kontakty."
+
+#~ msgid "Factory for the Addressbook Minicard control"
+#~ msgstr "Generator komponent�w miniatorowych kart ksi��ki adresowej"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "Osobisty serwer ksi��ki adresowej; generator kalendarza"
+#~ msgid "Factory for the Addressbook's address displayer"
+#~ msgstr "Generator komponent�w wy�wietlaj�cych adres z ksi��ki adresowej"
 
-#: wombat/wombat.c:199
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): nie mo�na zainicjowa� GNOME-VFS"
+#~ msgid "Factory for the sample Addressbook control"
+#~ msgstr "Generator przyk�adowych komponent�w ksi��ki adresowej"
 
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): nie mo�na zainicjowa� GNOME"
+#~ msgid "1234"
+#~ msgstr "1234"
 
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
+#~ msgid "380"
+#~ msgstr "380"
+
+#~ msgid "666"
+#~ msgstr "666"
+
+#~ msgid "<- _Remove"
+#~ msgstr "<- _Usu�"
+
+#~ msgid "<< Fewer Options"
+#~ msgstr "<< Mniej opcji"
+
+#~ msgid "Associated LDAP Attribute"
+#~ msgstr "Powi�zany atrybut LDAP"
+
+#~ msgid "Attribute"
+#~ msgstr "Atrybut"
+
+#~ msgid "DN Customization"
+#~ msgstr "Dopasowanie wyr�nionej nazwy"
+
+#~ msgid "Evolution Attribute"
+#~ msgstr "Atrybut Evolution"
+
+#~ msgid "LDAP Attribute"
+#~ msgstr "Atrybut LDAP"
+
+#~ msgid "Mappings"
+#~ msgstr "Odwzorowania"
+
+#, fuzzy
+#~ msgid "Select"
+#~ msgstr "Zaznacz wszystkie"
+
+#~ msgid "_Add ->"
+#~ msgstr "_Dodaj ->"
+
+#~ msgid "_Add Mapping"
+#~ msgstr "_Dodaj odwzorowanie"
+
+#~ msgid "_Add to DN"
+#~ msgstr "_Dodaj do DN"
+
+#~ msgid "_Always"
+#~ msgstr "_Zawsze"
+
+#~ msgid "_Delete Mapping"
+#~ msgstr "_Usu� odwzorowanie"
+
+#~ msgid "_Distinguished Name (DN):"
+#~ msgstr "_Wyr�niona nazwa (DN):"
+
+#~ msgid "_Don't use SSL/TLS"
+#~ msgstr "_Bez u�ycia SSL/TLS"
+
+#~ msgid "_Edit Mapping"
+#~ msgstr "_Zmodyfikuj odwzorowanie"
+
+#~ msgid "_Evolution attribute:"
+#~ msgstr "_Atrybut Evolution:"
+
+#~ msgid "_More Options >>"
+#~ msgstr "_Wi�cej opcji >>"
+
+#~ msgid "account-druid"
+#~ msgstr "druid-konta"
+
+#~ msgid "account-editor"
+#~ msgstr "edytor-konta"
+
+#~ msgid "dn-customization-tab"
+#~ msgstr "zak�adka-dopasowywanie-db"
+
+#~ msgid "mappings-tab"
+#~ msgstr "zak�adka-odwzorowania"
+
+#~ msgid "objectclasses-tab"
+#~ msgstr "zak�adka-klasy-obiekt�w"
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr "Generator interfejsu wyboru nazwy ksi��ki adresowej Evolution"
+
+#~ msgid "Edit Contact List"
+#~ msgstr "Zmodyfikuj list� kontakt�w"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Lista kontakt�w bez nazwy"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d niewy�wietlonych)"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "_Kontakty..."
+
+#~ msgid "Phone Types"
+#~ msgstr "Typy telefon�w"
+
+#~ msgid "Delete Contact?"
+#~ msgstr "Usun�� kontakt?"
+
+#~ msgid "Display Cards?"
+#~ msgstr "Pytanie o wy�wietlenie kart"
+
+#~ msgid "Display Cards"
+#~ msgstr "Wy�wietlenie kart"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Komponent Bonobo wy�wietlaj�cy list� zada�."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Komponent Bonobo wy�wietlaj�cy kalendarz."
+
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Formant konfiguracji kalendarza Evolution."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Komponent Bonobo obs�uguj�cy kalendarz."
+
+#~ msgid "Factory for the Evolution Tasks control"
+#~ msgstr "Generator formantu zada� Evolution"
+
+#~ msgid "Factory for the calendar iTip view control"
+#~ msgstr "Generator formantu wy�wietlania iTip kalendarza"
+
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr "Generator przyk�adowego formantu kalendarza"
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr "Generator centralizuj�cy okna edytora komponentu kalendarza"
+
+#~ msgid "Factory to create a component editor factory"
+#~ msgstr "Generator tworz�cy generator komponentu edytora"
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Us�uga przypominania za pomoc� alarmu"
+
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "Nie mo�na zainicjowa� GNOME"
+
+#, fuzzy
+#~ msgid ""
+#~ "Evolution does not yet support email notification for reminders.  You "
+#~ "will not be able to edit the options for this reminder."
+#~ msgstr ""
+#~ "To jest przypomnienie za pomoc� listu, lecz Evolution nie obs�uguje "
+#~ "jeszcze tego typu przypomnie�, wi�c modyfikacja jego opcji nie b�dzie "
+#~ "mo�liwa."
+
+#~ msgid "st"
+#~ msgstr "."
+
+#~ msgid "nd"
+#~ msgstr "."
+
+#~ msgid "rd"
+#~ msgstr "."
+
+#~ msgid "th"
+#~ msgstr "."
+
+#~ msgid "Could not activate Bonobo"
+#~ msgstr "Nie mo�na uaktywni� Bonobo"
+
+#~ msgid "Could not create the component editor factory"
+#~ msgstr "Nie mo�na utworzy� generatora komponentu edytora"
+
+#~ msgid "Print Calendar"
+#~ msgstr "Wydrukuj kalendarz"
+
+#~ msgid ""
+#~ "Could not create the tasks view.  Please check your ORBit and OAF setup."
+#~ msgstr ""
+#~ "Nie mo�na utworzy� widoku zada�.  Zweryfikuj ustawienia ORBita i OAF-a."
+
+#~ msgid ""
+#~ "Evolution has taken the tasks that were in your calendar folder and "
+#~ "automatically migrated them to the new tasks folder."
+#~ msgstr ""
+#~ "Zadania umieszczone w folderze kalendarza zosta�y przez Evolution "
+#~ "automatycznie przeniesione do nowego folderu zada�."
+
+#~ 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 ""
+#~ "Nast�pi�a pr�ba przeniesienia przez Evolution zada� umieszczonych w "
+#~ "folderze kalendarza do nowego folderu zada�.\n"
+#~ "Niekt�re z zada� nie mog�y zosta� przeniesione, wi�c proces mo�e si� w "
+#~ "przysz�o�ci powt�rzy�."
+
+#~ msgid ""
+#~ "Could not open `%s'; no items from the calendar folder will be migrated "
+#~ "to the tasks folder."
+#~ msgstr ""
+#~ "Nie mo�na otworzy� `%s'; �aden z element�w folderu kalendarza nie zosta� "
+#~ "przeniesiony do folderu zada�."
+
+#~ msgid ""
+#~ "The method required to load `%s' is not supported; no items from the "
+#~ "calendar folder will be migrated to the tasks folder."
+#~ msgstr ""
+#~ "Metoda wymagana do odczytu \"%s\" nie jest obs�ugiwana. Nie przeniesiono "
+#~ "�adnych element�w z folderu kalendarza do folderu zada�."
+
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Generator importu plik�w iCalendar do Evolution"
+
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Importuje pliki iCalendar do Evolution"
+
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Importuje pliki vCalendar do Evolution"
+
+#, fuzzy
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr ""
+#~ "Nie mo�na pobra� listu: %s z folderu %s\n"
+#~ "  %s"
+
+#, fuzzy
+#~ msgid "Can't call getFolderAtPath on storage: %s"
+#~ msgstr "Nie mo�na nawi�za� po��czenia z miejscem przechowywania: %s"
+
+#~ msgid "Warning!"
+#~ msgstr "Ostrze�enie!"
+
+#~ msgid ""
+#~ "Could not create composer window, because you have not yet\n"
+#~ "configured any identities in the mail component."
+#~ msgstr ""
+#~ "Nie mo�na otworzy� okna tworzenia listu, poniewa� w komponencie\n"
+#~ "pocztowym nie zosta�y jeszcze skonfigurowane �adne to�samo�ci."
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "Nie mo�na zainicjowa� edytora list�w Evolution."
+
+#~ msgid "minute"
+#~ msgstr "minuta"
+
+#~ msgid "hour"
+#~ msgstr "godzina"
+
+#~ msgid "week"
+#~ msgstr "tydzie�"
+
+#~ msgid "year"
+#~ msgstr "rok"
+
+#~ msgid "Add action"
+#~ msgstr "Dodaj czynno��"
+
+#~ msgid "Add criterion"
+#~ msgstr "Dodaj kryterium"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Generator edytora list�w Evolution."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Generator formantu zada� Evolution"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Generator edytora list�w Evolution."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Generator edytora list�w Evolution."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Komponent Evolution obs�uguj�cy poczt�."
+
+#~ msgid "Evolution mail folder factory component."
+#~ msgstr "Generator komponent�w folderu pocztowego Evolution."
+
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr "Generator edytora list�w Evolution."
+
+#~ msgid "Factory for the Mail Summary component."
+#~ msgstr "Generator komponentu zestawienia poczty."
+
+#, fuzzy
+#~ msgid "Warning: Unsent Messages"
+#~ msgstr "Uwaga: Zmodyfikowany list"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "Nie mo�na zainicjowa� komponentu pocztowego Evolution."
+
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "Nie mo�na zainicjowa� komponentu konfiguracji poczty Evolution."
+
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Nie mo�na zainicjowa� komponentu informacji o folderach Evolution."
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Generator importu plik�w mbox do Evolution."
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importuje pliki mbox do Evolution."
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "Generator importu plik�w Outlook Express 4 do Evolution."
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importuje pliki Outlook Express 4 do Evolution."
+
+#~ msgid "Really delete account?"
+#~ msgstr "Rzeczywi�cie usun�� konto?"
+
+#, fuzzy
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "Wy�wietla kolejny nieprzeczytany list"
+
+#~ msgid "US-Letter"
+#~ msgstr "Listowy-US"
+
+#, fuzzy
+#~ msgid "Add Signature"
+#~ msgstr "Plik z p_odpisem:"
+
+#~ msgid "Account %d"
+#~ msgstr "Konto %d"
+
+#, fuzzy
+#~ msgid "_Variable-width:"
+#~ msgstr "Zmienny"
+
+#~ msgid "All folders"
+#~ msgstr "Wszystkie foldery"
+
+#, fuzzy
+#~ msgid "Apri file"
+#~ msgstr "Kwiecie�"
+
+#~ msgid "Display Options"
+#~ msgstr "Opcje wy�wietlania"
+
+#~ msgid "Folders whose names begin with:"
+#~ msgstr "Foldery o nazwach rozpoczynaj�cych si� od:"
+
+#, fuzzy
+#~ msgid "Salve file"
+#~ msgstr "Wyb�r pliku"
+
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Formant konfiguracji Zestawienia Evolution"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Summary component."
+#~ msgstr "Generator komponentu zestawienia poczty."
+
+#~ msgid "Marquette"
+#~ msgstr "Marquette"
+
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "Komponent zestawienia wykonawczego nie m�g� zainicjowa� Bonobo.\n"
+
+#~ msgid "Evolution installation"
+#~ msgstr "Instalacja Evolution"
+
+#~ msgid ""
+#~ "This new version of Evolution needs to install additional files\n"
+#~ "into your personal Evolution directory"
+#~ msgstr ""
+#~ "Uruchomiona w�a�nie nowa wersja Evolution wymaga zainstalowania\n"
+#~ "dodatkowych plik�w w osobistym katalogu Evolution"
+
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr "Kliknij \"OK\" aby zainstalowa� pliki lub \"Anuluj\" aby zako�czy�."
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie mo�na utworzy� katalogu\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"
+#~ "ma niew�a�ciwe uprawnienia. Ustaw prawa do jego odczytu\n"
+#~ "oraz wykonania i uruchom Evolution ponownie."
+
+#~ msgid ""
+#~ "File %s\n"
+#~ "should be removed to allow Evolution to work correctly.\n"
+#~ "Please remove this file and restart Evolution."
+#~ msgstr ""
+#~ "Aby Evolution mog�o poprawnie dzia�a�, nale�y usun��\n"
+#~ "plik %s.\n"
+#~ "Usu� ten plik i uruchom Evolution ponownie."
+
+#~ 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 ""
+#~ "Wykryto stary katalog Executive-Summary.\n"
+#~ "Aby uruchomi� Evolution, konieczne jest\n"
+#~ "jego usuni�cie.\n"
+#~ "Czy chcesz usun�� ten katalog?"
+
+#~ msgid "New..."
+#~ msgstr "Nowy..."
+
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Nie mo�na uruchomi� interfejsu druida pocztowego Evolution\n"
+#~ "(%s)"
+
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr "Nie mo�na uruchomi� interfejsu druida pocztowego Evolution\n"
+
+#~ msgid "Folder name cannot contain slashes."
+#~ msgstr "Nazwa folderu nie mo�e zawiera� uko�nik�w."
+
+#~ msgid "Bug buddy was not found in your $PATH."
+#~ msgstr "Bug buddy nie znajduje si� w �cie�ce."
+
+#~ msgid "Don't remove"
+#~ msgstr "Nie usuwaj"
+
+#~ msgid "Active connections"
+#~ msgstr "Aktywne po��czenia"
+
+#~ msgid "Host"
+#~ msgstr "Komputer"
+
+#~ msgid "Cannot initialize the Bonobo component system."
+#~ msgstr "Nie mo�na zainicjowa� systemu komponent�w Bonobo."
+
+#~ msgid "Output File"
+#~ msgstr "Plik wy�ciowy"
+
+#, fuzzy
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "Ustawienia pilota..."
+
+#, fuzzy
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "Konfiguracja poczty"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Osobisty serwer ksi��ki adresowej"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "Osobisty serwer ksi��ki adresowej; generator kalendarza"
+
+#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
+#~ msgstr "setup_vfs(): nie mo�na zainicjowa� GNOME-VFS"
+
+#~ msgid "init_corba(): could not initialize GNOME"
+#~ msgstr "init_corba(): nie mo�na zainicjowa� GNOME"
+
+#~ msgid "init_bonobo(): could not initialize Bonobo"
+#~ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 
 #~ msgid "_Configure..."
 #~ msgstr "S_konfiguruj..."
@@ -27866,9 +28712,6 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ msgid "Copy selected messages"
 #~ msgstr "Kopiuje zaznaczone listy"
 
-#~ msgid "Cut selected messages"
-#~ msgstr "Wycina zaznaczone listy do schowka"
-
 #~ msgid "Scanning for new messages"
 #~ msgstr "Wyszukiwanie nowych list�w"
 
@@ -27897,9 +28740,6 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ "Importer nie jest gotowy.\n"
 #~ "Oczekiwanie przez 5 sekund przed ponowieniem."
 
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Druid importu Evolution"
-
 #~ msgid "_Preferences..."
 #~ msgstr "P_referencje"
 
@@ -28120,9 +28960,6 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ "Data listu b�dzie por�wnywana z czasem\n"
 #~ "zastosowania filtra."
 
-#~ msgid "Evolution News Editor"
-#~ msgstr "Edytor nowin Evolution"
-
 #~ msgid "Are you sure you want to delete this news account?"
 #~ msgstr "Czy na pewno chcesz usun�� to konto?"
 
@@ -28142,9 +28979,6 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ msgid "NNTP Server:"
 #~ msgstr "Serwer NNTP:"
 
-#~ msgid "Source"
-#~ msgstr "�r�d�o"
-
 #~ msgid "Source Information"
 #~ msgstr "Informacje o �r�dle"
 
@@ -28222,9 +29056,6 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ msgid "_Shortcut"
 #~ msgstr "_Skr�t"
 
-#~ msgid "Address Cards"
-#~ msgstr "Karty adresowe"
-
 #~ msgid "By Company"
 #~ msgstr "Wed�ug firmy"
 
diff --git a/po/pt.po b/po/pt.po
index 504ce21dfb..60a4708029 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.2\n"
-"POT-Creation-Date: 2003-03-29 05:01+0000\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-03-29 05:20+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -15,20 +15,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\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 ficheiros LDIF para o Evolution."
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Compositor de correio Evolution."
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "Importa ficheiros LDIF para o 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 ficheiros VCard para o Evolution."
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Compositor de correio Evolution."
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importa ficheiros VCard para o Evolution."
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Compositor de correio 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
@@ -198,14 +205,14 @@ msgid "TTY"
 msgstr "TTY"
 
 #: 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 "Email 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"
@@ -491,75 +498,77 @@ msgstr "A receber resultados da procura no LDAP..."
 msgid "Error performing search"
 msgstr "Erro ao efectuar procura"
 
-#: addressbook/conduit/address-conduit.c:296
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Endereço Sincronização Por Omissão:"
 
-#: addressbook/conduit/address-conduit.c:539
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Impossível ler cursor\n"
 
-#: addressbook/conduit/address-conduit.c:552
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EBook não carregado\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 "Incapaz de iniciar servidor wombat"
 
-#: 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 "Incapaz de inicializar wombat"
 
-#: 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 "Incapaz de ler bloco da aplicação de Endereços da pilot"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Um controlo Bonobo para um popup de endereço."
+msgid "Configure access to LDAP directory servers here"
+msgstr "Configurar aqui acesso a servidores de directório LDAP"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Um controlo Bonobo para mostrar um endereço."
+msgid "Directory Servers"
+msgstr "Servidores Directório"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Um controlo Bonobo de exemplo que mostra uma agenda."
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Visualizador de minicartões da Agenda Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr ""
-"Controlo de configuração dos Armazenamentos Livros de Endereços Evolution."
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Interface de selecção de nome do livro de endereços Evolution."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure access to LDAP directory servers here"
-msgstr "Configurar aqui acesso a servidores de directório LDAP"
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Visualizador de minicartões da Agenda Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Controlo que mostra um mini-cartão da agenda Evolution."
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Visualizador de minicartões da Agenda Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Directory Servers"
-msgstr "Servidores Directório"
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Visualizador de minicartões da Agenda Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Visualizador de minicartões da Agenda Evolution"
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Componente Teste Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Componente Evolution para gerir 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 os controlos exportados pelo Livro Endereços Evolution"
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Visualizador de minicartões da Agenda Evolution"
 
 #: addressbook/gui/component/addressbook-component.c:76
 #: addressbook/gui/component/addressbook-component.c:605
@@ -779,7 +788,7 @@ msgstr "Esta procura não terminou com sucesso."
 
 #. 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 "Qualquer Categoria"
 
@@ -792,46 +801,46 @@ msgstr "O URI que o Navegador de Pastas irá mostrar"
 #. * 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 "(nenhum)"
 
-#: 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 "Email Principal"
 
-#: addressbook/gui/component/e-address-popup.c:608
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Seleccionar uma Acção"
 
-#: 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 "Criar um novo contacto \"%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 "Adicionar endereço a contacto já existente \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:913
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "A Procurar no Livro Endereços..."
 
-#: 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 Info 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 "Adicionar aos Contactos"
 
-#: addressbook/gui/component/e-address-popup.c:1051
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Juntar Endereço Email"
 
@@ -963,7 +972,7 @@ msgid "LDAP Configuration Assistant"
 msgstr "Assistente Configuração 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"
 
@@ -993,8 +1002,8 @@ msgstr "Â_mbito procura: "
 
 #. 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 "A Procurar"
 
@@ -1289,48 +1298,36 @@ msgid "searching-tab"
 msgstr "aba-procura"
 
 #: 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 "Interface de selecção de nome do livro de endereços Evolution."
 
-#: 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 o interface de selecção de nome do Livro de Endereços Evolution"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Remover Todos"
 
 #. 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 "Remover"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:177
-msgid "Remove All"
-msgstr "Remover Todos"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:201
-msgid "Send HTML Mail?"
-msgstr "Enviar Mail HTML?"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:300
-msgid "View Contact Info"
-msgstr "Ver Info 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 Contactos"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:417
-msgid "Unnamed Contact List"
-msgstr "Lista Contactos Sem Nome"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+msgid "View Contact Info"
+msgstr "Ver Info Contacto"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:434
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d não mostrados)"
+#: 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 Mail 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 "Contacto Sem Nome"
 
@@ -1339,11 +1336,11 @@ msgstr "Contacto Sem Nome"
 msgid "Source"
 msgstr "Origem"
 
-#: 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 "Seleccionar Contactos do Livro Endereços"
 
-#: 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 "Procurar Contacto em"
 
@@ -1473,7 +1470,7 @@ msgstr "Deseja receber email em _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:3710 calendar/gui/e-week-view.c:3557
+#: 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
@@ -1512,10 +1509,10 @@ msgstr "Endereço 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 "Editável"
 
@@ -2545,7 +2542,7 @@ msgstr "Zimbabué"
 #: 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 "Livro"
@@ -2553,7 +2550,7 @@ msgstr "Livro"
 #: 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 "Cartão"
 
@@ -2855,7 +2852,7 @@ msgstr "%d cartões"
 #: 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 "Procura"
@@ -2870,20 +2867,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 "Erro ao modificar cartão"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr "Sucesso"
 
 #: 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 "Erro desconhecido"
 
@@ -2892,7 +2890,7 @@ msgid "Repository offline"
 msgstr "Repositório desligado"
 
 #: 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 "Permissão negada"
 
@@ -2909,7 +2907,7 @@ msgid "Protocol not supported"
 msgstr "Protocolo não suportado"
 
 #: 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
@@ -3104,7 +3102,7 @@ msgid "Delete"
 msgstr "Apagar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:904
-#: calendar/gui/e-day-view.c:3670 calendar/gui/e-week-view.c:3522
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 msgid "Current View"
 msgstr "Vista Actual"
 
@@ -3208,38 +3206,38 @@ msgstr "e um outro cartão."
 msgid "Save in addressbook"
 msgstr "Gravar no livro de endereços"
 
-#: 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 "Largura"
 
-#: 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 "Altura"
 
-#: 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 "Tem Focus"
 
-#: 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 "Nome Campo"
 
-#: addressbook/gui/widgets/e-minicard-label.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Modelo Texto"
 
-#: addressbook/gui/widgets/e-minicard-label.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Comprimento máx. nome campo"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:125
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
 msgstr "Largura Coluna"
 
@@ -3271,11 +3269,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 "Tem Cursor"
 
@@ -3605,7 +3603,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"
@@ -3624,71 +3622,74 @@ msgstr "Baixa"
 msgid "Undefined"
 msgstr "Indefinida"
 
-#: calendar/conduits/calendar/calendar-conduit.c:208
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr "Dividir Eventos Multi-Dias:"
 
-#: 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 "Erro ao comunicar com o servidor de calendário"
 
-#: 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 "Incapaz de ler bloco aplicação Calendário da pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:208
+#: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
 msgstr "Prioridade por Omissão:"
 
-#: 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 "Incapaz de ler bloco aplicação A Fazer da pilot"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "Um controlo Bonobo que apresenta uma lista de tarefas."
+msgid "Calendar and Tasks"
+msgstr "Calendário e Tarefas"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Um controlo Bonobo de exemplo que apresenta um calendário."
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure o seu fuso-horário. Calendário e Lista de Tarefas aqui "
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
 msgstr "Calendário e Tarefas"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Controlo de configuração para o Calendário do Evolution."
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Componente de apresentação de pasta de correio Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure o seu fuso-horário. Calendário e Lista de Tarefas aqui "
+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 "Visualizador Evolution de calendário iTip/iMip"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Componente Evolution para gerir o calendário."
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Visualizador Evolution de calendário iTip/iMip"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Factory for the Evolution Calendar objects"
-msgstr "Fábrica para os objectos de Calendário Evolution"
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Visualizador Evolution de calendário iTip/iMip"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Fábrica para centralizar diálogos de editor de componente calendário"
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Alarme Evolution"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Alarm notification service"
-msgstr "Serviço de alarme de notificação"
-
-#: 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 o serviço de alarme de notificação"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
@@ -3792,7 +3793,7 @@ msgstr "Descrição contém"
 msgid "Comment contains"
 msgstr "Comentário contém"
 
-#: 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 "Sem equivalência"
 
@@ -3802,8 +3803,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"
 
@@ -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:1513
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3853,7 +3854,7 @@ msgstr "Pasta pública que contém compromissos e 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: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
@@ -3920,12 +3921,12 @@ msgstr "Compromisso _Dia Completo"
 msgid "Create a new all-day appointment"
 msgstr "Criar um novo compromisso de dia completo"
 
-#: 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"
@@ -3950,37 +3951,37 @@ msgstr "E"
 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 "Livre"
 
 #: 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 "Por Iniciar"
 
-#: 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 "Em Curso"
 
-#: 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"
@@ -3991,32 +3992,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 "Nenhuma"
 
-#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Recorrente"
 
-#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Atribuida"
 
-#: 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 "Sim"
 
-#: 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 "Não"
@@ -4054,31 +4055,31 @@ msgstr "Permissão negada ao abrir o calendário"
 msgid "Could not open the folder in '%s'"
 msgstr "Incapaz de abrir a pasta em '%s'"
 
-#: calendar/gui/control-factory.c:163
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "O URI que o calendário irá mostrar"
 
-#: calendar/gui/control-factory.c:170
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr "O tipo de vista a mostrar"
 
-#: calendar/gui/dialogs/alarm-options.c:473
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Opções Audio de Alarme"
 
-#: calendar/gui/dialogs/alarm-options.c:482
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Opções Mensagem de Alarme"
 
-#: calendar/gui/dialogs/alarm-options.c:491
+#: calendar/gui/dialogs/alarm-options.c:438
 msgid "Email Alarm Options"
 msgstr "Opções Email de Alarme"
 
-#: calendar/gui/dialogs/alarm-options.c:500
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Opções Aplicação de Alarme"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Opções Desconhecidas de Alarme"
 
@@ -4119,14 +4120,19 @@ msgid "days"
 msgstr "dias"
 
 #: 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 "tempos extra a 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"
 
@@ -4191,7 +4197,7 @@ msgstr "fim do compromisso"
 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)"
 
@@ -4371,7 +4377,7 @@ msgid "_Fri"
 msgstr "Se_x"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "_Geral"
 
@@ -4557,8 +4563,8 @@ msgid "No summary"
 msgstr "Nenhum resumo"
 
 #: calendar/gui/dialogs/comp-editor.c:1230
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3928
-#: calendar/gui/e-week-view.c:3758 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 "Gravar como..."
 
@@ -4651,19 +4657,19 @@ msgstr "Calendarizar"
 msgid "Meeting"
 msgstr "Reunião"
 
-#: 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 "Data de início está errada"
 
-#: calendar/gui/dialogs/event-page.c:664
+#: calendar/gui/dialogs/event-page.c:610
 msgid "End date is wrong"
 msgstr "Data de término está errada"
 
-#: calendar/gui/dialogs/event-page.c:687
+#: calendar/gui/dialogs/event-page.c:633
 msgid "Start time is wrong"
 msgstr "Hora de início está errada"
 
-#: calendar/gui/dialogs/event-page.c:694
+#: calendar/gui/dialogs/event-page.c:640
 msgid "End time is wrong"
 msgstr "Hora de término está errada"
 
@@ -4720,15 +4726,10 @@ msgid "Su_mmary:"
 msgstr "Resu_mo:"
 
 #: 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 término:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "Hora _início:"
 
@@ -4788,7 +4789,7 @@ msgid "Member"
 msgstr "Membro"
 
 #: 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"
@@ -4810,7 +4811,7 @@ msgid "_Change Organizer"
 msgstr "_Alterar 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 "Conv_idar Outros..."
 
@@ -4825,8 +4826,7 @@ msgstr "Está a alterar uma tarefa recorrente, o que deseja alterar?"
 #: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
-msgstr ""
-"Está a alterar uma entrada de diário recorrente, o que deseja alterar?"
+msgstr "Está a alterar uma entrada de diário recorrente, o que deseja alterar?"
 
 #: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
@@ -5009,7 +5009,7 @@ msgstr "Compromisso"
 msgid "Due date is wrong"
 msgstr "Data final prazo está errada"
 
-#: 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:"
@@ -5019,6 +5019,10 @@ msgstr "Descrição:"
 msgid "Sta_rt Date:"
 msgstr "_Data Iní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 "Data _Término:"
@@ -5117,56 +5121,67 @@ msgid "%s for an unknown trigger type"
 msgstr "%s para um tipo de disparo desconhecido"
 
 #: 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 "A apagar objectos seleccionados"
 
-#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3692
-#: calendar/gui/e-week-view.c:3539 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 "_Abrir"
@@ -5175,30 +5190,30 @@ msgstr "_Abrir"
 msgid "_Save as..."
 msgstr "_Gravar como..."
 
-#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3694
-#: calendar/gui/e-week-view.c:3514 calendar/gui/e-week-view.c:3541
+#: 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 "Im_primir..."
 
-#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3699
-#: calendar/gui/e-week-view.c:3546 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 "C_ortar"
 
-#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3700
-#: calendar/gui/e-week-view.c:3547 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 "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3665
-#: calendar/gui/e-day-view.c:3701 calendar/gui/e-week-view.c:3518
-#: calendar/gui/e-week-view.c:3548 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"
@@ -5224,8 +5239,8 @@ msgstr "_Marcar Tarefas Seleccionadas como Terminadas"
 msgid "_Delete Selected Tasks"
 msgstr "_Apagar Tarefas Seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7630
-#: calendar/gui/e-week-view.c:4247
+#: 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 "A actualizar objectos"
 
@@ -5268,7 +5283,7 @@ msgid "Start Date"
 msgstr "Data Início"
 
 #: 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 "Resumo"
@@ -5300,22 +5315,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 divisões minutos"
 
 #. 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"
 
@@ -5331,67 +5346,67 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "Novo _Compromisso"
 
-#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3508
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
 msgid "New All Day _Event"
 msgstr "Novo _Evento Dia Completo"
 
-#: calendar/gui/e-day-view.c:3653 calendar/gui/e-week-view.c:3509
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
 msgid "New Meeting"
 msgstr "Nova Reunião"
 
-#: calendar/gui/e-day-view.c:3655 calendar/gui/e-week-view.c:3510
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
 msgid "New Task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/e-day-view.c:3660 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3673 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: calendar/gui/e-day-view.c:3672 calendar/gui/e-week-view.c:3524
+#: 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 para _Hoje"
 
-#: calendar/gui/e-day-view.c:3674 calendar/gui/e-week-view.c:3525
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
 msgid "_Go to Date..."
 msgstr "_Ir para Data..."
 
-#: calendar/gui/e-day-view.c:3679 calendar/gui/e-week-view.c:3529
+#: 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 Informação Livre/Ocupado"
 
-#: calendar/gui/e-day-view.c:3684 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
 #: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "Configuraçõe_s..."
 
-#: calendar/gui/e-day-view.c:3693 calendar/gui/e-week-view.c:3540
+#: 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 "_Gravar Como..."
 
-#: calendar/gui/e-day-view.c:3705 calendar/gui/e-week-view.c:3552
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
 msgid "_Schedule Meeting..."
 msgstr "A_gendar Reunião..."
 
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3553
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
 msgid "_Forward as iCalendar..."
 msgstr "_Reenviar como iCalendário"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3558
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
 msgid "Make this Occurrence _Movable"
 msgstr "Tornar esta Ocorrência _Móvel"
 
-#: calendar/gui/e-day-view.c:3712 calendar/gui/e-week-view.c:3559
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
 msgid "Delete this _Occurrence"
 msgstr "Apagar esta _Ocorrência"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3560
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
 msgid "Delete _All Occurrences"
 msgstr "_Apagar Todas Ocorrências"
 
@@ -5510,31 +5525,31 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Nenhum</i>"
 
-#: calendar/gui/e-itip-control.c:1058
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "Localização:"
 
-#: 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 "Aceite"
 
-#: 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 "Aceite Tentativamente"
 
-#: 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 "Recusada"
 
-#: 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
@@ -5546,300 +5561,300 @@ msgstr "Recusada"
 msgid "Unknown"
 msgstr "Desconhecida"
 
-#: 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 "Seleccione uma acção:"
 
-#: 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: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 "Aceitar"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Aceitar tentativamente"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Recusar"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Enviar Informação Livre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Actualizar estado respostas"
 
-#: calendar/gui/e-itip-control.c:1225
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Enviar Última Informação"
 
-#: 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> publicou informação de reunião."
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Informação Reunião"
 
-#: 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> pede a presença de %s na reunião."
 
-#: 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> pede a sua presença na reunião."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Proposta Reunião"
 
-#: 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> deseja adicionar uma reunião existente."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Actualização Reunião"
 
-#: 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> deseja receber a mais recente informação de reunião."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "Pedido Actualização Reunião"
 
-#: 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> respondeu a um pedido de reunião."
 
-#: calendar/gui/e-itip-control.c:1346
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Resposta Reunião"
 
-#: 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> cancelou uma reunião."
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Cancelamento Reunião"
 
-#: 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> enviou uma mensagem imperceptível."
 
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Mensagem Reunião Inválida"
 
-#: 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> publicou informação de tarefa."
 
-#: calendar/gui/e-itip-control.c:1387
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Informação Tarefa"
 
-#: 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> requer que %s execute uma tarefa."
 
-#: 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> requer que você execute uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Proposta Tarefa"
 
-#: 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> deseja adicionar a uma tarefa existente."
 
-#: calendar/gui/e-itip-control.c:1400
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Actualização Tarefa"
 
-#: 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> deseja receber a mais recente informação de tarefa."
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Pedido Actualização Tarefa"
 
-#: 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> respondeu a uma atribuição de tarefa."
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Resposta Tarefa"
 
-#: 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> cancelou uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1421
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Cancelamento Tarefa"
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Mensagem Tarefa Inválida"
 
-#: 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> publicou informação de livre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1449
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Informação Livre/Ocupado"
 
-#: 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> pede a sua informação de livre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1454
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Pedido Livre/Ocupado"
 
-#: 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> respondeu a um pedido de livre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1459
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Resposta Livre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1464
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Mensagem Livre/Ocupado Inválida"
 
-#: 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 "A mensagem não parece estar correctamente criada"
 
-#: calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "A mensagem apenas contém pedidos não suportados."
 
-#: 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 "O anexo não contém uma mensagem de calendário válida"
 
-#: calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "O anexo não contém itens de calendário visíveis"
 
-#: 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 "Objecto está inválido e não pode 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 "Ocorreu um erro no systema 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 "Objecto não foi encontrado\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 "Não possui permissões adequadas para actualizar o calendário\n"
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Actualização 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 "Ficheiro de calendário não pode 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 ""
 "Estado de participante não pode ser actualizado porque o item já não existe"
 
-#: 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 resposta não é de um participante actual. Addicionar como participante?"
 
-#: 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 ""
 "Estado de participante não pode ser actualizado devido a um 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 "Não possui as permissões adequadas para actualizar o calendário\n"
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Estado de participante 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 "Estado de participante não pode ser actualizado!\n"
 
-#: calendar/gui/e-itip-control.c:2048
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Apagar Terminado"
 
-#: 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 "Item 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 "O item não pode ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:2205
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr "Seleccionar Pasta Calendário"
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr "Seleccionar Pasta Tarefas"
 
@@ -5942,7 +5957,7 @@ msgid "Needs Action"
 msgstr "Requer Acção"
 
 #: 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"
 
@@ -5958,14 +5973,14 @@ msgstr "Em Curso"
 #. 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, %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: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"
@@ -5977,63 +5992,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 "Fora Escritório"
 
-#: calendar/gui/e-meeting-time-sel.c:410
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Nenhuma Informação"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Opções"
 
-#: calendar/gui/e-meeting-time-sel.c:468
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Apenas M_ostrar Horas Trabalho"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Mostrar _Zoom Diminuido"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "Act_ualizar Livre/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 "_Autoselecção"
 
-#: 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 "Tod_as as Pessoas e 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 as _Pessoas e Um Recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:594
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "Pessoas _Requeridas"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Pessoas Requeridas e _Um Recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:630
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Hora _início reunião:"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Hora _fim reunião:"
 
@@ -6079,7 +6094,7 @@ msgstr "A apagar objectos seleccionados..."
 msgid "Expunging"
 msgstr "A Expurgar"
 
-#: calendar/gui/e-week-view.c:3507
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Novo _Compromisso..."
 
@@ -6185,57 +6200,57 @@ msgstr "Outubro"
 msgid "September"
 msgstr "Setembro"
 
-#: 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 "Tem de ser enviado um organizador."
 
-#: calendar/gui/itip-utils.c:297
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "É necessário pelo menos um participante"
 
-#: 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 "Informação 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 "Informação tarefa"
 
-#: 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 "Informação diário"
 
-#: 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 "Informação livre/ocupado"
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Informação calendário"
 
-#: 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 "Actualizar"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr "Contra-proposta"
 
-#: calendar/gui/itip-utils.c:512
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informação livre/ocupado (%s para %s)"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "Informação icalendário"
 
-#: calendar/gui/itip-utils.c:672
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Tem de ser um participante do evento."
 
@@ -6335,7 +6350,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 "Antever Impressão"
 
@@ -6371,31 +6386,43 @@ msgstr "Não perguntar novamente."
 msgid "Print Tasks"
 msgstr "Imprimir Tarefas"
 
-#: 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 "DSTQQSS"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "Fábrica para importar ficheiros iCalendário para o Evolution"
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Visualizador Evolution de calendário iTip/iMip"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "Importa ficheiros iCalendário para o Evolution"
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Visualizador Evolution de calendário iTip/iMip"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "Importa ficheiros vCalendário para o Evolution"
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Visualizador Evolution de calendário iTip/iMip"
 
-#: calendar/importers/icalendar-importer.c:380
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Mensagem Calendário"
+
+#: 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 "Lembrete!!"
 
-#: calendar/importers/icalendar-importer.c:588
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "Eventos Calendário"
 
-#: 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?"
@@ -6403,7 +6430,7 @@ msgstr ""
 "Evolution encontrou ficheiro do Calendário Gnome.\n"
 "Deseja importa-los para o Evolution?"
 
-#: calendar/importers/icalendar-importer.c:620
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr "Calendário Gnome"
 
@@ -8628,7 +8655,7 @@ msgid "The referenced credentials have expired."
 msgstr "As credenciais de referência expiraram."
 
 #: 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."
@@ -8639,7 +8666,7 @@ msgstr "Resposta de autenticação do servidor inválida."
 msgid "Failed to resolve host `%s': %s"
 msgstr "Falha ao resolver servidor '%s': %s"
 
-#: camel/camel-sasl-gssapi.c:295
+#: camel/camel-sasl-gssapi.c:299
 msgid "Unsupported security layer."
 msgstr "Camada de segurança não suportada."
 
@@ -9208,7 +9235,7 @@ msgstr "A verificar novo correio"
 msgid "Check for new messages in all folders"
 msgstr "A verificar novas mensagens em todas as pastas"
 
-#: 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 "Pastas"
 
@@ -10000,7 +10027,7 @@ msgstr ""
 "Incapaz de se ligar ao servidor POP %s.\n"
 "Erro ao enviar senha: %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 "Pasta `%s' inexistente."
@@ -10416,38 +10443,38 @@ msgstr "Responder-A:"
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:521
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:527
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:536
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:537
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatários da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:540
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: 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 "Introduza os endereços que irão receber uma cópia da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:544
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: 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."
@@ -10458,11 +10485,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Afixar Em:"
 
-#: composer/e-msg-composer-hdrs.c:554
+#: composer/e-msg-composer-hdrs.c:549
 msgid "Posting destination"
 msgstr "Destino afixagem"
 
@@ -10471,11 +10498,11 @@ msgstr "Destino afixagem"
 msgid "Attach file(s)"
 msgstr "Anexar ficheiro(s)"
 
-#: composer/e-msg-composer.c:530
+#: composer/e-msg-composer.c:533
 msgid "Could not create a PGP signature context"
 msgstr "Incapaz de criar um contexto de assinatura PGP"
 
-#: composer/e-msg-composer.c:809
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10484,30 +10511,30 @@ msgstr ""
 "Erro ao ler ficheiro %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Ficheiro existe, sobrepor?"
 
-#: composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao gravar ficheiro: %s"
 
-#: composer/e-msg-composer.c:1213
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao ler ficheiro: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao aceder a ficheiro: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Incapaz de recuperar mensagem do editor"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10516,7 +10543,7 @@ msgstr ""
 "Incapaz de procurar no ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1270
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10525,7 +10552,7 @@ msgstr ""
 "Incapaz de truncar ficheiro: %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"
@@ -10534,7 +10561,7 @@ msgstr ""
 "Incapaz de copiar descritor de ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10543,7 +10570,7 @@ msgstr ""
 "Erro ao gravar mensagem automaticamente: %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?"
@@ -10551,7 +10578,7 @@ msgstr ""
 "Ximian Evolution encontrou ficheiros por gravar de uma sessão anterior.\n"
 "Deseja tentar recupera-los?"
 
-#: composer/e-msg-composer.c:1544
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10562,32 +10589,32 @@ msgstr ""
 "\n"
 "Deseja gravar as suas alterações?"
 
-#: composer/e-msg-composer.c:1549
+#: composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Descartar Alterações"
 
-#: composer/e-msg-composer.c:1553
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensagem Modificada"
 
-#: composer/e-msg-composer.c:1585
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:1943
+#: composer/e-msg-composer.c:2015
 msgid "Signature:"
 msgstr "Assinatura:"
 
-#: 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 "Auto-gerada"
 
-#: 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 "Escrever uma mensagem"
 
-#: 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."
@@ -10595,7 +10622,7 @@ msgstr ""
 "Incapaz de criar janela de composição:\n"
 "Incapaz de activar controlo de selecção de endereços."
 
-#: 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"
@@ -10607,7 +10634,7 @@ msgstr ""
 "Certifique-se de que possui instaladas as versões\n"
 "correctas do gtkhtml e libgtkhtml.\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."
@@ -10615,7 +10642,7 @@ msgstr ""
 "Incapaz de criar janela de composição:\n"
 "Incapaz de activar componente de editor HTML."
 
-#: 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>"
@@ -10795,11 +10822,11 @@ msgstr ""
 msgid "Overwrite file?"
 msgstr "Sobrepor ficheiro?"
 
-#: e-util/e-passwords.c:345
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Recordar esta senha"
 
-#: e-util/e-passwords.c:347
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Recordar esta senha durante o resto desta sessão"
 
@@ -11022,31 +11049,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 "Importante"
 
 #. 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 "Trabalho"
 
 #. 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 "Pessoal"
 
 #. 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 "A Fazer"
 
 #. 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 "Mais Tarde"
 
@@ -11150,7 +11177,7 @@ msgstr "atrás"
 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"
 
@@ -11491,8 +11518,8 @@ msgid "Scanning %s"
 msgstr "A analizar %s"
 
 #: 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 "Correio"
@@ -11635,60 +11662,69 @@ msgid "Composer Preferences"
 msgstr "Preferências Compositor"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Controlo de configuração das Fontes de Apresentação Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Controlo de configuração das Contas de Correio Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Controlo de configuração do Correio Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Controlo de configuração do Compositor de Mensagens Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Configure aqui as suas preferências de correio, incluindo segurança e "
 "apresentação de mensagens"
 
-#: 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 aqui correcção ortográfica, assinaturas e o compositor de mensagens"
 
-#: 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 aqui as fontes utilizadas pelo Evolution"
 
-#: 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 aqui as suas contas de correio"
 
+#: 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 Conta Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Compositor de correio Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Compositor de correio Evolution."
+
 #: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Componente Evolution para gerir correio."
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Compositor de correio Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution mail composer."
-msgstr "Compositor de correio Evolution."
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Interface configuração correio"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Componente de resumo de correio Evolution."
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Componente de apresentação de pasta de correio Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Componente de apresentação de pasta de correio Evolution."
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Interface configuração correio"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "Factory for the controls exported by the Evolution Mailer"
-msgstr "Fábrica para controlos exportados pelo Correio Evolution"
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Componente de resumo de correio Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:15
 msgid "Font Preferences"
@@ -11702,43 +11738,39 @@ msgstr "Contas Correio"
 msgid "Mail Preferences"
 msgstr "Preferências Correio"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:18
-msgid "Mail configuration interface"
-msgstr "Interface configuração correio"
-
-#: mail/component-factory.c:114
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Pasta que contém correio"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "Correio Público"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "Pasta pública que contém correio"
 
-#: mail/component-factory.c:116
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Lixo Virtual"
 
-#: mail/component-factory.c:116
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Pasta Virtual de Lixo"
 
-#: mail/component-factory.c:144
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Esta pasta não pode conter mensagens."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Propriedades..."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Alterar as propriedades desta pasta"
 
-#: 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."
@@ -11746,52 +11778,52 @@ msgstr ""
 "Algumas das suas configurações de correio parecem corrompidas, verifique que "
 "está tudo em ordem."
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "Não definiu um modo de transporte de correio"
 
-#: mail/component-factory.c:1016
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Tem mensagens por enviar, deseja mesmo sair?"
 
-#: mail/component-factory.c:1056
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Nova Mensagem Correio"
 
-#: mail/component-factory.c:1056
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "_Mensagem Correio"
 
-#: mail/component-factory.c:1057
+#: mail/component-factory.c:1061
 msgid "Compose a new mail message"
 msgstr "Compor uma nova mensagem correio"
 
-#: mail/component-factory.c:1065
+#: mail/component-factory.c:1069
 msgid "New Message Post"
 msgstr "Afixar Nova Mensagem"
 
-#: mail/component-factory.c:1065
+#: mail/component-factory.c:1069
 msgid "_Post Message"
 msgstr "_Afixar Mensagem"
 
-#: mail/component-factory.c:1066
+#: mail/component-factory.c:1070
 msgid "Post a new mail message"
 msgstr "Afixar uma nova mensagem de correio"
 
-#: mail/component-factory.c:1349
+#: mail/component-factory.c:1353
 msgid "Connecting..."
 msgstr "A Ligar-se..."
 
-#: mail/component-factory.c:1360
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Incapaz de registar armazenamento na consola"
 
-#: mail/folder-browser-ui.c:483
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriedades de \"%s\""
 
-#: mail/folder-browser-ui.c:485
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Propriedades"
 
@@ -11975,21 +12007,37 @@ msgstr "Por Omissão"
 msgid "Getting Folder Information"
 msgstr "A Obter Informação Pasta"
 
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Compositor de correio 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 mbox para o Evolution"
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Compositor de correio Evolution."
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Importa ficheiros mbox para o 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 correio 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 correio Outlook Express 4 para o 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 ficheiros Outlook Express 4 para o 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 correio Evolution."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -12034,7 +12082,7 @@ msgstr "Não preencheu toda a informação necessária."
 msgid "Evolution Account Editor"
 msgstr "Editor Conta 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 "_Servidor:"
 
@@ -12042,7 +12090,7 @@ msgstr "_Servidor:"
 msgid "User_name:"
 msgstr "_Nome utilizador:"
 
-#: 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 "_Caminho"
 
@@ -12059,12 +12107,12 @@ msgid "Don't delete"
 msgstr "Não apagar"
 
 #: 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 "Activar"
 
@@ -12074,7 +12122,7 @@ msgid "[Default]"
 msgstr "[Por Omissão]"
 
 #: 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 "Activo"
 
@@ -12333,34 +12381,34 @@ msgstr "Imprimir Mensagem"
 msgid "Printing of message failed"
 msgstr "Impressão da mensagem falhou"
 
-#: 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 ""
 "Tem a certeza que deseja abrir todas as %d mensagens em janelas distintas?"
 
-#: 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 "Sem nome"
 
-#: mail/mail-composer-prefs.c:313
+#: mail/mail-composer-prefs.c:335
 msgid "You must specify a valid script name."
 msgstr "Tem de especificar um nome de script válido."
 
-#: 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 "[script]"
 
-#: 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 "Adicionar assinatura script"
 
-#: mail/mail-composer-prefs.c:902
+#: mail/mail-composer-prefs.c:926
 msgid "Signature(s)"
 msgstr "Assinatura(s)"
 
@@ -12425,11 +12473,11 @@ msgstr ""
 "no espaço abaixo um nome para esta conta. Este nome será apenas utilizado "
 "para fins de visualização."
 
-#: mail/mail-config.c:924
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "A Verificar Serviço"
 
-#: 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 "A ligar-se ao servidor..."
 
@@ -12674,24 +12722,25 @@ msgid "Message Display"
 msgstr "Visualização Mensagens"
 
 #: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Mensagem contém"
+
+#: 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 "Notificação Novo Correio"
 
-#: 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 ""
 "Nota: não lhe será pedida nenhuma senha até que se ligue pela primeira vez"
 
-#: mail/mail-config.glade.h:80
-msgid "On Screen fonts"
-msgstr "Fontes em ecrã"
-
 #: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Informação Opcional"
@@ -12927,102 +12976,108 @@ msgid "_Enable"
 msgstr "_Activar"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr "Largura _fixa:"
-
-#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "_Estilo reencaminhamento:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "_Nome completo:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr "Correio _HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr "_Identidade"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "_Ler imagens se o remetente estiver no livro de endereços"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "_Tornar esta a minha conta por omissão"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensagens como lidas após"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "_Nunca ler as imagens da rede"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr "_Reproduzir som ao chegar correio novo"
 
-#: 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 "_Avisar ao enviar mensagens HTML para contactos que as não desejam"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Avisar ao enviar mensagens sem linha de assunto definida"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr "A _Receber Correio"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "Estilo _resposta:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr "_Repor omissões"
 
-#: 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 "A En_viar Correio"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Mo_strar imagens animadas"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "A_ssinaturas"
 
+#: 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 "_Utilizar ligação segura (SSL):"
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "Contacto Original:"
 
 #: mail/mail-config.glade.h:176
-msgid "_Variable-width:"
-msgstr "Largura _variável:"
+msgid "_Use secure connection (SSL):"
+msgstr "_Utilizar ligação segura (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 "a ca_da"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr "cor"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "descrição"
 
@@ -13106,19 +13161,19 @@ msgstr "Atrasado:"
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "por %B %d, %Y, %l:%M %P"
 
-#: mail/mail-display.c:2234
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Abrir Link no Browser"
 
-#: mail/mail-display.c:2235
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Copiar Localização Link"
 
-#: mail/mail-display.c:2237
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Gravar Link como (CORRIGIR-ME)"
 
-#: mail/mail-display.c:2239
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Gravar Imagem como..."
 
@@ -13659,31 +13714,31 @@ msgstr "Alto"
 msgid "Highest"
 msgstr "Mais Alto"
 
-#: 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 "Hoje %l:%M %p"
 
-#: mail/message-list.c:1092
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %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 "A gerar lista de mensagens"
 
@@ -13779,40 +13834,40 @@ msgstr "_Expira a:"
 msgid "_Flag:"
 msgstr "_Marca:"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "A analisar pastas abaixo de %s em \"%s\""
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "A analisar pastas nivel de topo em \"%s\""
 
-#: mail/subscribe-dialog.c:331
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "A subscrever pasta \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "A dessubscrever pasta \"%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 "Pasta"
 
-#: mail/subscribe-dialog.c:1356
+#: mail/subscribe-dialog.c:1389
 msgid "Scanning folders..."
 msgstr "A analisar pastas..."
 
-#: mail/subscribe-dialog.c:1470
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Não foi seleccionado nenhum servidor"
 
-#: mail/subscribe-dialog.c:1545
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Seleccione um servidor."
 
@@ -13846,18 +13901,25 @@ msgid "_Unsubscribe"
 msgstr "_Dessubscrever"
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
-msgid "Configuration control for the Evolution Summary."
-msgstr "Controlo de configuração para o Resumo Evolution."
-
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Configure aqui a aparência do Resumo Evolution"
 
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Summary"
+msgstr "Componente de Resumo Evolution."
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
-msgid "Evolution Summary component."
+#, fuzzy
+msgid "Evolution Summary component"
 msgstr "Componente de Resumo Evolution."
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Componente de Resumo Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 msgid "Summary Preferences"
 msgstr "Preferências Resumo"
 
@@ -23747,15 +23809,15 @@ msgstr "KBOS"
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:524
+#: my-evolution/e-summary.c:523
 msgid "Please wait..."
 msgstr "Aguarde por favor..."
 
-#: 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 Resumo"
 
-#: my-evolution/e-summary.c:624
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Impressão do Resumo falhou"
 
@@ -25026,21 +25088,22 @@ msgid "_Weather"
 msgstr "_Meteorologia"
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configuration control for Evolution folder settings."
-msgstr "Controlo de configuração para definições de pastas Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Configure special folders and offline folder behavior here"
 msgstr ""
 "Configure aqui pastas especiais e comportamento de pastas quando desligado"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "A consola Evolution."
+
 #: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Folder Settings"
-msgstr "Definições Pastas"
+msgid "Evolution folder settings configuration control"
+msgstr ""
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "The Evolution shell."
-msgstr "A consola Evolution."
+msgid "Folder Settings"
+msgstr "Definições Pastas"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25072,8 +25135,8 @@ msgstr "Adicionar uma Pasta"
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: 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 "Caixa Entrada"
 
@@ -25109,40 +25172,7 @@ msgstr ""
 "Ocorreu um erro ao copiar ficheiros para\n"
 "`%s'."
 
-#: shell/e-setup.c:243
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Evolution incapaz de criar directório\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 ""
-"Directório %s\n"
-"não possui as permissões adequadas. Torne-o legível\n"
-"e executável e reinicie o 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 ""
-"Ficheiro %s\n"
-"deverá ser removido para permitir que o Evolution funcione correctamente.\n"
-"Remova este ficheiro e reinicie o Evolution."
-
-#: shell/e-setup.c:290
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -25153,7 +25183,7 @@ msgstr ""
 "Mova-o por forma a permitir a instalação dos\n"
 "ficheiros de utilizadores Evolution."
 
-#: shell/e-setup.c:299
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25297,7 +25327,7 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "Criar Nova Pasta"
 
-#: 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 "(Sem Título)"
 
@@ -25336,17 +25366,17 @@ 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 "Ficheiro %s não 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 "Erro 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"
@@ -25355,11 +25385,11 @@ msgstr ""
 "Não existe nenhum importador capaz de converter\n"
 "%s"
 
-#: shell/e-shell-importer.c:517
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "A Importar"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25368,17 +25398,17 @@ msgstr ""
 "A importar %s.\n"
 "A iniciar %s"
 
-#: shell/e-shell-importer.c:536
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "Erro ao iniciar %s"
 
-#: shell/e-shell-importer.c:550
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro ao ler %s"
 
-#: shell/e-shell-importer.c:567
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25387,31 +25417,31 @@ msgstr ""
 "A importar %s\n"
 "A importar item 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 "Nome ficheiro:"
 
-#: shell/e-shell-importer.c:675
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Seleccione um ficheiro"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Tipo ficheiro:"
 
-#: shell/e-shell-importer.c:709
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "Importar dados e configurações de aplicações antigas"
 
-#: shell/e-shell-importer.c:713
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "Importar um único ficheiro"
 
-#: 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"
@@ -25419,24 +25449,24 @@ msgstr ""
 "Aguarde por favor...\n"
 "A analisar configurações existentes"
 
-#: shell/e-shell-importer.c:782
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "A Iniciar 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 pasta"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Seleccione uma pasta de destino para importar estes dados"
 
-#: 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"
 
@@ -25577,27 +25607,27 @@ msgstr "Trabalhar Desligado"
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta apresentada)"
 
-#: 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 "(Nenhum)"
 
-#: 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 de momento está ligado. Clique neste botão para trabalhar "
 "desligado."
 
-#: 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á no processo de se desligar."
 
-#: 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 ""
@@ -25615,12 +25645,12 @@ msgstr ""
 "O erro do sistema de activação é:\n"
 "%s"
 
-#: shell/e-shell.c:738
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Incapaz de configurar armazenamento local -- %s"
 
-#: shell/e-shell.c:1804
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25631,19 +25661,19 @@ msgstr ""
 "terminou inesperadamente. Terá de sair do Evolution e reiniciar\n"
 "por forma a ter novamente acesso a esses dados."
 
-#: shell/e-shell.c:2069
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: shell/e-shell.c:2071
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "Incapaz de se registar no OAF"
 
-#: shell/e-shell.c:2073
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "Base de dados de configuração não encontrada"
 
-#: shell/e-shell.c:2075 shell/e-storage.c:572
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Erro genérico"
 
@@ -25879,63 +25909,63 @@ msgstr ""
 "O erro do sistema de activação é:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "Erro CORBA"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Interrompido"
 
-#: 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 "Já possui um dono"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Sem dono"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Não encontrado"
 
-#: shell/evolution-shell-component.c:1179
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Tipo não suportado"
 
-#: shell/evolution-shell-component.c:1181
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Esquema não suportado"
 
-#: shell/evolution-shell-component.c:1183
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Operação não suportada"
 
-#: shell/evolution-shell-component.c:1185
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Existe"
 
-#: shell/evolution-shell-component.c:1191
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "URI inválido"
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Possui subpastas"
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Sem espaço livre"
 
-#: shell/evolution-shell-component.c:1199
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "Dono antigo terminou"
 
@@ -25955,10 +25985,6 @@ msgstr "Clique OK para fechar as ligações e ficar desligado"
 msgid "The following connections are currently active:"
 msgstr "Encontram-se activas as seguintes ligações:"
 
-#: 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 "C_alendário:"
@@ -26096,16 +26122,16 @@ msgstr "Não me perguntar novamente"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution pode importar dados dos seguintes ficheiros:"
 
-#: 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á a terminar..."
 
 #. 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"
@@ -26142,7 +26168,7 @@ msgstr ""
 "Esperamos que lhe agrade o resultado do nosso trabalho, e aguardamos\n"
 "as suas contribuições!\n"
 
-#: shell/main.c:288
+#: shell/main.c:290
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -26150,41 +26176,45 @@ msgstr ""
 "Obrigado\n"
 "A Equipa do Ximian Evolution\n"
 
-#: shell/main.c:296
+#: shell/main.c:298
 msgid "Don't tell me again"
 msgstr "Não me dizer novamente"
 
-#: shell/main.c:385
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Incapaz de aceder à consola Ximian Evolution."
 
-#: shell/main.c:394
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Incapaz de inicializar a consola Ximian Evolution: %s"
 
-#: shell/main.c:526
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Desactivar ecrã de logotipo"
 
-#: shell/main.c:528
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "Iniciar em modo desligado"
 
-#: shell/main.c:530
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "Iniciar em modo ligado"
 
-#: 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 ""
 "Enviar o resultado de depuração de todos os componentes para um ficheiro."
 
-#: shell/main.c:535
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr "Forçar a actualização de ficheiros de configuração do Evolution 1.0.x"
 
-#: shell/main.c:560
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26194,7 +26224,6 @@ msgstr ""
 "  Utilize %s --help para mais informações.\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 "Erro ao ler livro de endereços por omissão."
@@ -26204,10 +26233,6 @@ msgstr "Erro ao ler livro de endereços por omissão."
 msgid "Input File"
 msgstr "Ficheiro Origem"
 
-#: tools/evolution-addressbook-export.c:51
-msgid "Output File"
-msgstr "Ficheiro Destino"
-
 #: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Nenhum nome de ficheiro indicado."
@@ -26236,6 +26261,19 @@ msgstr "Marcar anexo para por omissão ser mostrado imbutido."
 msgid "Default subject for the message."
 msgstr "Assunto por omissão da mensagem."
 
+#. 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 "Incapaz de renomear '%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 "Copiar Contacto(s) para Outra Pasta..."
@@ -27728,12 +27766,12 @@ msgstr "Definir Vistas"
 
 #. 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 "STQQSSD"
 
 #. 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"
 
@@ -27884,40 +27922,202 @@ msgstr "_Procurar Agora"
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: widgets/misc/e-search-bar.c:839
+#: widgets/misc/e-search-bar.c:833
 msgid "Item ID"
 msgstr "ID Item"
 
-#: widgets/misc/e-search-bar.c:846
+#: widgets/misc/e-search-bar.c:840
 msgid "Subitem ID"
 msgstr "ID Subitem"
 
-#: 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 "Limpar"
 
-#: widgets/misc/e-search-bar.c:933
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Procurar Agora"
 
 #: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "O Servidor de Livro de Endereços Pessoal"
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Visualizador de minicartões da Agenda 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 "O Servidor de Calendário Pessoal; fábrica de calendário"
+#, fuzzy
+msgid "Evolution Calendar local file backend"
+msgstr "Visualizador Evolution de calendário iTip/iMip"
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Visualizador de minicartões da Agenda Evolution"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Fábrica para importar ficheiros LDIF para o Evolution."
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Importa ficheiros LDIF para o Evolution."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Fábrica para importar ficheiros VCard para o Evolution."
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Importa ficheiros VCard para o Evolution."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "Um controlo Bonobo para um popup de endereço."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Um controlo Bonobo para mostrar um endereço."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Um controlo Bonobo de exemplo que mostra uma agenda."
+
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr ""
+#~ "Controlo de configuração dos Armazenamentos Livros de Endereços Evolution."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Controlo que mostra um mini-cartão da agenda Evolution."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Componente Evolution para gerir contactos."
+
+#~ msgid "Factory for the controls exported by the Evolution Addressbook"
+#~ msgstr "Fábrica para os controlos exportados pelo Livro Endereços Evolution"
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr ""
+#~ "Fábrica para o interface de selecção de nome do Livro de Endereços "
+#~ "Evolution"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Lista Contactos Sem Nome"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d não mostrados)"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Um controlo Bonobo que apresenta uma lista de tarefas."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Um controlo Bonobo de exemplo que apresenta um calendário."
+
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Controlo de configuração para o Calendário do Evolution."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Componente Evolution para gerir o calendário."
+
+#~ msgid "Factory for the Evolution Calendar objects"
+#~ msgstr "Fábrica para os objectos de Calendário Evolution"
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr ""
+#~ "Fábrica para centralizar diálogos de editor de componente calendário"
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Serviço de alarme de notificação"
+
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Fábrica para importar ficheiros iCalendário para o Evolution"
+
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Importa ficheiros iCalendário para o Evolution"
+
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Importa ficheiros vCalendário para o Evolution"
+
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Controlo de configuração das Fontes de Apresentação Evolution."
+
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Controlo de configuração das Contas de Correio Evolution."
+
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Controlo de configuração do Correio Evolution."
+
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Controlo de configuração do Compositor de Mensagens Evolution."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Componente Evolution para gerir correio."
+
+#~ msgid "Factory for the controls exported by the Evolution Mailer"
+#~ msgstr "Fábrica para controlos exportados pelo Correio Evolution"
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Fábrica para importar mbox para o Evolution"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importa ficheiros mbox para o Evolution"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "Fábrica para importar correio Outlook Express 4 para o Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importa ficheiros Outlook Express 4 para o Evolution"
+
+#~ msgid "On Screen fonts"
+#~ msgstr "Fontes em ecrã"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "Largura _fixa:"
+
+#~ msgid "_Variable-width:"
+#~ msgstr "Largura _variável:"
+
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Controlo de configuração para o Resumo Evolution."
+
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Controlo de configuração para definições de pastas Evolution."
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Evolution incapaz de criar directório\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 ""
+#~ "Directório %s\n"
+#~ "não possui as permissões adequadas. Torne-o legível\n"
+#~ "e executável e reinicie o Evolution."
+
+#~ msgid ""
+#~ "File %s\n"
+#~ "should be removed to allow Evolution to work correctly.\n"
+#~ "Please remove this file and restart Evolution."
+#~ msgstr ""
+#~ "Ficheiro %s\n"
+#~ "deverá ser removido para permitir que o Evolution funcione "
+#~ "correctamente.\n"
+#~ "Remova este ficheiro e reinicie o Evolution."
+
+#~ msgid "Output File"
+#~ msgstr "Ficheiro Destino"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "O Servidor de Livro de Endereços Pessoal"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "O Servidor de Calendário Pessoal; fábrica de calendário"
 
-#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:3
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:3
-msgid "Wombat InterfaceCheck interface"
-msgstr "Interface Wombat InterfaceCheck"
+#~ msgid "Wombat InterfaceCheck interface"
+#~ msgstr "Interface Wombat InterfaceCheck"
 
 #~ msgid "1234"
 #~ msgstr "1234"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8b6c4fe754..1d25249e28 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.3.2\n"
-"POT-Creation-Date: 2003-03-29 11:33-0300\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-03-29 13:52-0300\n"
 "Last-Translator: Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
@@ -14,20 +14,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 arquivos LDIF no Evolution."
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Redator de correio do Evolution."
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "Importa arquivos LDIF no 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 arquivos VCard no Evolution."
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Redator de correio do Evolution."
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importa arquivos VCard no Evolution."
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Redator de correio do 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
@@ -197,14 +204,14 @@ msgid "TTY"
 msgstr "TTY"
 
 #: 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 "E-mail 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"
@@ -490,78 +497,77 @@ msgstr "Recebendo resultados da busca LDAP..."
 msgid "Error performing search"
 msgstr "Erro ao executar busca"
 
-#: addressbook/conduit/address-conduit.c:296
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Endereço padrão de sincronização:"
 
-#: addressbook/conduit/address-conduit.c:539
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Não foi possível carregar cursor\n"
 
-#: addressbook/conduit/address-conduit.c:552
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EBook não foi carregado\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 "Não foi possível iniciar o servidor wombat"
 
-#: 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 "Não foi possível iniciar wombat"
 
-#: 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 "Não foi possível ler os dados do aplicativo de endereços do pilot"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Um controle Bonobo para um popup de endereços."
+msgid "Configure access to LDAP directory servers here"
+msgstr "Configure o acesso a servidores de diretório LDAP aqui"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Um controle Bonobo para exibir um endereço."
+msgid "Directory Servers"
+msgstr "Servidores de diretório"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Um controle Bonobo exemplo que exibe um catálogo de endereços."
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Visualizador de mini-cartão do catálogo de endereços do Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr ""
-"Controle de configuração para os Repositórios de Catálogo de endereços do "
-"Evolution."
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Interface para seleção de nomes do catálogo de endereços do Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure access to LDAP directory servers here"
-msgstr "Configure o acesso a servidores de diretório LDAP aqui"
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Visualizador de mini-cartão do catálogo de endereços do Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr ""
-"Controle que exibe um mini-cartão do catálogo de endereços do Evolution."
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Visualizador de mini-cartão do catálogo de endereços do Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Directory Servers"
-msgstr "Servidores de diretório"
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Visualizador de mini-cartão do catálogo de endereços do Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Visualizador de mini-cartão do catálogo de endereços do Evolution"
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Componente de teste do Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Componente do Evolution para manipular contatos."
-
-#: 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 os controles exportados pelo Catálogo de endereços do Evolution"
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Visualizador de mini-cartão do catálogo de endereços do Evolution"
 
 #: addressbook/gui/component/addressbook-component.c:76
 #: addressbook/gui/component/addressbook-component.c:605
@@ -784,7 +790,7 @@ msgstr "Esta consulta não terminou com sucesso."
 
 #. 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 "Qualquer categoria"
 
@@ -797,46 +803,46 @@ msgstr "A URI que o navegador de pastas vai exibir"
 #. * 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 "(nenhum)"
 
-#: 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 "E-mail principal"
 
-#: addressbook/gui/component/e-address-popup.c:608
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Selecionar uma ação"
 
-#: 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 "Criar um novo contato \"%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 "Adicionar endereço a um contato existente \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:913
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Consultando catálogo de endereços..."
 
-#: 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 informação do contato"
 
-#: 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 "Adicionar a contatos"
 
-#: addressbook/gui/component/e-address-popup.c:1051
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Mesclar endereço de e-mail:"
 
@@ -969,7 +975,7 @@ msgid "LDAP Configuration Assistant"
 msgstr "Assistente de configuração 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"
 
@@ -999,8 +1005,8 @@ msgstr "_Escopo de busca: "
 
 #. 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 "Buscando"
 
@@ -1294,47 +1300,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 "Interface para seleção de nomes do catálogo de endereços do Evolution"
 
-#: 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 interface para seleção de nomes do catálogo de endereços"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Remover todos"
 
 #. 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 "Remover"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:177
-msgid "Remove All"
-msgstr "Remover todos"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:201
-msgid "Send HTML Mail?"
-msgstr "Enviar correio HTML?"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:300
-msgid "View Contact Info"
-msgstr "Ver informação do contato"
-
-#: 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 contatos"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:417
-msgid "Unnamed Contact List"
-msgstr "Lista de contatos sem nome"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+msgid "View Contact Info"
+msgstr "Ver informação do contato"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:434
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d não exibidos)"
+#: 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 correio 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 "Contato sem nome"
 
@@ -1343,11 +1338,11 @@ msgstr "Contato sem nome"
 msgid "Source"
 msgstr "Fonte"
 
-#: 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 "Selecionar contatos do catálago de endereços"
 
-#: 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 "Localizar contato em"
 
@@ -1477,7 +1472,7 @@ msgstr "Deseja receber correio _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:3710 calendar/gui/e-week-view.c:3557
+#: 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
@@ -1516,10 +1511,10 @@ msgstr "Endereço de 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 "Editável"
 
@@ -2549,7 +2544,7 @@ msgstr "Zimbábue"
 #: 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 "Livro"
@@ -2557,7 +2552,7 @@ msgstr "Livro"
 #: 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 "Cartão"
 
@@ -2858,7 +2853,7 @@ msgstr "%d cartões"
 #: 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"
@@ -2873,20 +2868,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 "Erro ao modificar cartão"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr "Sucesso"
 
 #: 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 "Erro desconhecido"
 
@@ -2895,7 +2891,7 @@ msgid "Repository offline"
 msgstr "Repositório 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 "Permissão negada"
 
@@ -2912,7 +2908,7 @@ msgid "Protocol not supported"
 msgstr "Protocolo não suportado"
 
 #: 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
@@ -3107,7 +3103,7 @@ msgid "Delete"
 msgstr "Excluir"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:904
-#: calendar/gui/e-day-view.c:3670 calendar/gui/e-week-view.c:3522
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 msgid "Current View"
 msgstr "Visão atual"
 
@@ -3211,38 +3207,38 @@ msgstr "e um outro cartão."
 msgid "Save in addressbook"
 msgstr "Salvar no catálogo de endereços"
 
-#: 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 "Largura"
 
-#: 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 "Altura"
 
-#: 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 "Possui 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 "Nome do campo"
 
-#: addressbook/gui/widgets/e-minicard-label.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Modelo de texto"
 
-#: addressbook/gui/widgets/e-minicard-label.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Comprimento máximo de nome de campo"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:125
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
 msgstr "Largura da coluna"
 
@@ -3274,11 +3270,11 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adaptador"
 
-#: addressbook/gui/widgets/e-minicard.c:165
+#: addressbook/gui/widgets/e-minicard.c:169
 msgid "Selected"
 msgstr "Selecionado"
 
-#: addressbook/gui/widgets/e-minicard.c:172
+#: addressbook/gui/widgets/e-minicard.c:176
 msgid "Has Cursor"
 msgstr "Possui cursor"
 
@@ -3608,7 +3604,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"
@@ -3627,71 +3623,74 @@ msgstr "Baixa"
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: calendar/conduits/calendar/calendar-conduit.c:208
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr "Eventos de vários dias partidos:"
 
-#: 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 "Erro ao comunicar com o 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 "Não foi possível ler os dados do aplicativo de agenda do pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:208
+#: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
 msgstr "Prioridade padrão:"
 
-#: 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 "Não foi possível ler os dados do aplicativo de tarefas do pilot"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "Um controle Bonobo que exibe uma lista de tarefas."
+msgid "Calendar and Tasks"
+msgstr "Agenda e tarefas"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Um controle Bonobo exemplo que exibe uma agenda."
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure o seu fuso horário, agenda e lista de tarefas aqui "
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
 msgstr "Agenda e tarefas"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Controle de configuração para a agenda do Evolution."
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Componente de exibição de pastas de correio do Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure o seu fuso horário, agenda e lista de tarefas aqui "
+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 "Visualizador iTip/iMip da agenda do Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Componente do Evolution para manipular a agenda."
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Visualizador iTip/iMip da agenda do Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Factory for the Evolution Calendar objects"
-msgstr "Fábrica para os objetos da Agenda do Evolution"
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Visualizador iTip/iMip da agenda do Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Fábrica para centralizar os diálogos do editor do componente de agenda"
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Alarme do Evolution"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Alarm notification service"
-msgstr "Serviço de notificação de alarme"
-
-#: 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 o serviço de notificação de alarme"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
@@ -3795,7 +3794,7 @@ msgstr "Descrição contém"
 msgid "Comment contains"
 msgstr "Comentário contém"
 
-#: 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 "Não casadas"
 
@@ -3805,8 +3804,8 @@ 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: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"
 
@@ -3824,7 +3823,7 @@ msgstr "%d de %B de %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"
 
@@ -3856,7 +3855,7 @@ msgstr "Pasta pública contendo compromissos e 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: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
@@ -3923,12 +3922,12 @@ msgstr "Compromisso de _dia inteiro"
 msgid "Create a new all-day appointment"
 msgstr "Criar um novo compromisso de dia inteiro"
 
-#: 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 "Particular"
 
-#: 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"
@@ -3953,37 +3952,37 @@ msgstr "L"
 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 "Livre"
 
 #: 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 "Não iniciada"
 
-#: 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 "Em progresso"
 
-#: 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 "Concluída"
 
-#: calendar/gui/calendar-model.c:1028
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3994,32 +3993,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 "Nenhum"
 
-#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Repetindo"
 
-#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Atribuido"
 
-#: 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 "Sim"
 
-#: 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 "Não"
@@ -4057,31 +4056,31 @@ msgstr "Permissão negada para abrir a agenda"
 msgid "Could not open the folder in '%s'"
 msgstr "Não foi possível abrir pasta em '%s'"
 
-#: calendar/gui/control-factory.c:163
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "A URI que a agenda vai exibir"
 
-#: calendar/gui/control-factory.c:170
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr "O tipo de visão a exibir"
 
-#: calendar/gui/dialogs/alarm-options.c:473
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Opções do alarme audível"
 
-#: calendar/gui/dialogs/alarm-options.c:482
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Opções do alarme de mensagem"
 
-#: calendar/gui/dialogs/alarm-options.c:491
+#: calendar/gui/dialogs/alarm-options.c:438
 msgid "Email Alarm Options"
 msgstr "Opções do alarme de e-mail"
 
-#: calendar/gui/dialogs/alarm-options.c:500
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Opções do alarme de programa"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Opções do alarme desconhecido"
 
@@ -4122,14 +4121,19 @@ msgid "days"
 msgstr "dias"
 
 #: 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 "vezes extra a 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"
 
@@ -4194,7 +4198,7 @@ msgstr "fim do compromisso"
 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)"
 
@@ -4374,7 +4378,7 @@ msgid "_Fri"
 msgstr "Se_x"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "_Geral"
 
@@ -4442,7 +4446,9 @@ msgstr "Você tem certeza que deseja cancelar e excluir esta tarefa?"
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
-msgstr "O item de diário sendo apagado está publicado. Você gostaria de enviar um aviso de cancelamento?"
+msgstr ""
+"O item de diário sendo apagado está publicado. Você gostaria de enviar um "
+"aviso de cancelamento?"
 
 #: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
@@ -4558,8 +4564,8 @@ msgid "No summary"
 msgstr "Sem resumo"
 
 #: calendar/gui/dialogs/comp-editor.c:1230
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3928
-#: calendar/gui/e-week-view.c:3758 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 "Salvar como..."
 
@@ -4652,19 +4658,19 @@ msgstr "Agendamento"
 msgid "Meeting"
 msgstr "Reunião"
 
-#: 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 "A data de início está errada"
 
-#: calendar/gui/dialogs/event-page.c:664
+#: calendar/gui/dialogs/event-page.c:610
 msgid "End date is wrong"
 msgstr "A data de término está errada"
 
-#: calendar/gui/dialogs/event-page.c:687
+#: calendar/gui/dialogs/event-page.c:633
 msgid "Start time is wrong"
 msgstr "A hora de início está errada"
 
-#: calendar/gui/dialogs/event-page.c:694
+#: calendar/gui/dialogs/event-page.c:640
 msgid "End time is wrong"
 msgstr "A hora de término está errada"
 
@@ -4721,15 +4727,10 @@ msgid "Su_mmary:"
 msgstr "_Resumo:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "Co_ntatos..."
-
-#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_End time:"
 msgstr "Hora de tér_mino:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "Hora de _início:"
 
@@ -4789,7 +4790,7 @@ msgid "Member"
 msgstr "Membro"
 
 #: 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"
@@ -4811,37 +4812,37 @@ msgid "_Change Organizer"
 msgstr "_Alterar 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 "_Convidar outros..."
 
-#: calendar/gui/dialogs/recur-comp.c:52
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 "Você está modificando um evento recorrente, o que você gostaria de modificar?"
 
-#: calendar/gui/dialogs/recur-comp.c:56
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 "Você está modificando uma tarefa recorrente, o que você gostaria de "
 "modificar?"
 
-#: calendar/gui/dialogs/recur-comp.c:60
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 "Você está modificando um item de diário recorrente, o que você gostaria de "
 "modificar?"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Esta instância apenas"
 
-#: calendar/gui/dialogs/recur-comp.c:80
+#: calendar/gui/dialogs/recur-comp.c:75
 msgid "This and Future Instances"
 msgstr "Esta e futuras instâncias"
 
-#: calendar/gui/dialogs/recur-comp.c:82
+#: calendar/gui/dialogs/recur-comp.c:77
 msgid "All Instances"
 msgstr "Todas as instâncias"
 
@@ -5014,7 +5015,7 @@ msgstr "Atribuição"
 msgid "Due date is wrong"
 msgstr "O prazo de conclusão está errado"
 
-#: 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:"
@@ -5024,6 +5025,10 @@ msgstr "Descrição:"
 msgid "Sta_rt Date:"
 msgstr "_Data de início:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "Co_ntatos..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "Pra_zo de conclusão:"
@@ -5122,56 +5127,67 @@ msgid "%s for an unknown trigger type"
 msgstr "%s para um tipo de gatilho desconhecido"
 
 #: 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 "Excluindo objetos selecionados"
 
-#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3692
-#: calendar/gui/e-week-view.c:3539 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 "A_brir"
@@ -5180,30 +5196,30 @@ msgstr "A_brir"
 msgid "_Save as..."
 msgstr "_Salvar como..."
 
-#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3694
-#: calendar/gui/e-week-view.c:3514 calendar/gui/e-week-view.c:3541
+#: 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 "_Imprimir..."
 
-#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3699
-#: calendar/gui/e-week-view.c:3546 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 "Recor_tar"
 
-#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3700
-#: calendar/gui/e-week-view.c:3547 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 "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3665
-#: calendar/gui/e-day-view.c:3701 calendar/gui/e-week-view.c:3518
-#: calendar/gui/e-week-view.c:3548 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"
@@ -5229,8 +5245,8 @@ msgstr "_Marcar tarefas selecionadas como concluídas"
 msgid "_Delete Selected Tasks"
 msgstr "_Excluir tarefas selecionadas"
 
-#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7630
-#: calendar/gui/e-week-view.c:4247
+#: 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 "Atualizando objetos"
 
@@ -5273,7 +5289,7 @@ msgid "Start Date"
 msgstr "Data de início"
 
 #: 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 "Resumo"
@@ -5305,22 +5321,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 frações de 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: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"
 
@@ -5336,67 +5352,67 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "Novo _compromisso"
 
-#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3508
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
 msgid "New All Day _Event"
 msgstr "Novo _evento de dia inteiro"
 
-#: calendar/gui/e-day-view.c:3653 calendar/gui/e-week-view.c:3509
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
 msgid "New Meeting"
 msgstr "Nova reunião"
 
-#: calendar/gui/e-day-view.c:3655 calendar/gui/e-week-view.c:3510
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
 msgid "New Task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/e-day-view.c:3660 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3673 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: calendar/gui/e-day-view.c:3672 calendar/gui/e-week-view.c:3524
+#: 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 para _hoje"
 
-#: calendar/gui/e-day-view.c:3674 calendar/gui/e-week-view.c:3525
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
 msgid "_Go to Date..."
 msgstr "Ir para _data..."
 
-#: calendar/gui/e-day-view.c:3679 calendar/gui/e-week-view.c:3529
+#: 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 informação de livre/ocupado"
 
-#: calendar/gui/e-day-view.c:3684 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
 #: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "_Configurações..."
 
-#: calendar/gui/e-day-view.c:3693 calendar/gui/e-week-view.c:3540
+#: 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 "_Salvar como..."
 
-#: calendar/gui/e-day-view.c:3705 calendar/gui/e-week-view.c:3552
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
 msgid "_Schedule Meeting..."
 msgstr "Agendar _reunião..."
 
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3553
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
 msgid "_Forward as iCalendar..."
 msgstr "_Encaminar como iCalendar..."
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3558
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
 msgid "Make this Occurrence _Movable"
 msgstr "Tornar esta ocorrência _móvel"
 
-#: calendar/gui/e-day-view.c:3712 calendar/gui/e-week-view.c:3559
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
 msgid "Delete this _Occurrence"
 msgstr "Excluir esta _ocorrência"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3560
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
 msgid "Delete _All Occurrences"
 msgstr "Excluir _todas as ocorrências"
 
@@ -5515,31 +5531,31 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Nenhum</i>"
 
-#: calendar/gui/e-itip-control.c:1058
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "Local:"
 
-#: 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 "Aceito"
 
-#: 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 "Aceito preliminarmente"
 
-#: 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 "Recusado"
 
-#: 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
@@ -5551,299 +5567,299 @@ msgstr "Recusado"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: 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 "Escolher uma ação:"
 
-#: calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Atualizar"
 
-#: 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 "Aceitar"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Aceitar preliminarmente"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Recusar"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Enviar informação de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Atualizar estado do respondente"
 
-#: calendar/gui/e-itip-control.c:1225
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Enviar informação mais recente"
 
-#: 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> publicou informação de reunião."
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Informação de reunião"
 
-#: 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> requisita a presença de %s em uma reunião."
 
-#: 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> requisita a sua presença em uma reunião."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Proposta de reunião"
 
-#: 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> deseja adicioná-lo a uma reunião existente."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Atualização de reunião"
 
-#: 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> deseja receber a informação de reunião mais recente."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "_Pedido de atualização de reunião"
 
-#: 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> respondeu a um pedido de reunião."
 
-#: calendar/gui/e-itip-control.c:1346
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Resposta a reunião"
 
-#: 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> cancelou a reunião."
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Cancelamento de reunião"
 
-#: 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> enviou uma mensagem incompreensível."
 
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Mensagem de reunião inválida"
 
-#: 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> publicou informação de tarefa."
 
-#: calendar/gui/e-itip-control.c:1387
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Informação de tarefa"
 
-#: 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> requisita que %s execute uma tarefa."
 
-#: 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> requisita que você execute uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Proposta de tarefa"
 
-#: 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> deseja acrescentá-lo a uma tarefa existente."
 
-#: calendar/gui/e-itip-control.c:1400
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Atualização de tarefa"
 
-#: 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> deseja receber a informação de tarefa mais recente."
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Pedido de atualização de tarefa"
 
-#: 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> respondeu a uma atribuição de tarefa."
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Resposta a tarefa"
 
-#: 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> cancelou uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1421
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Cancelamento de tarefa"
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Mensagem de tarefa inválida"
 
-#: 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> publicou informação de livre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1449
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Informação de livre/ocupado"
 
-#: 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> requisita sua informação de livre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1454
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Pedido de livre/ocupado"
 
-#: 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> respondeu a um pedido de livre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1459
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Resposta de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1464
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Mensagem de livre/ocupado inválida"
 
-#: 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 "A mensagem não aparenta estar formada corretamente."
 
-#: calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "A mensagem contém apenas pedidos não suportados."
 
-#: 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 "O anexo não contém uma mensagem de agenda válida"
 
-#: calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "O anexo não contém itens visualizáveis de agenda"
 
-#: 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 "Objeto é inválido e não pode ser atualizado\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 "Ocorreu um erro no 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 "Objeto não pôde ser encontrado\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 "Você não possui as permissões corretas para atualizar a agenda\n"
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Atualização concluída\n"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "O arquivo de agenda não pôde ser atualizado!\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 ""
 "Estado do participante não pôde ser atualizado pois o item não existe mais"
 
-#: 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 resposta não é de um participante atual. Adicioná-lo como participante?"
 
-#: 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 ""
 "Estado do participante não pôde ser atualizado devido a um 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 "Você não possui as permissões corretas para atualizar a agenda\n"
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Estado do participante atualizado\n"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "Estado do participante não pôde ser atualizado!\n"
 
-#: calendar/gui/e-itip-control.c:2048
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Remoção concluída"
 
-#: 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 "Item 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 "O item não pôde ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:2205
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr "Selecionar pasta de agenda"
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr "Selecionar pasta de tarefas"
 
@@ -5946,7 +5962,7 @@ msgid "Needs Action"
 msgstr "Necessita ação"
 
 #: 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 "Preliminar"
 
@@ -5962,14 +5978,14 @@ msgstr "Em andamento"
 #. 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 de %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"
@@ -5981,63 +5997,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 "Fora do escritório"
 
-#: calendar/gui/e-meeting-time-sel.c:410
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Sem informação"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Opções"
 
-#: calendar/gui/e-meeting-time-sel.c:468
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Exibir apenas _horas do expediente"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Exibir com _menos ampliação"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "_Atualizar livre/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 "_Autoescolher"
 
-#: 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 as pessoas e 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 as _pessoas e um recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:594
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "Pessoas _necessárias"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Pessoas necessárias e _um recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:630
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Hora de _início da reunião:"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Hora de _término da reunião:"
 
@@ -6083,7 +6099,7 @@ msgstr "Excluindo objetos selecionados..."
 msgid "Expunging"
 msgstr "Excluindo permanentemente"
 
-#: calendar/gui/e-week-view.c:3507
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Novo _compromisso..."
 
@@ -6189,57 +6205,57 @@ msgstr "Outubro"
 msgid "September"
 msgstr "Setembro"
 
-#: 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 "Um organizador deve ser configurado."
 
-#: calendar/gui/itip-utils.c:297
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "Pelo menos um participante é necessário"
 
-#: 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 "Informação de 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 "Informação de tarefa"
 
-#: 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 "Informação de diário"
 
-#: 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 "Informação de livre/ocupado"
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Informação de agenda"
 
-#: calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr "Atualizado"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr "Contra proposta"
 
-#: calendar/gui/itip-utils.c:512
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informação de livre/ocupado (%s para %s)"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "Informação iCalendar"
 
-#: calendar/gui/itip-utils.c:672
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Você deve ser um participante do evento."
 
@@ -6339,7 +6355,7 @@ msgstr "Contatos: "
 
 #: 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 "Visualizar impressão"
 
@@ -6376,31 +6392,43 @@ msgstr "Não me pergunte novamente."
 msgid "Print Tasks"
 msgstr "Imprimir tarefas"
 
-#: 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 "DSTQQSS"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "Fábrica para importar arquivos iCalendar no Evolution"
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Visualizador iTip/iMip da agenda do Evolution"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "Importa arquivos iCalendar no Evolution"
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Visualizador iTip/iMip da agenda do Evolution"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "Importa arquivos vCalendar no Evolution"
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Visualizador iTip/iMip da agenda do Evolution"
 
-#: calendar/importers/icalendar-importer.c:380
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Mensagem de agenda"
+
+#: 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 "Lembrete!!"
 
-#: calendar/importers/icalendar-importer.c:588
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "Eventos de agenda"
 
-#: 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?"
@@ -6408,7 +6436,7 @@ msgstr ""
 "O Evolution achou arquivos da Agenda Gnome.\n"
 "Você gostaria de importá-los no Evolution?"
 
-#: calendar/importers/icalendar-importer.c:620
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr "Agenda Gnome"
 
@@ -8636,7 +8664,7 @@ msgid "The referenced credentials have expired."
 msgstr "As credenciais de referência expiraram."
 
 #: 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."
@@ -8647,7 +8675,7 @@ msgstr "Resposta de autenticação inválida do servidor."
 msgid "Failed to resolve host `%s': %s"
 msgstr "Falhou a resolução da máquina `%s': %s"
 
-#: camel/camel-sasl-gssapi.c:295
+#: camel/camel-sasl-gssapi.c:299
 msgid "Unsupported security layer."
 msgstr "Camada de segurança não suportada."
 
@@ -9217,7 +9245,7 @@ msgstr "Verificando novas mensagens"
 msgid "Check for new messages in all folders"
 msgstr "Verificar novas mensagem em todas as pastas"
 
-#: 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 "Pastas"
 
@@ -10007,7 +10035,7 @@ msgstr ""
 "Não é possível conectar ao servidor POP %s.\n"
 "Erro ao enviar senha: %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 "Não existe a pasta `%s'."
@@ -10426,38 +10454,38 @@ msgstr "Responder-a:"
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:521
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:527
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:536
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:537
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Entre os destinatários da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:540
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: 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 "Entre os endereços que receberão uma cópia da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:544
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: 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."
@@ -10468,11 +10496,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Publicar para:"
 
-#: composer/e-msg-composer-hdrs.c:554
+#: composer/e-msg-composer-hdrs.c:549
 msgid "Posting destination"
 msgstr "Publicando destino"
 
@@ -10481,11 +10509,11 @@ msgstr "Publicando destino"
 msgid "Attach file(s)"
 msgstr "Anexar arquivo(s)"
 
-#: composer/e-msg-composer.c:530
+#: composer/e-msg-composer.c:533
 msgid "Could not create a PGP signature context"
 msgstr "Não foi possível criar um contexto de assinatura PGP"
 
-#: composer/e-msg-composer.c:809
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10494,30 +10522,30 @@ msgstr ""
 "Erro ao ler arquivo %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Arquivo existe, sobrescrever?"
 
-#: composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao salvar arquivo: %s"
 
-#: composer/e-msg-composer.c:1213
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao carregar arquivo: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acessar arquivo: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Não foi possível recuperar mensagem do editor"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10526,7 +10554,7 @@ msgstr ""
 "Não é possível buscar no arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1270
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10535,7 +10563,7 @@ msgstr ""
 "Não é possível truncar arquivo: %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"
@@ -10544,7 +10572,7 @@ msgstr ""
 "Não é possível copiar descritor de arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10553,7 +10581,7 @@ msgstr ""
 "Erro ao salvar automaticamente mensagem: %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?"
@@ -10561,7 +10589,7 @@ msgstr ""
 "O Ximian Evolution encontrou arquivos não salvos de uma sessão anterior.\n"
 "Você gostaria de tentar recuperá-los?"
 
-#: composer/e-msg-composer.c:1544
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10572,32 +10600,32 @@ msgstr ""
 "\n"
 "Você deseja salvar as suas modificações?"
 
-#: composer/e-msg-composer.c:1549
+#: composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Descartar mudanças"
 
-#: composer/e-msg-composer.c:1553
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Alerta: Mensagem modificada"
 
-#: composer/e-msg-composer.c:1585
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Abrir arquivo"
 
-#: composer/e-msg-composer.c:1943
+#: composer/e-msg-composer.c:2015
 msgid "Signature:"
 msgstr "Assinatura:"
 
-#: 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 "Auto-gerado"
 
-#: 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 "Redigir uma mensagem"
 
-#: 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."
@@ -10605,7 +10633,7 @@ msgstr ""
 "Não foi possível criar janela de redator:\n"
 "Não é possível ativar o controle seletor de endereços."
 
-#: 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"
@@ -10617,7 +10645,7 @@ msgstr ""
 "Por favor, verifique se você possui as versões\n"
 "corretas de gtkhtml e libgtkhtml instaladas.\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."
@@ -10625,7 +10653,7 @@ msgstr ""
 "Não foi possível criar janela de redator:\n"
 "Não é possível ativar o componente editor de HTML."
 
-#: 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>"
@@ -10806,11 +10834,11 @@ msgstr ""
 msgid "Overwrite file?"
 msgstr "Sobrescrever arquivo?"
 
-#: e-util/e-passwords.c:345
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Lembrar esta senha"
 
-#: e-util/e-passwords.c:347
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Lembrar esta senha pelo restante desta sessão"
 
@@ -11033,31 +11061,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 "Importante"
 
 #. 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 "Trabalho"
 
 #. 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 "Pessoal"
 
 #. 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 "A fazer"
 
 #. 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 "Mais tarde"
 
@@ -11161,7 +11189,7 @@ msgstr "atrás"
 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"
 
@@ -11502,8 +11530,8 @@ msgid "Scanning %s"
 msgstr "Varrendo %s"
 
 #: 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 "Correio"
@@ -11646,61 +11674,70 @@ msgid "Composer Preferences"
 msgstr "Preferências do redator"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Controle de configuração para as Fontes de exibição do Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Controle de configuração para as Contas de correio do Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Controle de configuração para o Correio do Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Controle de configuração para o Redator de mensagens do Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Configure preferências de correio, incluindo segurança e exibição de "
 "mensagens, aqui"
 
-#: 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 a verificação ortográfica, assinaturas e o redator de mensagens "
 "aqui"
 
-#: 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 as fontes usadas pelo Evolution aqui"
 
-#: 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 as suas contas de correio aqui"
 
+#: 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 contas do Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Redator de correio do Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Redator de correio do Evolution."
+
 #: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "O componente do Evolution para manipular correio."
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Redator de correio do Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution mail composer."
-msgstr "Redator de correio do Evolution."
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Interface de configuração de correio"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Componente resumo executivo de correio do Evolution."
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Componente de exibição de pastas de correio do Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Componente de exibição de pastas de correio do Evolution."
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Interface de configuração de correio"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "Factory for the controls exported by the Evolution Mailer"
-msgstr "Fábrica para os controles exportados pelo Correio do Evolution"
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Componente resumo executivo de correio do Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:15
 msgid "Font Preferences"
@@ -11714,43 +11751,39 @@ msgstr "Contas de correio"
 msgid "Mail Preferences"
 msgstr "Preferências de correio"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:18
-msgid "Mail configuration interface"
-msgstr "Interface de configuração de correio"
-
-#: mail/component-factory.c:114
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Pasta contendo correio"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "Correio público"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "Pasta pública contendo correio"
 
-#: mail/component-factory.c:116
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Lixeira virtual"
 
-#: mail/component-factory.c:116
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Pasta lixeira virtual"
 
-#: mail/component-factory.c:144
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Esta pasta não pode conter mensagens."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Propriedades..."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Modificar as propriedades desta pasta"
 
-#: 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."
@@ -11758,52 +11791,52 @@ msgstr ""
 "Algumas de suas configurações de correio aparentam estar corrompidas, por "
 "favor verifique se tudo está em ordem."
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "Você não estabeleceu um método de transporte de correio"
 
-#: mail/component-factory.c:1016
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Você possui mensagens não enviadas, deseja sair mesmo assim?"
 
-#: mail/component-factory.c:1056
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Nova mensagem de correio"
 
-#: mail/component-factory.c:1056
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "_Mensagem de correio"
 
-#: mail/component-factory.c:1057
+#: mail/component-factory.c:1061
 msgid "Compose a new mail message"
 msgstr "Redigir uma nova mensagem de correio"
 
-#: mail/component-factory.c:1065
+#: mail/component-factory.c:1069
 msgid "New Message Post"
 msgstr "Publicar nova mensagem"
 
-#: mail/component-factory.c:1065
+#: mail/component-factory.c:1069
 msgid "_Post Message"
 msgstr "_Publicar mensagem"
 
-#: mail/component-factory.c:1066
+#: mail/component-factory.c:1070
 msgid "Post a new mail message"
 msgstr "Publicar uma nova mensagem de correio"
 
-#: mail/component-factory.c:1349
+#: mail/component-factory.c:1353
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: mail/component-factory.c:1360
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Não é possível registrar repositório com a shell."
 
-#: mail/folder-browser-ui.c:483
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriedades para \"%s\""
 
-#: mail/folder-browser-ui.c:485
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Propriedades"
 
@@ -11987,21 +12020,37 @@ msgstr "Padrão"
 msgid "Getting Folder Information"
 msgstr "Obtendo informação de pasta"
 
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Redator de correio do 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 mbox no Evolution"
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Redator de correio do Evolution."
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Importa arquivos mbox no 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 "Redator de correio do 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 correio do Outlook Express 4 no 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 arquivos do Outlook Express 4 no 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 "Redator de correio do Evolution."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -12046,7 +12095,7 @@ msgstr "Você não preencheu toda a informação exigida."
 msgid "Evolution Account Editor"
 msgstr "Editor de contas do 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 "_Máquina:"
 
@@ -12054,7 +12103,7 @@ msgstr "_Máquina:"
 msgid "User_name:"
 msgstr "Nome do _usuário:"
 
-#: 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 "_Caminho:"
 
@@ -12071,12 +12120,12 @@ msgid "Don't delete"
 msgstr "Não excluir"
 
 #: 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 "Desativar"
 
 #: 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 "Ativar"
 
@@ -12086,7 +12135,7 @@ msgid "[Default]"
 msgstr "[Padrão]"
 
 #: 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 "Ativado"
 
@@ -12315,7 +12364,8 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 "Esta operação apagará permanentemente todas as mensagens marcadas para\n"
-"exclusão. Se você continuar você não será capaz de recuperar estas mensagens.\n"
+"exclusão. Se você continuar você não será capaz de recuperar estas "
+"mensagens.\n"
 "\n"
 "Apagar estas mensagens mesmo assim?"
 
@@ -12345,34 +12395,34 @@ msgstr "Imprimir mensagem"
 msgid "Printing of message failed"
 msgstr "Falhou a impressão da mensagem"
 
-#: 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 ""
 "Você tem certeza que deseja abrir todas as %d mensagens em janela 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 "Sem nome"
 
-#: mail/mail-composer-prefs.c:313
+#: mail/mail-composer-prefs.c:335
 msgid "You must specify a valid script name."
 msgstr "Você deve especificar um nome de script válido."
 
-#: 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 "[script]"
 
-#: mail/mail-composer-prefs.c:840
+#: mail/mail-composer-prefs.c:864
 msgid "Language(s)"
 msgstr "Língua(s)"
 
-#: mail/mail-composer-prefs.c:882
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr "Adicionar script de assinatura"
 
-#: mail/mail-composer-prefs.c:902
+#: mail/mail-composer-prefs.c:926
 msgid "Signature(s)"
 msgstr "Assinatura(s)"
 
@@ -12438,11 +12488,11 @@ msgstr ""
 "Evolution. Por favor entre um nome para esta conta no espaço abaixo. Este "
 "nome será usado apenas para propósitos de exibição."
 
-#: mail/mail-config.c:924
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Verificando serviço"
 
-#: 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 ao servidor..."
 
@@ -12687,14 +12737,19 @@ msgid "Message Display"
 msgstr "Exibição de mensagens"
 
 #: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Mensagem contém"
+
+#: 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 "Notificação de nova mensagem"
 
-#: 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"
@@ -12702,10 +12757,6 @@ msgstr ""
 "Nota: não será pedido que você forneça uma senha até que você faça a "
 "primeira conexão"
 
-#: mail/mail-config.glade.h:80
-msgid "On Screen fonts"
-msgstr "Fontes de tela"
-
 #: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Informação opcional"
@@ -12941,102 +12992,108 @@ msgid "_Enable"
 msgstr "_Ativar"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr "Largura _fixa:"
-
-#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "Estilo de _encaminhamento:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "Nome _completo:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr "Correio _HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr "_Identidade"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "C_arregar imagens se o remetente está no catálogo de endereços"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "_Torne esta a minha conta padrão"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensagens como lidas após"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "_Nunca carregar imagens da rede"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr "_Toque um arquivo de som quando uma nova mensagem chegar"
 
-#: 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 "_Perguntar ao enviar mensagens HTML para contatos que não as querem"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Perguntar ao enviar mensagens com um assunto vazio"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr "_Recebendo correio"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "Estilo de _resposta:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr "_Restaurar padrões"
 
-#: 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 "_Enviando correio"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Exibir imagens animadas"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "A_ssinaturas"
 
+#: 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 "Usar conexão se_gura (SSL)"
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "Contato original:"
 
 #: mail/mail-config.glade.h:176
-msgid "_Variable-width:"
-msgstr "Largura _variável:"
+msgid "_Use secure connection (SSL):"
+msgstr "Usar conexão se_gura (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 "a _cada"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr "cor"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "descrição"
 
@@ -13120,19 +13177,19 @@ msgstr "Atrasada:"
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "até %d de %B, %Y, %H:%M"
 
-#: mail/mail-display.c:2234
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Abrir vínculo no navegador"
 
-#: mail/mail-display.c:2235
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Copiar local do vínculo"
 
-#: mail/mail-display.c:2237
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Salvar vínculo como (FIXME)"
 
-#: mail/mail-display.c:2239
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Salvar imagem como..."
 
@@ -13674,31 +13731,31 @@ msgstr "Mais alta"
 msgid "Highest"
 msgstr "Máxima"
 
-#: 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 "Hoje %k:%M"
 
-#: mail/message-list.c:1092
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %k:%M"
 
-#: mail/message-list.c:1104
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1112
+#: mail/message-list.c:1116
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: 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 "Gerando lista de mensagens"
 
@@ -13794,40 +13851,40 @@ msgstr "_Prazo até:"
 msgid "_Flag:"
 msgstr "_Marca:"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Varrendo pastas sob %s em \"%s\""
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Varrendo pastas no nível raiz em \"%s\""
 
-#: mail/subscribe-dialog.c:331
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Assinando a pasta \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Cancelando assinatura da pasta \"%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 "Pasta"
 
-#: mail/subscribe-dialog.c:1356
+#: mail/subscribe-dialog.c:1389
 msgid "Scanning folders..."
 msgstr "Varrendo pastas..."
 
-#: mail/subscribe-dialog.c:1470
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Não foi selecionado um servidor"
 
-#: mail/subscribe-dialog.c:1545
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Por favor selecione um servidor."
 
@@ -13861,18 +13918,25 @@ msgid "_Unsubscribe"
 msgstr "_Cancelar assinatura"
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
-msgid "Configuration control for the Evolution Summary."
-msgstr "Controle de configuração para o Resumo do Evolution."
-
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Configure a aparência do Resumo do Evolution aqui"
 
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Summary"
+msgstr "Componente Resumo do Evolution."
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
-msgid "Evolution Summary component."
+#, fuzzy
+msgid "Evolution Summary component"
 msgstr "Componente Resumo do Evolution."
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Componente Resumo do Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 msgid "Summary Preferences"
 msgstr "Preferências do resumo"
 
@@ -23762,15 +23826,15 @@ msgstr "SBFN"
 msgid "%A, %B %e %Y"
 msgstr "%A, %e de %B, %Y"
 
-#: my-evolution/e-summary.c:524
+#: my-evolution/e-summary.c:523
 msgid "Please wait..."
 msgstr "Por favor aguarde..."
 
-#: 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 resumo"
 
-#: my-evolution/e-summary.c:624
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Falhou a impressão do resumo"
 
@@ -25041,20 +25105,21 @@ msgid "_Weather"
 msgstr "_Tempo"
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configuration control for Evolution folder settings."
-msgstr "Controle de configuração para as configurações de pasta do Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Configure special folders and offline folder behavior here"
 msgstr "Configure pastas especiais e comportamento desconectado de pastas aqui"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "A shell do Evolution."
+
 #: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Folder Settings"
-msgstr "Configurações de pastas"
+msgid "Evolution folder settings configuration control"
+msgstr ""
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "The Evolution shell."
-msgstr "A shell do Evolution."
+msgid "Folder Settings"
+msgstr "Configurações de pastas"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25086,8 +25151,8 @@ msgstr "Adicionar uma pasta"
 msgid "Drafts"
 msgstr "Rascunho"
 
-#: 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 "Caixa de entrada"
 
@@ -25123,40 +25188,7 @@ msgstr ""
 "Um erro ocorreu ao copiar arquivos em\n"
 "`%s'."
 
-#: shell/e-setup.c:243
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"O Evolution não pôde criar diretório\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 ""
-"O diretório %s\n"
-"não possui as permissões corretas. Por favor torne-o\n"
-"legível e executável e reinicie o 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 ""
-"O arquivo %s\n"
-"deve ser removido para permitir a execução correta do Evolution.\n"
-"Por favor remova este arquivo e reinicie o Evolution."
-
-#: shell/e-setup.c:290
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -25167,7 +25199,7 @@ msgstr ""
 "Por favor o mova para permitir a instalação\n"
 "dos arquivos de usuário do Evolution."
 
-#: shell/e-setup.c:299
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25311,7 +25343,7 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "Criar nova pasta"
 
-#: 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 "(Sem nome)"
 
@@ -25350,17 +25382,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "Selecionar importador"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "Arquivo %s não 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 "Erro do 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"
@@ -25369,11 +25401,11 @@ msgstr ""
 "Não existe importador capaz de tratar\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"
@@ -25382,17 +25414,17 @@ msgstr ""
 "Importando %s.\n"
 "Iniciando %s"
 
-#: shell/e-shell-importer.c:536
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "Erro ao iniciar %s"
 
-#: shell/e-shell-importer.c:550
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro ao carregar %s"
 
-#: shell/e-shell-importer.c:567
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25401,31 +25433,31 @@ msgstr ""
 "Importando %s\n"
 "Importando item 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 "Nome do arquivo:"
 
-#: shell/e-shell-importer.c:675
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Selecionar um arquivo"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Tipo do arquivo:"
 
-#: shell/e-shell-importer.c:709
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "Importar dados e configurações de programas antigos"
 
-#: shell/e-shell-importer.c:713
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "Importar um único arquivo"
 
-#: 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"
@@ -25433,24 +25465,24 @@ msgstr ""
 "Por favor aguarde...\n"
 "Varrendo a procura de configurações existentes"
 
-#: shell/e-shell-importer.c:782
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Iniciando 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 "Selecionar pasta"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Selecionar uma pasta destino para onde importar estes dados"
 
-#: 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"
 
@@ -25591,27 +25623,27 @@ msgstr "Trabalhar desconectado"
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta exibida)"
 
-#: 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 "(Nenhum)"
 
-#: 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 ""
 "O Ximian Evolution está atualmente conectado. Clique neste botão para "
 "trabalhar desconectado."
 
-#: shell/e-shell-view.c:2107
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "O Ximian Evolution está em preocesso de se desconectar."
 
-#: 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 ""
@@ -25629,12 +25661,12 @@ msgstr ""
 "O erro do sistema de ativação é:\n"
 "%s"
 
-#: shell/e-shell.c:738
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Não é possível preparar repositório local -- %s"
 
-#: shell/e-shell.c:1804
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25645,19 +25677,19 @@ msgstr ""
 "terminou inesperadamente. Você terá que sair do Evolution e reiniciá-lo\n"
 "para poder acessar os seus dados novamente."
 
-#: shell/e-shell.c:2069
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: shell/e-shell.c:2071
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "Não é possível registrar no OAF"
 
-#: shell/e-shell.c:2073
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "Não foi localizado o banco de dados de configuração"
 
-#: shell/e-shell.c:2075 shell/e-storage.c:572
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Erro genérico"
 
@@ -25894,63 +25926,63 @@ msgstr ""
 "O erro do sistema de ativação é:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "Erro CORBA"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Interrompido"
 
-#: 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 "Já possui um dono"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Sem dono"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Não encontrado"
 
-#: shell/evolution-shell-component.c:1179
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Tipo não suportado"
 
-#: shell/evolution-shell-component.c:1181
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Schema não suportado"
 
-#: shell/evolution-shell-component.c:1183
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Operação não suportada"
 
-#: shell/evolution-shell-component.c:1185
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Existe"
 
-#: shell/evolution-shell-component.c:1191
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "URI inválida"
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Possui sub-pastas"
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Sem espaço remanescente"
 
-#: shell/evolution-shell-component.c:1199
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "O dono anterior morreu"
 
@@ -25970,10 +26002,6 @@ msgstr "Clique em OK para fechar estas conexões e desconectar"
 msgid "The following connections are currently active:"
 msgstr "As seguintes conexões estão ativas atualmente:"
 
-#: 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 "_Agenda:"
@@ -26111,16 +26139,16 @@ msgstr "Não pergunte-me novamente"
 msgid "Evolution can import data from the following files:"
 msgstr "O Evolution pode importar dados dos seguintes arquivos:"
 
-#: 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 "O Evolution está saindo agora ..."
 
 #. 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"
@@ -26155,7 +26183,7 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: shell/main.c:288
+#: shell/main.c:290
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -26163,40 +26191,44 @@ msgstr ""
 "Obrigado\n"
 "O time do Ximian Evolution\n"
 
-#: shell/main.c:296
+#: shell/main.c:298
 msgid "Don't tell me again"
 msgstr "Não me diga novamente"
 
-#: shell/main.c:385
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Não é possível acessar a shell do Ximian Evolution."
 
-#: shell/main.c:394
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Não é possível iniciar a shell do Ximian Evolution: %s"
 
-#: shell/main.c:526
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Desativar tela de abertura"
 
-#: shell/main.c:528
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "Iniciar no modo desconectado"
 
-#: shell/main.c:530
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "Iniciar no 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 "Enviar a saída de depuração de todos os componentes para um arquivo."
 
-#: shell/main.c:535
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr "Forçar a atualização dos arquivos de configuração do Evolution 1.0.x"
 
-#: shell/main.c:560
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26206,7 +26238,6 @@ msgstr ""
 "  Use %s --help para mais informações.\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 "Erro ao carregar catálogo de endereços padrão."
@@ -26216,10 +26247,6 @@ msgstr "Erro ao carregar catálogo de endereços padrão."
 msgid "Input File"
 msgstr "Arquivo de entrada"
 
-#: tools/evolution-addressbook-export.c:51
-msgid "Output File"
-msgstr "Arquivo de saída"
-
 #: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Não foi fornecido um nome de arquivo."
@@ -26248,6 +26275,19 @@ msgstr "Marcar anexo para exibição embutida por padrão."
 msgid "Default subject for the message."
 msgstr "Assunto padrão para a mensagem."
 
+#. 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 "Não foi possível renomear '%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 "Copiar contato(s) para outra pasta..."
@@ -27742,12 +27782,12 @@ msgstr "Definir visões"
 
 #. 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 "STQQSSD"
 
 #. 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"
 
@@ -27898,37 +27938,202 @@ msgstr "_Localizar agora"
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: widgets/misc/e-search-bar.c:839
+#: widgets/misc/e-search-bar.c:833
 msgid "Item ID"
 msgstr "ID do item"
 
-#: widgets/misc/e-search-bar.c:846
+#: widgets/misc/e-search-bar.c:840
 msgid "Subitem ID"
 msgstr "ID do subitem"
 
-#: 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 "Limpar"
 
-#: widgets/misc/e-search-bar.c:933
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Localizar agora"
 
 #: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "O servidor pessoal de catálogo de endereços"
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Visualizador de mini-cartão do catálogo de endereços do 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 "O servidor pessoal de agenda; fábrica de agenda"
+#, fuzzy
+msgid "Evolution Calendar local file backend"
+msgstr "Visualizador iTip/iMip da agenda do Evolution"
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Visualizador de mini-cartão do catálogo de endereços do Evolution"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Fábrica para importar arquivos LDIF no Evolution."
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Importa arquivos LDIF no Evolution."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Fábrica para importar arquivos VCard no Evolution."
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Importa arquivos VCard no Evolution."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "Um controle Bonobo para um popup de endereços."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Um controle Bonobo para exibir um endereço."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Um controle Bonobo exemplo que exibe um catálogo de endereços."
+
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr ""
+#~ "Controle de configuração para os Repositórios de Catálogo de endereços do "
+#~ "Evolution."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr ""
+#~ "Controle que exibe um mini-cartão do catálogo de endereços do Evolution."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Componente do Evolution para manipular contatos."
+
+#~ msgid "Factory for the controls exported by the Evolution Addressbook"
+#~ msgstr ""
+#~ "Fábrica para os controles exportados pelo Catálogo de endereços do "
+#~ "Evolution"
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr ""
+#~ "Fábrica para interface para seleção de nomes do catálogo de endereços"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Lista de contatos sem nome"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d não exibidos)"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Um controle Bonobo que exibe uma lista de tarefas."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Um controle Bonobo exemplo que exibe uma agenda."
+
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Controle de configuração para a agenda do Evolution."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Componente do Evolution para manipular a agenda."
+
+#~ msgid "Factory for the Evolution Calendar objects"
+#~ msgstr "Fábrica para os objetos da Agenda do Evolution"
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr ""
+#~ "Fábrica para centralizar os diálogos do editor do componente de agenda"
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Serviço de notificação de alarme"
+
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Fábrica para importar arquivos iCalendar no Evolution"
+
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Importa arquivos iCalendar no Evolution"
+
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Importa arquivos vCalendar no Evolution"
+
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Controle de configuração para as Fontes de exibição do Evolution."
+
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Controle de configuração para as Contas de correio do Evolution."
+
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Controle de configuração para o Correio do Evolution."
+
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Controle de configuração para o Redator de mensagens do Evolution."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "O componente do Evolution para manipular correio."
+
+#~ msgid "Factory for the controls exported by the Evolution Mailer"
+#~ msgstr "Fábrica para os controles exportados pelo Correio do Evolution"
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Fábrica para importar mbox no Evolution"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importa arquivos mbox no Evolution"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "Fábrica para importar correio do Outlook Express 4 no Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importa arquivos do Outlook Express 4 no Evolution"
+
+#~ msgid "On Screen fonts"
+#~ msgstr "Fontes de tela"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "Largura _fixa:"
+
+#~ msgid "_Variable-width:"
+#~ msgstr "Largura _variável:"
+
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Controle de configuração para o Resumo do Evolution."
+
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr ""
+#~ "Controle de configuração para as configurações de pasta do Evolution."
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "O Evolution não pôde criar diretório\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 ""
+#~ "O diretório %s\n"
+#~ "não possui as permissões corretas. Por favor torne-o\n"
+#~ "legível e executável e reinicie o Evolution."
+
+#~ msgid ""
+#~ "File %s\n"
+#~ "should be removed to allow Evolution to work correctly.\n"
+#~ "Please remove this file and restart Evolution."
+#~ msgstr ""
+#~ "O arquivo %s\n"
+#~ "deve ser removido para permitir a execução correta do Evolution.\n"
+#~ "Por favor remova este arquivo e reinicie o Evolution."
+
+#~ msgid "Output File"
+#~ msgstr "Arquivo de saída"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "O servidor pessoal de catálogo de endereços"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "O servidor pessoal de agenda; fábrica de agenda"
 
-#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:3
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:3
-msgid "Wombat InterfaceCheck interface"
-msgstr "Inteface Wombat InterfaceCheck"
+#~ msgid "Wombat InterfaceCheck interface"
+#~ msgstr "Inteface Wombat InterfaceCheck"
diff --git a/po/ro.po b/po/ro.po
index 7299e6694c..7d420e1512 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.15\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-12 16:59+0800\n"
 "Last-Translator: Tiberiu Micu <tibimicu@gmx.net>\n"
 "Language-Team: Rom�n� <ro@li.org>\n"
@@ -15,42 +15,52 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\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 "Procesator pentru  importul fi�ierelor GnomeCard in Evolution"
+msgid "Evolution LDIF importer"
+msgstr "Utilitar de import 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 "Import fi�ierele card V �n Evolution."
+msgid "Evolution VCard Importer"
+msgstr "Compozitorul de mailuiri Evolution."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Procesator pentru  importul fi�ierelor GnomeCard in Evolution"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Compozitorul de mailuiri Evolution."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Import fi�ierele card V �n 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 "Pune la fi�ier ca"
 
 #: 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 "Nume"
 
 #: 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 "Principal"
 
@@ -60,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 "Asistent"
 
 #: 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 "Serviciu"
 
@@ -79,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 "Rechemare"
 
 #: 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 "Companie"
 
@@ -95,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 "Adresa de acas�"
 
 #: 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 "Organiza�ie"
@@ -111,18 +123,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 "Mobil"
 
 #: 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�in�"
 
 #: 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 serviciu"
@@ -132,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 "Fax acas�"
 
 #: 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 "Serviciu 2"
 
@@ -147,43 +159,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 "Adresa de acas� 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 "Alte"
 
 #: 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 "Alt 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 "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 "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"
@@ -194,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 "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: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 "Email 3"
@@ -226,6 +238,7 @@ msgid "Dep"
 msgstr "Dep"
 
 #: 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 "Birou"
@@ -235,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 "Titlu"
@@ -249,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 "Manager"
@@ -262,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 "Porecl�"
@@ -271,16 +287,19 @@ msgid "Nick"
 msgstr "Porecl�"
 
 #: 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 "So�/so�ie"
 
 #: 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 "Not�"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr "Calendar URI"
 
@@ -298,249 +317,351 @@ msgid "FBUrl"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "Default server calendar"
+msgstr "Salveaz� calendarul"
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "icsCalendar"
+msgstr "Calendar"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
 msgid "Anniversary"
 msgstr "Aniversare:"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Aniv"
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "Data na�terii"
 
-#: 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 "Categorii"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Nume de familie"
 
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:335
+#, fuzzy
+msgid "ECard"
+msgstr "Ma�in�"
+
+#: 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 "Contact schimbat:"
 
-#: addressbook/backend/ebook/e-card.c:2683
-msgid "Multiple VCards"
-msgstr "Carduri V multiple"
+#: 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 "Nume complet"
 
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
-msgstr "Card V pentru %s"
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "_Adresa:"
+
+#: addressbook/backend/ebook/e-card.c:1328
+#, fuzzy
+msgid "Address Label"
+msgstr "C�r�i de vizit�"
+
+#: addressbook/backend/ebook/e-card.c:1335
+#, fuzzy
+msgid "Phone"
+msgstr "Inexistent"
+
+#: addressbook/backend/ebook/e-card.c:1349
+#, fuzzy
+msgid "Birth date"
+msgstr "Data na�terii"
+
+#: 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 "Organiza�ie"
+
+#: 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 "Rol"
+
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
+#, fuzzy
+msgid "Mailer"
+msgstr ""
+"\n"
+"Program de mail:"
+
+#: addressbook/backend/ebook/e-card.c:1445
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "URL liber-ocupat"
+
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Calendar"
+
+#: addressbook/backend/ebook/e-card.c:1466
+#, fuzzy
+msgid "Related Contacts"
+msgstr "�terg persoana de contact?"
 
-#: 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 "Categorii"
+
+#: 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 "Cea��"
+
+#: addressbook/backend/ebook/e-card.c:1508
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "Alt� adres�"
+
+#: 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 "Lipe�te"
+
+#: addressbook/backend/ebook/e-card.c:1540
+#, fuzzy
+msgid "Use Score"
+msgstr "Punctaj"
+
+#: 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 "Nu pot ini�ializa 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 "Caut..."
 
-#: addressbook/backend/pas/pas-backend-file.c:366
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr "�ncarc..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:687
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+#, fuzzy
+msgid "Using Distinguished Name (DN)"
+msgstr "_Nume list�:"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "_Aceasta este adresa de expediere"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 #, fuzzy
 msgid "Reconnecting to LDAP server..."
 msgstr "Conectare la serverul LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1230
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr "Adaug� card la serverul LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1336
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr "�terge card de la serverul 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 "Modificare card pentru serverul LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2889
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "Primesc rezultatele c�ut�rii LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2998
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 #, fuzzy
 msgid "Error performing search"
 msgstr "Eroare �tergere card"
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:294
 #, fuzzy
 msgid "Default Sync Address:"
 msgstr "Adresa email:"
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Nu pot �nc�rca cursorul\n"
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EBook ne�nc�rcat\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 "Nu pot porni serverul 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 "Nu pot porni 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 "Control Bonobo pentru aparitia unei adrese."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Control Bonobo pentru afi�area unei adrese."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Control Bonobo de prob� care afi�eaz� o agend�."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr "Procesator pentru componentele agendei 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 care afi�eaz� o agend� minicard pentru 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 "Vizualizor agend� minicard Evolution"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Editare agend�"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Component� Evolution pentru manipulare contacte"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Interfa�a de selectare nume a agendei Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Procesator pentru controlul agendei minicard"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Procesator pentru apari�ia adreselor din agend�"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Procesator pentru afi�orul agendei de adrese"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Vizualizor agend� minicard Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
-msgid "Factory for the Addressbook's address popup"
-msgstr "Procesator pentru apari�ia adreselor din agend�"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Vizualizor agend� minicard 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 "Procesator pentru componentele agendei Evolution."
+msgid "Evolution Addressbook component"
+msgstr "Vizualizor agend� minicard Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "Factory for the sample Addressbook control"
-msgstr "Procesator pentru controlul mostr� agend�"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Vizualizor agend� minicard 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 "Contacte"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:76
 msgid "Folder containing contact information"
 msgstr "Dosar con�in�nd informa�ie de contact"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP server containing contact information"
 msgstr "Server LDAP con�in�nd informa�ie de contact"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public Contacts"
 msgstr "Contacte"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 #, fuzzy
 msgid "Public folder containing contact information"
 msgstr "Dosar con�in�nd informa�ie de contact"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Contact nou"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_Contact"
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Creaz� contact nou"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "List� contacte nou�"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Contact"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:569
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Creaz� list� nou� de contacte"
 
-#: addressbook/gui/component/addressbook-config.c:197
+#: addressbook/gui/component/addressbook-config.c:206
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "Nu m� pot conecta la serverul LDAP."
 
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -548,59 +669,50 @@ 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 "R�spunsul serverului IMAP nu con�ine informa�ia %s"
 
-#: addressbook/gui/component/addressbook-config.c:1176
+#: addressbook/gui/component/addressbook-config.c:1215
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Eroare la �ncarcarea informa�iei de filtrare:\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 "R�spunsul serverului IMAP nu con�ine informa�ia %s"
 
-#: addressbook/gui/component/addressbook-config.c:1630
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "Semnarea e nesuportat� de acest cifru"
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr "Nume cont"
 
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1639
 #, fuzzy
 msgid "Server Name"
 msgstr "Selec�ie nume"
 
-#: 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 "Nu pot ini�ializa gnome-vfs"
+#: addressbook/gui/component/addressbook-config.c:1676
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "Semnarea e nesuportat� de acest cifru"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
 msgid "Other Contacts"
 msgstr "Alte contacte"
 
-#: addressbook/gui/component/addressbook.c:474
-msgid "Unable to open addressbook"
-msgstr "Nu pot deschide agenda"
-
-#: 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."
@@ -608,7 +720,7 @@ msgstr ""
 "Nu pot deschide aceast� agend�. V� rog verifica�i dac� exist� calea\n"
 "�i daca ave�i drepturi de acces."
 
-#: addressbook/gui/component/addressbook.c:490
+#: addressbook/gui/component/addressbook.c:522
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -619,7 +731,7 @@ msgstr ""
 "c� a�i introdus URI incorect, sau serverul LDAP\n"
 "e c�zut"
 
-#: 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"
@@ -631,7 +743,7 @@ msgstr ""
 "programul din sursele CVS dup� ce desc�rca�i OpenLDAP urm�nd\n"
 "leg�tura urm�toare.\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"
@@ -642,12 +754,15 @@ msgstr ""
 "c� a�i introdus URI incorect, sau serverul LDAP\n"
 "e c�zut"
 
-#. 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 "Nu pot deschide agenda"
+
+#: 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 ""
@@ -655,39 +770,39 @@ 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 "Introduce�i parola pentru %s"
 
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:813
 #, fuzzy
 msgid "Name begins with"
 msgstr "se termin� cu"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:814
 #, fuzzy
 msgid "Email begins with"
 msgstr "se termin� cu"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Category is"
 msgstr "Categorii"
 
 #. 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 "Orice c�mp con�ine"
 
-#: addressbook/gui/component/addressbook.c:786
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "Avansat..."
 
-#: 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"
@@ -695,7 +810,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"
@@ -703,26 +818,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 "Categorie:"
 
-#: addressbook/gui/component/addressbook.c:1132
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr "URI pe care navigatorul dosarelor �l va afi�a"
 
@@ -731,141 +846,127 @@ msgstr "URI pe care navigatorul dosarelor �l va afi�a"
 #. * 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 "(F�r� nume)"
 
-#: 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 "Email principal"
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Selectez o ac�iune"
 
-#: 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 "Creaz� contact nou \"%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 "Adaug� adresa la contactul existent \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "C�utare agend�..."
 
-#: 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 "Editare informa�ii contact"
 
-#: 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 "Adaug� la contacte"
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Reune�te adresele email:"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Dezactivare interog�ri"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Activare interog�ri (Periculos!)"
 
 #: 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 "Verific tipurile suportate"
 
-#: 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 "�te_rge"
+msgid "Add LDAP Server"
+msgstr "Server LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Op�iuni"
-
-#: 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 "Surse agend�"
 
-#: 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 "Alarme"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Anonymously"
 msgstr "Anonim"
 
-#: 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"
@@ -874,79 +975,60 @@ msgid ""
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Connecting"
 msgstr "Deconectare de la %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 "Personalizeaz�"
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "�terge"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Nume list�:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid "Edit LDAP Server"
+msgstr "Server LDAP"
+
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Email Address:"
 msgstr "Adresa email:"
 
-#: 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 "G�se�te:"
 
-#: 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 "Autentificare"
-
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "LDAP Configuration Assistant"
 msgstr "Configurare mail"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#, fuzzy
-msgid "Mappings"
-msgstr "Margini"
-
-#: 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 "Fiecare"
 
-#: 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"
@@ -956,75 +1038,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 "Unu"
 
-#: 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 "Implicit"
-
-#: addressbook/gui/component/ldap-config.glade.h:50
-#, fuzzy
-msgid "Re_store Defaults"
-msgstr "Implicit"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:34
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Scopul c�ut�rii:"
 
 #. 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 "Caut..."
 
-#: addressbook/gui/component/ldap-config.glade.h:53
-#, fuzzy
-msgid "Select"
-msgstr "Selecteaz� tot"
-
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Selected:"
 msgstr "�terse"
 
-#: 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"
@@ -1035,7 +1078,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"
@@ -1044,55 +1087,48 @@ 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 "Informa�ie surs�"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Step 2: Connecting to Server"
 msgstr "Conectare la server..."
 
-#: 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
 #, fuzzy
 msgid "Sub"
 msgstr "Du"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Stochez c�utarea ca dosar V"
 
-#: 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"
@@ -1100,7 +1136,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"
@@ -1109,7 +1145,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"
@@ -1117,17 +1153,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"
@@ -1137,34 +1173,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"
@@ -1172,88 +1208,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 "_Aceasta este adresa de expediere"
 
-#: 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 "_Adaug�"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-#, fuzzy
-msgid "_Add ->"
-msgstr "Adaug� ->"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-#, fuzzy
-msgid "_Add Mapping"
-msgstr "Adaug� ac�iune"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-#, fuzzy
-msgid "_Add to DN"
-msgstr "Adaug� ac�iune"
-
-#: addressbook/gui/component/ldap-config.glade.h:112
-#, fuzzy
-msgid "_Always"
-msgstr "Alarme"
-
-#: addressbook/gui/component/ldap-config.glade.h:113
-#, fuzzy
-msgid "_Delete Mapping"
-msgstr "�terge tot"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "_Display name:"
 msgstr "Afi�eaz�"
 
-#: 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
@@ -1263,216 +1257,156 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Editeaz�"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-#, fuzzy
-msgid "_Edit Mapping"
-msgstr "_Editeaz� �nt�lnire"
-
-#: 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 "_Op�iuni"
-
-#: 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
-#, fuzzy
-msgid "_Restore Defaults"
-msgstr "Implicit"
-
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:92
 #, fuzzy
 msgid "_Search base:"
 msgstr "Domeniu c�utare:"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "_Server name:"
 msgstr "Mesaj server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Durata de sfor�ire (minute)"
 
-#: 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 "editor-lista-contact"
-
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "cards"
 msgstr "Nepornit"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Deconectare de la %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 "Caut..."
 
-#: 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 "Interfa�a de selectare nume a agendei Evolution."
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Procesator interfa�a de selectare nume a agendei"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "�terge tot"
 
 #. 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 "�terge"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
-msgid "Remove All"
-msgstr "�terge tot"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:202
-msgid "Send HTML Mail?"
-msgstr "Trimit mail 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 "_Contact"
+msgid "View Contact List"
+msgstr "List� contacte nou�"
 
-#: 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 "Contact schimbat:"
+msgid "View Contact Info"
+msgstr "Editare informa�ii contact"
 
-#: 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 "Trimit mail HTML?"
 
-#: 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 "Contact schimbat:"
 
-#: 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 "Surs�"
+
+#: 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 "G�se�te un contact"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Find"
+msgstr "G�se�te:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "Selec�ie nume"
 
-#: 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 "�terg persoana de contact?"
 
-#: 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 "Contacte"
 
-#: 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 "_Categorie:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 #, fuzzy
 msgid "_Folder:"
 msgstr "Dosar"
 
-#: 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 "Nume _asistent:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 #, fuzzy
 msgid "Add_ress..."
 msgstr "_Adresa..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr "Ani_versare:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 #, fuzzy
 msgid "Birthda_y:"
 msgstr "Ziua de na�tere:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
-msgstr "C_ontacte..."
-
 #: 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_tegorii..."
@@ -1483,7 +1417,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 contacte"
 
@@ -1493,7 +1427,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 "Detalii"
 
@@ -1536,1371 +1470,1415 @@ msgstr "Organi_za�ie:"
 msgid "P_rofession:"
 msgstr "_Profesie:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr "Tipuri de telefon"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "S_pouse:"
 msgstr "_So�/so�ie:"
 
-#: 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 "_Aceasta este adresa de expediere"
 
-#: 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 "Dori�i sa primi�i mail-uri _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 "_�terge"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "_Func�ia:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr "_Nume manager:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "Porecl�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "Birou:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "_Public Calendar URL:"
 msgstr "Calendar URI"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "_Web page address:"
 msgstr "Adresa paginii de 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 "Valideaz�"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 #, fuzzy
 msgid "United States"
 msgstr "(Mesaj f�r� titlu)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 #, fuzzy
 msgid "Afghanistan"
 msgstr "Asistent"
 
-#: 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 "Automat"
 
-#: 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 "Orientare"
 
-#: 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 "August"
 
-#: 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 "ani"
 
-#: 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 "M�rime"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 #, fuzzy
 msgid "Benin"
 msgstr "Trimit"
 
-#: 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 "Grindin�"
 
-#: 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 "Canada"
 
-#: 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 "Scaun"
 
-#: 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 "Chinez"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 #, fuzzy
 msgid "China"
 msgstr "Chinez"
 
-#: 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 "Culori"
 
-#: 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 "Copiez"
 
-#: 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 "Finlanda"
 
-#: 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 "Renun��"
 
-#: 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
 #, fuzzy
 msgid "Greece"
 msgstr "Grec"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 #, fuzzy
 msgid "Greenland"
 msgstr "Finlanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 #, fuzzy
 msgid "Grenada"
 msgstr "Canada"
 
-#: 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 "Grindin�"
 
-#: 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 "ore"
 
-#: 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 "Duminic�"
 
-#: 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
 #, fuzzy
 msgid "Ireland"
 msgstr "Corean"
 
-#: 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
 #, fuzzy
 msgid "Japan"
 msgstr "Japonez"
 
-#: 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
 #, fuzzy
 msgid "Jordan"
 msgstr "Corean"
 
-#: 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 "Cea mai sc�zut�"
 
-#: 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 "Cea mai sc�zut�"
 
-#: 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
 #, fuzzy
 msgid "Lithuania"
 msgstr "Grindin� u�oar�"
 
-#: 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 "Martie"
 
-#: 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 "Mail"
 
-#: 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 "Mail"
 
-#: 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 "Mail"
 
-#: 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
 #, fuzzy
 msgid "Mauritius"
 msgstr "Margini"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 #, fuzzy
 msgid "Mayotte"
 msgstr "Mai"
 
-#: 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 "Luni"
 
-#: 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 "Mobil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 #, fuzzy
 msgid "Myanmar"
 msgstr "Manager"
 
-#: 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 "Mail nou"
 
-#: 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 "Selec_teaz� �nl�n�uirea"
 
-#: 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 "Contact nou"
 
-#: 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 "Mail nou"
 
-#: 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 "Mai mare"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 #, fuzzy
 msgid "Nigeria"
 msgstr "Mai mare"
 
-#: 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 "Acum"
 
-#: 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 "Lipe�te"
 
-#: 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 "Canada"
 
-#: 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 "H�rtie"
 
-#: 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 "Finlanda"
 
-#: 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 "Portret"
 
-#: 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 "dup�"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 #, fuzzy
 msgid "Reunion"
 msgstr "Regiuni"
 
-#: 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 "Canada"
 
-#: 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 "Fum"
 
-#: 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 "Program"
 
-#: 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 "Ploaie"
 
-#: 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 "Dum"
 
-#: 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 "Porecl�"
 
-#: 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 "Finlanda"
 
-#: 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 "V�zut"
 
-#: 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 "Ploaie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 #, fuzzy
 msgid "Tajikistan"
 msgstr "Lista de sarcini"
 
-#: 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 "Finlanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 #, fuzzy
 msgid "Togo"
 msgstr "La"
 
-#: 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 "Ast�zi"
 
-#: 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 "Mar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 #, fuzzy
 msgid "Turkmenistan"
 msgstr "Turc"
 
-#: 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 "Canada"
 
-#: 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
 #, fuzzy
 msgid "Ukraine"
 msgstr "Ucrainean"
 
-#: 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 "Selec�ie nume"
 
-#: 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
 #, fuzzy
 msgid "Western Sahara"
 msgstr "Europa de vest"
 
-#: 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 "V�zut"
 
-#: 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 "Sunte�i sigur c� dori�i s� �terge�i acest cont?"
+msgid "Book"
+msgstr "Corp"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "�terg persoana de 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 "Ma�in�"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:826
+#: 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 "C�mpul De la"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#, fuzzy
+msgid "Changed"
+msgstr "Scaun"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 #, fuzzy
 msgid "Category editor not available."
 msgstr "Nu e disponibil� o descriere."
 
-#: 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 "Aceast� persoan� de contact apar�ine categoriilor:"
 
-#: 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 "Salveaz� ca �i card V"
 
-#: 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 "Sunte�i sigur c� dori�i s� �terge�i acest cont?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "Sunte�i sigur c� dori�i s� �terge�i acest cont?"
+
+#: 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 "Nu pot �terge dosarul sumar al fi�ierelor `%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 "Contact Ad�ugare-Rapid�"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr "Editare complet�"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Nume complet"
-
-#: 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-mail"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, fuzzy, c-format
+msgid "Error saving %s: %s"
+msgstr "Eroare la salvarea fi�ierului: %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 "Cea��"
 
-#: 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 "Suprascrie�i fi�ierul?"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresa _2"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Verific� adresa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "�ara"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr "Lo_calitate:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "C�su�a _po�tal�:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Stat/Provincie"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "Cod po�tal:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Check Full Name"
 msgstr "Verificare nume"
 
-#: 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 "D-ra."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Dl."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "D-na."
 
-#: 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 "Sr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "Prenume:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "Nume:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "Ini�iala tat�lui:"
 
-#: 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 "_Titlu:"
 
-#: 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 "_Nume list�:"
 
-#: 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 "Membri"
 
-#: 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 ""
 "Introduce�i o adres� de email sau trage�i contactul �n lista de mai jos:"
 
-#: 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 "Ascund adresele c�nd trimite�i mail la aceast� list�"
 
-#: 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 "�te_rge"
 
-#: 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 "editor-lista-contact"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+#, fuzzy
+msgid "Is New List"
+msgstr "List� 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
 msgid "Contact List Editor"
 msgstr "Editor lista de contacte"
 
-#: 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 "Salveaz� ca �i card V"
@@ -2956,280 +2934,301 @@ msgstr ""
 "Emailul modificat sau numele acestui contact exist� deja\n"
 "�n acest dosar. Dori�i s� continua�i �n acest caz?"
 
-#: 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 "C�utare avansat�"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr "Caut�"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 #, fuzzy
 msgid "No cards"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 #, fuzzy
 msgid "1 card"
 msgstr "Tip�re�te calendar"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:152
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, fuzzy, c-format
 msgid "%d cards"
 msgstr "%d secunde"
 
-#: 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 "Fiecare"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Eroare la start %s"
 
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#, fuzzy
+msgid "Model"
+msgstr "Mobil"
+
 #: 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 "Eroare la modificare card"
 
-#: 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 "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: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 "Eroare necunoscut�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Depozitare offline"
 
-#: 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 "Acces interzis"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Nu g�sesc card-ul"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "ID-ul card-ului exist� deja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protocol nesuportat"
 
-#: 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 "Revocat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "E�ec la autentificare."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Necesit� autentificare"
 
-#: 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 "Dosarul `%s' nu exist�."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Alt� eroare"
 
-#: 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 "Dori�i s� salva�i modific�rile?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:77
+#, fuzzy
+msgid "_Discard"
+msgstr "Tip�re�te calendar"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Eroare ad�ugare list�"
 
-#: 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 "Eroare ad�ugare card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:91
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Eroare la modificarea listei"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Eroare la �tergerea listei"
 
-#: 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 "Eroare �tergere card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
-#, fuzzy
-msgid "Display Cards?"
-msgstr "Afi�eaz�"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-#, fuzzy
-msgid "Display Cards"
-msgstr "Afi�eaz�"
-
-#: 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 "Nepornit"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 #, fuzzy
 msgid "Copy card to"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:353
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 #, fuzzy
 msgid "Move cards to"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:355
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "Carduri V multiple"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "Card V pentru %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 "Tip"
+
+#: 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 "Agend�"
 
-#: 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 "Salveaz� ca �i card V"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 #, fuzzy
 msgid "New Contact..."
 msgstr "Contact nou"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 #, fuzzy
 msgid "New Contact List..."
 msgstr "List� contacte nou�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Mer_gi la dosarul..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 #, fuzzy
 msgid "Import..."
 msgstr "_Import�..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Caut� contacte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Surse _agend�..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Set�ri _pilot..."
 
-#: 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 "�nainteaz� _anexat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:815
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "Trimite mesaj la contact"
 
-#: 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 "Tip�re�te"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr "Tip�re�te plic"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Copiez �n folderul..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Mut �n folderul..."
 
-#: 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 "Decupeaz�"
 
-#: 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 "Copiaz�"
 
-#: 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 "Lipe�te"
 
-#: 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 "�terg"
 
-#: 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 "Vizualizarea _curent�"
@@ -3238,7 +3237,7 @@ msgstr "Vizualizarea _curent�"
 #. 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 ""
 
@@ -3246,11 +3245,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"
@@ -3318,20 +3317,59 @@ msgstr "Alt telefon"
 msgid "Primary Phone"
 msgstr "Telefon principal"
 
-#: 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 "Salveaz� in agend�"
 
-#: 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 "L��ime:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+#, fuzzy
+msgid "Height"
+msgstr "�n�l�ime:"
+
+#: 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 "C�mpul De la"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+#, fuzzy
+msgid "Field Name"
+msgstr "Nume de familie"
+
+#: 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"
@@ -3346,7 +3384,7 @@ msgstr ""
 "\n"
 "Dublu-click aici pentru crea un contact nou."
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 #, fuzzy
 msgid ""
 "\n"
@@ -3359,23 +3397,43 @@ msgstr ""
 "\n"
 "Dublu-click aici pentru crea un contact nou."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#: addressbook/gui/widgets/e-minicard-view.c:452
+#, fuzzy
+msgid "Adapter"
+msgstr "dup�"
+
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "�terse"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Sortare sarcini"
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Vizualizare card"
 
-#: 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 "Afi�are s�ptam�n�"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 #, fuzzy
 msgid "Print envelope"
 msgstr "Tip�re�te plic"
 
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1130
 #, fuzzy
 msgid "Print cards"
 msgstr "Tip�re�te calendar"
 
-#: 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 "Tip�re�te calendar"
@@ -3450,7 +3508,6 @@ msgid "Include:"
 msgstr "Include:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Peisaj"
 
@@ -3470,17 +3527,16 @@ msgstr "Margini"
 msgid "Number of columns:"
 msgstr "Num�r de coloane"
 
-#: 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 "Op�iuni"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Orientare"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "Pagin�"
 
@@ -3496,9 +3552,7 @@ msgstr "H�rtie"
 msgid "Paper source:"
 msgstr "Sursa hirtie"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Portret"
 
@@ -3560,43 +3614,167 @@ msgstr "Font..."
 msgid "Untitled appointment"
 msgstr "_Editeaz� �nt�lnire"
 
-#: 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 "Ridicat"
 
-#: 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 "Sc�zut"
 
 #. 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 "Nedefinit"
 
-#: 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 "Eroare in timpul comunic�rii cu serverul calendar"
 
-#: 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 "Nu pot citi pilotul blocului aplica�ie calendar"
 
@@ -3605,94 +3783,81 @@ msgstr "Nu pot citi pilotul blocului aplica�ie calendar"
 msgid "Default Priority:"
 msgstr "_Prioritate:"
 
-#: 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 "Nu pot citi pilotul blocului aplica�ie ToDo"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-#, fuzzy
-msgid "A Bonobo control which displays a task list."
-msgstr "Mostr� de control Bonobo care afi�eaza un calendar."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Mostr� de control Bonobo care afi�eaza un calendar."
-
-#: 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 "Set�ri _mail..."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Procesator pentru componenta calendarului 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 calendar iTip/iMip vizualizator"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Set�ri _mail..."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Component� Evolution pentru manipularea calendarului."
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Componenta Evolution pentru afi�area mailului."
 
-#: 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"
+msgid "Evolution Calendar configuration control"
 msgstr "Procesator pentru componenta de mail Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the calendar iTip view control"
-msgstr "Procesator pentru controlul calendar iTip"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-msgid "Factory for the sample Calendar control"
-msgstr "Procesator pentru mostra controlului calendar"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution calendar iTip/iMip vizualizator"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 #, fuzzy
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Procesator pentru componenta calendarului Evolution."
+msgid "Evolution Calendar viewer"
+msgstr "Evolution calendar iTip/iMip vizualizator"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 #, fuzzy
-msgid "Factory to create a component editor factory"
-msgstr "Procesator pentru componenta calendarului Evolution."
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor de �tiri Evolution"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "Serviciu notificare alarme"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Editor de �tiri 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
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
 msgstr "Procesator pentru serviciul notificare alarme"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 #, fuzzy
 msgid "Starting:"
 msgstr "Set�ri"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 #, fuzzy
 msgid "Ending:"
 msgstr "Umbrire"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
 #, fuzzy
 msgid "invalid time"
 msgstr "Ora d_e sf�r�it"
 
-#: 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 "Alarme"
@@ -3714,11 +3879,17 @@ msgstr "Durata de sfor�ire (minute)"
 msgid "_Edit appointment"
 msgstr "_Editeaz� �nt�lnire"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "Nu e disponibil� o descriere."
 
-#: 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 "Avertisment"
+
+#: 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"
@@ -3726,13 +3897,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 "Avertisment"
-
-#: 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 "
@@ -3743,16 +3908,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 "Nu m� �ntreba din nou"
 
-#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
-msgid "Could not initialize GNOME"
-msgstr "Nu pot ini�ializa GNOME"
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize gnome-vfs"
+msgstr "Nu pot ini�ializa 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 "Nu pot crea procesatorul servicului de notificare alarm�"
 
@@ -3768,30 +3933,30 @@ msgstr "Descrierea con�ine"
 msgid "Comment contains"
 msgstr "Comentariul con�ine"
 
-#: 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 %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
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %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
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%A, %d %B %Y"
@@ -3799,8 +3964,8 @@ msgstr "%A, %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"
 
@@ -3809,68 +3974,169 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Nu pot crea vederea calendar. Verifica�i set�rile pentru ORBit si 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"
+
+#: calendar/gui/calendar-component.c:71
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:75
+#, fuzzy
+msgid "Public Calendar"
+msgstr "Calendar URI"
+
+#: 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 "Sarcini"
+
+#: calendar/gui/calendar-component.c:81
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "Dosar V �n lista de mail"
+
+#: calendar/gui/calendar-component.c:85
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Tip�re�te calendar"
+
+#: calendar/gui/calendar-component.c:86
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Dosar V �n lista de mail"
+
+#: calendar/gui/calendar-component.c:730
+#, fuzzy
+msgid "New appointment"
+msgstr "�nt�lnire nou�"
+
+#: calendar/gui/calendar-component.c:730
+#, fuzzy
+msgid "_Appointment"
+msgstr "�nt�lnire"
+
+#: calendar/gui/calendar-component.c:731
+msgid "Create a new appointment"
+msgstr "Creaz� o �nt�lnire nou�"
+
+#: calendar/gui/calendar-component.c:735
+#, fuzzy
+msgid "New meeting"
+msgstr "�nt�lnire"
+
+#: calendar/gui/calendar-component.c:735
+#, fuzzy
+msgid "_Meeting"
+msgstr "�nt�lnire"
+
+#: calendar/gui/calendar-component.c:736
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Aceasta e o cerere de �nt�lnire."
+
+#: calendar/gui/calendar-component.c:740
+#, fuzzy
+msgid "New task"
+msgstr "Sarcin� nou�"
+
+#: calendar/gui/calendar-component.c:740
+msgid "_Task"
+msgstr "Sarcin�"
+
+#: calendar/gui/calendar-component.c:741
+msgid "Create a new task"
+msgstr "Creaz� o sarcin� nou�"
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "�nt�lnire nou�"
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "�nt�lnire nou�"
+
+#: calendar/gui/calendar-component.c:746
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Creaz� o �nt�lnire nou�"
+
+#: 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 "Confiden�ial"
 
-#: 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 "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 "W"
 
-#: 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 "Grec"
 
-#: 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 "Nepornit"
 
-#: 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 "�n derulare"
 
-#: 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 "Terminat"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3881,343 +4147,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 "Inexistent"
 
-#: 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 "Alocat"
 
-#: 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 "Da"
 
-#: 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 "Nu"
 
-#: calendar/gui/calendar-view-factory.c:148
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Afi�are zi"
 
-#: calendar/gui/calendar-view-factory.c:151
+#: calendar/gui/calendar-view-factory.c:121
 msgid "Work Week View"
 msgstr "Afi�are s�pt�m�n� de lucru"
 
-#: calendar/gui/calendar-view-factory.c:154
+#: calendar/gui/calendar-view-factory.c:124
 msgid "Week View"
 msgstr "Afi�are s�ptam�n�"
 
-#: calendar/gui/calendar-view-factory.c:157
+#: calendar/gui/calendar-view-factory.c:127
 msgid "Month View"
 msgstr "Afi�are lun�"
 
-#: 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"
-
-#: 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 "Calendar URI"
+msgid "Error while opening the calendar"
+msgstr "Eroare in timpul comunic�rii cu serverul calendar"
 
-#: 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 "Sarcini"
-
-#: calendar/gui/component-factory.c:82
-#, fuzzy
-msgid "Folder containing to-do items"
-msgstr "Dosar V �n lista de mail"
-
-#: calendar/gui/component-factory.c:86
-#, fuzzy
-msgid "Public Tasks"
-msgstr "Tip�re�te calendar"
-
-#: calendar/gui/component-factory.c:87
+#: calendar/gui/comp-editor-factory.c:473
 #, fuzzy
-msgid "Public folder containing to-do items"
-msgstr "Dosar V �n lista de mail"
-
-#: calendar/gui/component-factory.c:750
-#, fuzzy
-msgid "New appointment"
-msgstr "�nt�lnire nou�"
-
-#: calendar/gui/component-factory.c:750
-#, fuzzy
-msgid "_Appointment"
-msgstr "�nt�lnire"
-
-#: calendar/gui/component-factory.c:751
-msgid "Create a new appointment"
-msgstr "Creaz� o �nt�lnire nou�"
-
-#: calendar/gui/component-factory.c:755
-#, fuzzy
-msgid "New meeting"
-msgstr "�nt�lnire"
-
-#: calendar/gui/component-factory.c:755
-#, fuzzy
-msgid "_Meeting"
-msgstr "�nt�lnire"
-
-#: calendar/gui/component-factory.c:756
-#, fuzzy
-msgid "Create a new meeting request"
-msgstr "Aceasta e o cerere de �nt�lnire."
-
-#: calendar/gui/component-factory.c:760
-#, fuzzy
-msgid "New task"
-msgstr "Sarcin� nou�"
-
-#: calendar/gui/component-factory.c:760
-msgid "_Task"
-msgstr "Sarcin�"
-
-#: calendar/gui/component-factory.c:761
-msgid "Create a new task"
-msgstr "Creaz� o sarcin� nou�"
-
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "New All Day Appointment"
-msgstr "�nt�lnire nou�"
-
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "All _Day Appointment"
-msgstr "�nt�lnire nou�"
-
-#: calendar/gui/component-factory.c:766
-#, fuzzy
-msgid "Create a new all-day appointment"
-msgstr "Creaz� o �nt�lnire nou�"
+msgid "Permission denied to open the calendar"
+msgstr "Acces interzis"
 
-#: calendar/gui/control-factory.c:123
+#: calendar/gui/control-factory.c:119
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Nu pot deschide dosarul �n `%s'"
 
-#: calendar/gui/control-factory.c:167
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "URI afi�at de calendar"
 
-#: 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 "Op�iuni alarm� audio"
 
-#: calendar/gui/dialogs/alarm-options.c:368
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Op�iuni mesaje alarm�"
 
-#: calendar/gui/dialogs/alarm-options.c:377
-msgid "Mail Alarm Options"
+#: calendar/gui/dialogs/alarm-options.c:438
+#, fuzzy
+msgid "Email Alarm Options"
 msgstr "Op�iuni alarm� mail"
 
-#: calendar/gui/dialogs/alarm-options.c:386
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Op�iuni alarm� program"
 
-#: calendar/gui/dialogs/alarm-options.c:395
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Op�iuni alarm� necunoscute"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Alarm Repeat"
 msgstr "Repetare 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 ""
-
 #: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Mesaj de afi�at"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "Corp mesaj"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "Red� sunetul:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "Repet� alarma"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "Ruleaz� programul:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "Timite ca:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr "Cu argumentele:"
 
-#: 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 "zile"
 
-#: 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 "timp �n plus la fiecare"
 
-#: 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 "ore"
 
-#: 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 "minute"
 
-#: calendar/gui/dialogs/alarm-page.c:319
-#, c-format
-msgid "%d days"
-msgstr "%d zile"
-
-#: calendar/gui/dialogs/alarm-page.c:322
-msgid "1 day"
-msgstr "1 zi"
-
-#: calendar/gui/dialogs/alarm-page.c:327
-#, c-format
-msgid "%d weeks"
-msgstr "%d s�pt�m�ni"
-
-#: calendar/gui/dialogs/alarm-page.c:330
-msgid "1 week"
-msgstr "1 s�pt�m�n�"
-
-#: calendar/gui/dialogs/alarm-page.c:335
-#, c-format
-msgid "%d hours"
-msgstr "%d ore"
-
-#: calendar/gui/dialogs/alarm-page.c:338
-msgid "1 hour"
-msgstr "1 or�"
-
-#: calendar/gui/dialogs/alarm-page.c:343
-#, c-format
-msgid "%d minutes"
-msgstr "%d minute"
-
-#: 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 secunde"
-
-#: calendar/gui/dialogs/alarm-page.c:354
-msgid "1 second"
-msgstr "1 secund�"
-
-#: calendar/gui/dialogs/alarm-page.c:383
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
-msgstr "Red� un sunet"
-
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
-msgstr "Afi�eaz� un mesaj"
-
-#: calendar/gui/dialogs/alarm-page.c:391
-msgid "Send an email"
-msgstr "Trimite un email"
-
-#: calendar/gui/dialogs/alarm-page.c:395
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
-msgstr "Ruleaz� un program"
-
-#: calendar/gui/dialogs/alarm-page.c:401
-#, fuzzy
-msgid "Unknown action to be performed"
-msgstr "Furtun� necunoscut�"
-
-#: calendar/gui/dialogs/alarm-page.c:413
-#, fuzzy, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "�nainte de �nceperea �nt�lnirii"
-
-#: calendar/gui/dialogs/alarm-page.c:416
-#, fuzzy, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "�nainte de �nceperea �nt�lnirii"
-
-#: calendar/gui/dialogs/alarm-page.c:421
-#, fuzzy, c-format
-msgid "%s at the start of the appointment"
-msgstr "�nainte de �nceperea �nt�lnirii"
-
-#: calendar/gui/dialogs/alarm-page.c:430
-#, fuzzy, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "�nainte de �nceperea �nt�lnirii"
-
-#: calendar/gui/dialogs/alarm-page.c:433
-#, fuzzy, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "dup� sf�r�itul �nt�lnirii"
-
-#: calendar/gui/dialogs/alarm-page.c:438
-#, fuzzy, c-format
-msgid "%s at the end of the appointment"
-msgstr "dup� sf�r�itul �nt�lnirii"
-
-#: calendar/gui/dialogs/alarm-page.c:462
-#, fuzzy, c-format
-msgid "%s at %s"
-msgstr "%s server %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
 msgid "Basics"
@@ -4228,46 +4306,63 @@ msgstr "Baze"
 msgid "Date/Time:"
 msgstr "Data/Ora"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "Afi�eaz� un mesaj"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "Red� un sunet"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Memorator"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "Ruleaz� un program"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "Trimite un 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 "Cuprins:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_Op�iuni..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "dup�"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "�nainte"
 
-#: 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 "zi(le)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "sf�r�it �nt�lnire"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "ora"
 
-#: 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 "minut(e)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "�nceput �nt�lnire"
 
@@ -4291,7 +4386,7 @@ msgstr "30 minute"
 msgid "60 minutes"
 msgstr "60 minute"
 
-#: 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 "Alarme"
@@ -4319,7 +4414,8 @@ msgid "Days"
 msgstr "Zi"
 
 #: 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 "Vineri"
 
@@ -4334,7 +4430,8 @@ msgid "Minutes"
 msgstr "minute"
 
 #: 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 "Luni"
 
@@ -4344,7 +4441,8 @@ msgid "S_un"
 msgstr "Dum"
 
 #: 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 "S�mb�t�"
 
@@ -4358,7 +4456,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Arat� num�rul de s�pt�m�ni"
 
 #: 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 "Duminic�"
 
@@ -4378,7 +4477,8 @@ msgid "Task List"
 msgstr "Lista de sarcini"
 
 #: 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 "Joi"
 
@@ -4396,7 +4496,8 @@ msgid "Time format:"
 msgstr "Format timp:"
 
 #: 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 "Mar�i"
 
@@ -4405,7 +4506,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 "Miercuri"
 
@@ -4453,7 +4555,7 @@ msgid "_Fri"
 msgstr "Vin"
 
 #: 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"
@@ -4504,157 +4606,161 @@ msgstr "Mie"
 msgid "before every appointment"
 msgstr "�nainte de sf�r�itul �nt�lnirii"
 
-#: 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 "Sunte�i sigur c� dori�i s� anula�i �i �terge�i aceast� �nt�lnire?"
 
-#: 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 "Sunte�i sigur c� dori�i s� anula�i �i �terge�i aceast� sarcin�?"
 
-#: 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 "Sunte�i sigur c� dori�i s� anula�i �i �terge�i intrarea din jurnal?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Acest eveniment a fost �ters."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Acest� sarcin� a fost �tears�."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Aceast� intrare �n jurnal a fost �ters�."
 
-#: 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 A�i f�cut modific�ri. Ignora�i aceste schimb�ri �i �nchide�i editorul?"
 
-#: 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 N-a�i f�cut modific�ri, �nchide�i editorul?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Acest eveniment a fost modificat."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Aceast� sarcina a fost modificat�."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Aceast� intrare �n jurnal a fost modificat�."
 
-#: 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 A�i f�cut modific�ri. Ignora�i aceste modific�ri �i actualiza�i editorul?"
 
-#: 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 Nu a�i f�cut modific�ri, actualiza�i editorul?"
 
-#: 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 "Eroare necunoscut�: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr " la "
 
-#: 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 " (Terminat "
 
-#: 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 "Terminat "
 
-#: 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 "Nu pot actualiza fi�ierele corect"
 
-#: 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 "Nu pot actualiza fi�ierele corect"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Editeaz� �nt�lnire"
 
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "�nt�lnire - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "Sarcina - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Intrare jurnal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "Nu exist� rezumat"
 
-#: 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 "Salveaz� ca..."
 
-#: 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 "Nu pot ob�ine versiunea curent�!"
 
@@ -4715,93 +4821,106 @@ msgstr "Delegat la:"
 msgid "Enter Delegate"
 msgstr "�terse"
 
-#: 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 "�nt�lnire"
 
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Reaminte�te"
 
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Revenire"
 
-#: 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 "Progra_mare �nt�lniri"
 
-#: 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 "�nt�lnire"
 
-#: 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 �nceput"
+
+#: 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 "Ora de �nceput"
+
+#: 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 "Eveniment zi_lnic"
 
-#: 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 "Clasificare"
 
-#: 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 "Confiden�ial"
 
-#: 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 & Ora"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 #, fuzzy
 msgid "F_ree"
 msgstr "Grec"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 #, fuzzy
 msgid "L_ocation:"
 msgstr "_Ac�iune"
 
-#: 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 "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
 #, fuzzy
 msgid "Show Time As"
 msgstr "Ploaie toren�ial�"
 
-#: 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 "Rezu_mat:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Contacte..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "Ora d_e sf�r�it"
@@ -4810,20 +4929,24 @@ msgstr "Ora d_e sf�r�it"
 msgid "_Start time:"
 msgstr "Ora de �nceput"
 
-#: 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
 #, fuzzy
 msgid "An organizer is required."
 msgstr "Un organizator trebuie setat."
 
-#: 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 "_Delegat la..."
 
@@ -4864,16 +4987,11 @@ msgid "Member"
 msgstr "Membru"
 
 #: 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 "Rol"
-
 #: 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
@@ -4881,13 +4999,6 @@ msgstr "Rol"
 msgid "Status"
 msgstr "Stare"
 
-#: 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 "Tip"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4898,107 +5009,87 @@ msgid "_Change Organizer"
 msgstr "Schimb� organizator"
 
 #: 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 "_Invit� pe al�ii..."
 
-#: 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/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/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 "Avansat"
 
-#: 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 ""
 "Aceast� �nt�lnire con�ine reveniri pe care Evolution nu le poate edita."
 
-#: 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 "�n"
 
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:977
 #, fuzzy
 msgid "first"
 msgstr "Cea��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr "secund�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:979
 #, fuzzy
 msgid "third"
 msgstr "Alte"
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:980
 #, fuzzy
 msgid "fourth"
 msgstr "Nord"
 
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:981
 #, fuzzy
 msgid "last"
 msgstr "Cea��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1004
 #, fuzzy
 msgid "Other Date"
 msgstr "Alt Fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "ziua"
 
-#: calendar/gui/dialogs/recurrence-page.c:1270
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr "�n"
 
-#: calendar/gui/dialogs/recurrence-page.c:1455
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr "apari�ii"
 
@@ -5066,30 +5157,35 @@ msgstr "s�pt�m�na"
 msgid "year(s)"
 msgstr "anul"
 
-#: 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 ""
 "Informa�iile despre �nt�lnire au fost schimbate. Trimit o versiune "
 "actualizat�?"
 
-#: 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 ""
 "Informa�iile despre �nt�lnire au fost schimbate. Trimit o versiune "
 "actualizat�?"
 
-#: 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 ""
 "Informa�iile despre sarcin� au fost schimbate. Trimit o versiune actualizat�?"
 
-#: 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 ""
 "Informa�iile despre sarcin� au fost schimbate. Trimit o versiune actualizat�?"
 
+#: calendar/gui/dialogs/task-details-page.c:397
+#, fuzzy
+msgid "Completed date is wrong"
+msgstr "Terminat "
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -5100,44 +5196,41 @@ msgstr "% Terminat"
 msgid "Date Completed:"
 msgstr "�nt�lnire �ncheiat�:"
 
-#: 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 "Selectez o ac�iune"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "�n desf�urare"
 
-#: 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 "_Prioritate:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Stare"
 
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "De baz�"
 
-#: 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 "Alocat"
 
-#: 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 "Descriere:"
 
@@ -5145,142 +5238,240 @@ msgstr "Descriere:"
 msgid "Sta_rt Date:"
 msgstr "Data de �nceput:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Contacte..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Data scadent�:"
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d zile"
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "1 zi"
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d s�pt�m�ni"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 s�pt�m�n�"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d ore"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 or�"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d minute"
+
+#: 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 secunde"
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "1 secund�"
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "Trimite un email"
+
+#: calendar/gui/e-alarm-list.c:475
+#, fuzzy
+msgid "Unknown action to be performed"
+msgstr "Furtun� necunoscut�"
+
+#: calendar/gui/e-alarm-list.c:487
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "�nainte de �nceperea �nt�lnirii"
+
+#: calendar/gui/e-alarm-list.c:490
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "�nainte de �nceperea �nt�lnirii"
+
+#: calendar/gui/e-alarm-list.c:495
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
+msgstr "�nainte de �nceperea �nt�lnirii"
+
+#: calendar/gui/e-alarm-list.c:504
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "�nainte de �nceperea �nt�lnirii"
+
+#: calendar/gui/e-alarm-list.c:507
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "dup� sf�r�itul �nt�lnirii"
+
+#: calendar/gui/e-alarm-list.c:512
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr "dup� sf�r�itul �nt�lnirii"
+
+#: calendar/gui/e-alarm-list.c:536
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "%s server %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: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
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "�terge contactele selectate"
 
-#: 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 "Deschide"
 
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:951
 #, fuzzy
 msgid "_Save as..."
 msgstr "Salveaz� ca..."
 
-#: 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 "_Tip�re�te..."
 
-#: 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 "Dec_upeaz�"
 
-#: 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 "_Copiaz�"
 
-#: 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 "_Lipe�te"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:962
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Atribuie task (FIXME)"
 
-#: calendar/gui/e-calendar-table.c:1000
+#: calendar/gui/e-calendar-table.c:963
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "�nainteaz� ca �i _calendar i"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:964
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marcheaz� ca terminat"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:965
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Marcheaz� sarcinile ca terminate"
 
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:970
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "�terge sarcinile selectate"
 
-#: 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"
@@ -5290,8 +5481,8 @@ msgstr "Clic aici s� ad�uga�i o sarcin�"
 msgid "Alarms"
 msgstr "Alarme"
 
-#: 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 "Terminat"
 
@@ -5320,8 +5511,8 @@ msgid "Start Date"
 msgstr "Data �nceput"
 
 #: 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 "Rezumat"
 
@@ -5329,19 +5520,15 @@ msgstr "Rezumat"
 msgid "Task sort"
 msgstr "Sortare sarcini"
 
-#: 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"
 
@@ -5356,526 +5543,604 @@ 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 diviziuni 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: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
 #, fuzzy
 msgid "New _Appointment"
 msgstr "�nt�lnire nou�"
 
-#: 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 "Eveniment zilnic nou"
 
-#: 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 "�nt�lnire"
 
-#: 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 "Sarcin� nou�"
 
-#: 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 "Tip�re�te"
 
-#: 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 "Mergi la _ziua"
 
-#: 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 "Mergi la 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 "Aceasta e informa�ie liber-ocupat."
 
-#: 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 "Set�ri _mail..."
 
-#: 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 "_Salveaz� ca..."
 
-#: 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 "Progra_mare �nt�lniri"
 
-#: 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 "�nainteaz� ca �i _calendar 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
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "F� aceast� apari�ie mutabil�"
 
-#: 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 "�terge aceast� apari�ie"
 
-#: 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 "�terge toate apari�iile"
 
-#: calendar/gui/e-itip-control.c:615
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Yes. (Complex Recurrence)"
+msgstr "Revenire simpl�"
+
+#: calendar/gui/e-itip-control.c:716
+#, fuzzy
+msgid "Every day"
+msgstr "Fiecare"
+
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "Every %d days"
+msgstr "%d zile"
+
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Every week"
+msgstr "Fiecare"
+
+#: calendar/gui/e-itip-control.c:726
+#, fuzzy, c-format
+msgid "Every %d weeks"
+msgstr "%d s�pt�m�ni"
+
+#: 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 s�pt�m�ni"
+
+#: 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 "O lun�"
+
+#: 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 "Fiecare"
+
+#: 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 "Ora de sf�r�it a �nt�lnirii:"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:851
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Terminat "
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:861
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "Descriere:"
 
-#: 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 "informa�ie calendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:913
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Calendar"
 
-#: 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 "Eroare necunoscut�"
 
 #. 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 "_Ac�iune"
 
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-itip-control.c:1073
 #, fuzzy
 msgid "Status:"
 msgstr "_Stare"
 
-#: 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 " Accept� "
 
-#: 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 " Inten�ie "
 
-#: 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 " Refuz� "
 
-#: 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 "Necunoscut"
 
-#: 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 "Selectez o ac�iune"
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:1146
 #, fuzzy
 msgid "Update"
 msgstr "a fost dup�"
 
-#: 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
 #, fuzzy
 msgid "Accept"
 msgstr " Accept� "
 
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:1175
 #, fuzzy
 msgid "Tentatively accept"
 msgstr " Inten�ie "
 
-#: calendar/gui/e-itip-control.c:957
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Decline"
 msgstr " Refuz� "
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:1200
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Informa�ie surs�"
 
-#: 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 "Informa�ie"
 
-#: 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 "Renun��"
 
-#: 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 "Ob�ine ultimele informa�ii despre �nt�lnire"
 
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1321
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Informa�ie op�ional�"
 
-#: 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 "Aceasta e o cerere pentru o informa�ie liber-ocupat."
 
-#: 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 "Aceasta e o cerere pentru o informa�ie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1329
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "�nt�lnire"
 
-#: 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 "Ob�ine ultimele informa�ii despre �nt�lnire"
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1334
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Ora de sf�r�it a �nt�lnirii:"
 
-#: 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 "Ob�ine ultimele informa�ii despre �nt�lnire"
 
-#: calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1339
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Cerere de �nt�lnire (FIXME)"
 
-#: 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 "Acesta e un r�spuns la o cerere de �nt�lnire."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1347
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "�nt�lnire"
 
-#: 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 "Acesta e un r�spuns la o cerere de �nt�lnire."
 
-#: calendar/gui/e-itip-control.c:1136
+#: calendar/gui/e-itip-control.c:1355
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Selectez o ac�iune"
 
-#: 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 "G�se�te �n mesaj"
 
-#: 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 "Ob�ine ultimele informa�ii despre �nt�lnire"
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1388
 #, fuzzy
 msgid "Task Information"
 msgstr "Informa�ie"
 
-#: 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 "Aceasta e o cerere pentru o informa�ie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1395
 #, fuzzy, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "Aceasta e o cerere pentru o informa�ie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1396
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Panou sarcini"
 
-#: 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 "Aceasta e o cerere pentru ultima informa�ie despre sarcin�."
 
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1401
 #, fuzzy
 msgid "Task Update"
 msgstr "a fost dup�"
 
-#: 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 "Aceasta e o cerere pentru ultima informa�ie despre sarcin�."
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1406
 #, fuzzy
 msgid "Task Update Request"
 msgstr "Ce_rere task (FIXME)"
 
-#: 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 "Acesta e un r�spuns la o cerere de �nt�lnire."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1414
 #, fuzzy
 msgid "Task Reply"
 msgstr "R�spunde"
 
-#: 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 "Acesta e un r�spuns la o cerere de �nt�lnire."
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1422
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Aceasta e o anulare a unei sarcini"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1430
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Mesaj calendar"
 
-#: 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 "Aceasta e informa�ie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1450
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Informa�ie surs�"
 
-#: 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 "Aceasta e o cerere pentru o informa�ie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1455
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "URL liber-ocupat"
 
-#: 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 "Acesta e un r�spuns la o cerere liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1460
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "URL liber-ocupat"
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1465
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Tip�re�te mesaj"
 
-#: 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 "Dosarul pare a fi deteriorat irecuperabil."
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "Mesajul con�ine numai cererile nesuportate."
 
-#: 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
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "S-a produs o eroare la desc�rcarea sursei de �tiri</dt>"
 
-#: 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 "Bug buddy nu poate fi rulat."
 
-#: 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 "Nu pot deschide dosarul �n `%s'"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1919
 #, fuzzy
 msgid "Update complete\n"
 msgstr "�nt�lnire �ncheiat�:"
 
-#: calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1922
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Nu pot �nc�rca cursorul\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 "Nu pot deschide dosarul �n `%s'"
 
-#: calendar/gui/e-itip-control.c:1766
+#: calendar/gui/e-itip-control.c:2011
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Adrese participare"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:2014
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Adrese participare"
 
-#: calendar/gui/e-itip-control.c:1804
+#: calendar/gui/e-itip-control.c:2049
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% Terminat"
 
-#: 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 "Date trimise"
 
-#: 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 "Alege dosar"
 
-#: calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:2213
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Alege dosar"
@@ -5917,231 +6182,236 @@ msgstr "dat� sf�r�it"
 msgid "date-start"
 msgstr "dat� �nceput"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:80
 #, fuzzy
 msgid "Chair Persons"
 msgstr "Telefon ma�in�"
 
-#: 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 "Participant necesar"
 
-#: calendar/gui/e-meeting-model.c:86
+#: calendar/gui/e-meeting-model.c:82
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Participant op�ional"
 
-#: calendar/gui/e-meeting-model.c:87
+#: calendar/gui/e-meeting-model.c:83
 #, fuzzy
 msgid "Resources"
 msgstr "Surs�"
 
-#: 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 "Nume grup:"
 
-#: 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 "Surs�"
 
-#: 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 "Scaun"
 
-#: 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 "Participant necesar"
 
-#: 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 "Participant op�ional"
 
-#: 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 "Neparticipant"
 
-#: 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 "Selectez o ac�iune"
+
+#: 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 "Tentativ�"
 
-#: 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 "�terse"
 
-#: 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 "�n derulare"
 
 #. 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 "Afar� din oficiu"
 
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Nici o informa�ie"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Op�iuni"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Arat� numai _orele de lucru"
 
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Arat� m�rit"
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "Act_ualizeaz� liber/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 "_Alege automat"
 
-#: 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 "To_ate persoanele �i resursele"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Toate _persoanele �i o resurs�"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "Necesa_r o persoan�"
 
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Necesar o persoan� �i _o resurs�"
 
-#: calendar/gui/e-meeting-time-sel.c:654
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Ora de �nceput a �nt�lnirii:"
 
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Ora de sf�r�it a �nt�lnirii:"
 
-#: 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 "Deschid rezerva %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 "Nu pot inc�rca sarcinile �n `%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 "Metoda necesar� pentru a �nc�rca `%s' nesuportat�"
 
-#: 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 "Nu pot deschide dosarul �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 "Eroare la start %s"
 
-#: calendar/gui/e-tasks.c:540
+#: calendar/gui/e-tasks.c:554
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data terminare"
 
-#: calendar/gui/e-tasks.c:563
+#: calendar/gui/e-tasks.c:577
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "�terge contactele selectate"
 
-#: calendar/gui/e-tasks.c:656
+#: calendar/gui/e-tasks.c:672
 #, fuzzy
 msgid "Expunging"
 msgstr "Distrug dosarul"
 
-#: calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-week-view.c:3529
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "�nt�lnire nou�..."
 
-#: calendar/gui/gnome-cal.c:1530
+#: calendar/gui/gnome-cal.c:1503
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nu pot deschide dosarul �n `%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 "Metoda cerut� pentru deshiderea `%s' nu e 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 "Alarme"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6149,7 +6419,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"
@@ -6157,7 +6427,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 "Deschide calendar"
@@ -6224,331 +6494,188 @@ msgstr "Octombrie"
 msgid "September"
 msgstr "Septembrie"
 
-#: 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 "Un organizator trebuie setat."
 
-#: 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 "informa�ie calendar"
 
-#: 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 "Informa�ie"
 
-#: 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 "Informa�ie op�ional�"
 
-#: 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 "Informa�ie surs�"
 
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:394
 #, fuzzy
 msgid "Calendar information"
 msgstr "informa�ie calendar"
 
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:430
 #, fuzzy
 msgid "Updated"
 msgstr "a fost dup�"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:438
 #, fuzzy
 msgid "Refresh"
 msgstr "Re�mprosp�teaz� lista"
 
-#: 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 "Informa�ie surs�"
 
-#: calendar/gui/itip-utils.c:598
+#: calendar/gui/itip-utils.c:525
 #, fuzzy
 msgid "iCalendar information"
 msgstr "informa�ie calendar"
 
-#: 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 "Nu pot ini�ializa Bonobo"
-
-#: calendar/gui/main.c:99
-#, fuzzy
-msgid "Could not create the component editor factory"
-msgstr "Nu pot crea procesatorul servicului de notificare alarm�"
-
-#: 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 "Du"
 
-#: 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 "Mi"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "Jo"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "Vi"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "S�"
 
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1885
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Ziua curent� (%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
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "S�pt�m�na curent� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1930
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "Luna curent� (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1937
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Anul curent (%Y)"
 
-#: calendar/gui/print.c:2249
+#: calendar/gui/print.c:2267
 #, fuzzy
 msgid "Task"
 msgstr "Sarcin�"
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2326
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "_Stare"
 
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Prioritate:"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2358
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "�nt�lnire �ncheiat�:"
 
-#: 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"
 "Categorii:  "
 
-#: calendar/gui/print.c:2375
+#: calendar/gui/print.c:2395
 #, fuzzy
 msgid "Contacts: "
 msgstr "Contacte"
 
-#: calendar/gui/print.c:2430
-msgid "Print Calendar"
-msgstr "Tip�re�te calendar"
-
-#: 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 "Previzualizeaz� tip�rirea"
 
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "Tip�re�te elementul"
 
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "Seteaz� tip�rirea"
 
-#: calendar/gui/tasks-control-factory.c:75
-#, fuzzy
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr "Nu pot crea vederea calendar. Verifica�i set�rile pentru ORBit si OAF"
-
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr "De afi�at URI pentru dosarul sarcini"
 
-#: 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"
@@ -6556,96 +6683,55 @@ 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 "Nu m� �ntreba din nou"
 
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:615
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Tip�re�te calendar"
 
-#: 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 a preluat sarcinile care au fost in dosarul calendar �i le-a "
-"transferat �ntr-un nou dosar de sarcini."
-
-#: 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 a �ncercat s� preia sarcinile care au fost �n dosarul calendar �i "
-"le-a transferat �ntr-un nou dosar de sarcini.C�teva sarcini nu pot fi "
-"transferate, a�a c� acest proces se poate relua �n viitor"
-
-#: 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 ""
-"Nu pot deschide `%s'; nici un articol din dosarul calendar nu va fi "
-"transferat �n dosarul de sarcini"
-
-#: 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 ""
-"Metoda cerut� pentru a �nc�rca `%s' nu e suportat�; nici un articol din "
-"dosarul calendar nu va fi transferat �n dosarul de sarcini"
-
-#: 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 "DLMMJVS"
 
-#: 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 "Procesator pentru  importul fi�ierelor GnomeCard in Evolution"
+msgid "Evolution Calendar intelligent importer"
+msgstr "Evolution calendar iTip/iMip vizualizator"
 
-#: 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 "Import fi�ierele card V �n Evolution."
+msgid "Evolution iCalendar importer"
+msgstr "Evolution calendar iTip/iMip vizualizator"
 
-#: 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 "Import fi�ierele card V �n Evolution."
+msgid "Evolution vCalendar importer"
+msgstr "Evolution calendar iTip/iMip vizualizator"
 
-#: calendar/importers/icalendar-importer.c:168
-#, fuzzy, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr ""
-"Nu pot lua mesajul: %s din dosarul %s\n"
-"  %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Mesaj calendar"
 
-#: calendar/importers/icalendar-importer.c:180
-#, fuzzy, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "Nu m� pot conecta la serverul: %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 "Reaminte�te"
 
-#: calendar/importers/icalendar-importer.c:697
+#: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Mesaj calendar"
 
-#: calendar/importers/icalendar-importer.c:722
+#: calendar/importers/icalendar-importer.c:663
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6654,11 +6740,15 @@ msgstr ""
 "Evolution a g�sit fi�iere de mail Pine.\n"
 "Dori�i s� le importa�i �n Evolution?"
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:670
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Deschide calendar"
 
+#: 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 ""
@@ -8328,30 +8418,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 "Semnarea e nesuportat� de acest cifru"
 
-#: camel/camel-cipher-context.c:210
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr "Verificarea nu e suportat� de acest cifru"
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr "Criptarea nu e suportat� de acest cifru"
 
-#: camel/camel-cipher-context.c:296
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr "Decriptarea nu e suportat� de acest cifru"
 
-#: camel/camel-data-cache.c:169
+#: camel/camel-cipher-context.c:342
+#, fuzzy
+msgid "You may not import keys with this cipher"
+msgstr "Decriptarea nu e suportat� de acest cifru"
+
+#: camel/camel-cipher-context.c:374
+#, fuzzy
+msgid "You may not export keys with this cipher"
+msgstr "Decriptarea nu e suportat� de acest cifru"
+
+#: camel/camel-data-cache.c:133
 #, fuzzy
 msgid "Unable to create cache path"
 msgstr ""
 "Nu pot crea fi�ierul de ie�ire: %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 "Nu pot deschide directorul cache: %s"
@@ -8391,87 +8491,94 @@ msgstr "Creez dosar nou"
 msgid "You must be working online to complete this operation"
 msgstr "Pentru aceast� opera�ie trebuie s� lucra�i 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 "E�ec la decodarea mesajului."
+
+#: 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 "E�ec la decodarea mesajului."
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "Nu pot crea directorul %s: %s"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Sincronizare foldere"
 
-#: 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 "Eroare parsare filtru: %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 "Eroare execu�ie filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Nu pot deschide dosarul spool"
 
-#: camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Nu pot procesa dosarul spool"
 
-#: camel/camel-filter-driver.c:966
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Primesc mesaj %d (%d%%)"
 
-#: camel/camel-filter-driver.c:970
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Nu pot deschide mesajul"
 
-#: 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 "E�uare la mesajul %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 "Sincronizare dosar"
 
-#: camel/camel-filter-driver.c:1058
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Primesc mesajul %d din %d"
 
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "E�uare la mesajul %d din %d"
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "E�ec la decodarea mesajului."
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Con�inut invalid al mesajului"
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Con�inut invalid al mesajului"
 
-#: camel/camel-filter-search.c:514
-#, fuzzy, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "E�ec la decodarea mesajului."
-
-#: camel/camel-filter-search.c:550
-#, fuzzy, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "E�ec la decodarea mesajului."
-
-#: 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 "Eroare execu�ie filtru c�utare: %s: %s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8480,7 +8587,7 @@ msgstr ""
 "Nu pot parsa expresia de c�utare: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8489,11 +8596,11 @@ msgstr ""
 "Eroare executare expresia c�utare: %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 "(potrivire total�) se cere un singur rezultat"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Execut� interogare �n header necunoscut: %s"
@@ -8527,7 +8634,7 @@ msgstr "Copiez mesaje"
 msgid "Copying messages"
 msgstr "Copiez mesajele �n %s"
 
-#: camel/camel-gpg-context.c:697
+#: camel/camel-gpg-context.c:724
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8535,72 +8642,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 "Anulat."
 
-#: 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 "R�spuns nea�teptat de la serverul IMAP: %s"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:814
 #, fuzzy
 msgid "No data provided"
 msgstr "Nici un destinatar specificat"
 
-#: camel/camel-gpg-context.c:830
+#: camel/camel-gpg-context.c:857
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: 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 "E�ec la decodarea mesajului."
 
-#: 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 "E�ec la decodarea mesajului."
 
-#: 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 "E�ec la decodarea mesajului."
 
-#: 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 "E�ec la decodarea mesajului."
 
-#: 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 "Nu pot crea fi�ier temp: %s"
@@ -8625,24 +8733,23 @@ msgstr ""
 msgid "Could not lock '%s'"
 msgstr "Nu pot bloca: '%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 "Nu pot crea fi�ier de blocare pentru %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 ""
 "Timp expirat la �ncercarea de blocare a fi�ierului %s. �ncerca�i mai t�rziu."
 
-#: camel/camel-lock.c:206
+#: camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "E�uare la blocare prin folosirea 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 "E�ec la blocarea prin folosirea flock(2): %s"
@@ -8652,51 +8759,51 @@ msgstr "E�ec la blocarea prin folosirea flock(2): %s"
 msgid "Could not check mail file %s: %s"
 msgstr "Nu pot verifica fi�ierul cu mesaje %s: %s"
 
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nu pot deschide fi�ierul cu mesaje %s: %s"
 
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nu pot deschide fi�ierul temporar cu mesaje %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 "E�uare la stocarea mesajului �n fi�ierul temporar %s: %s"
 
-#: camel/camel-movemail.c:188
+#: camel/camel-movemail.c:187
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nu pot crea conexiunea: %s"
 
-#: camel/camel-movemail.c:200
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nu pot bifurca: %s"
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:237
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "E�uare program de mutare mesaje: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 msgid "(Unknown error)"
 msgstr "(Eroare necunoscut�)"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Eroare la citirea fi�ierului cu mesaje: %s"
 
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Eroare la scrierea fi�ierului cu mesaje temporar: %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 "Eroare la copierea fi�ierului cu mesaje temporar: %s"
@@ -8713,27 +8820,27 @@ 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 "Alt� eroare"
 
-#: 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 ""
 "Nu pot �nc�rca %s: �nc�rcarea modulului nu e suportat� �n acest sistem."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:141
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nu pot �nc�rca %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 "Nu pot �nc�rca %s: Nu exist� cod de ini�ializare �n modul"
@@ -8787,11 +8894,11 @@ msgstr ""
 "Aceast� op�iune v� va conecta la server folosind o parol� CRAM-MD5, dac� "
 "serverul suport�."
 
-#: 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."
@@ -8799,42 +8906,119 @@ msgstr ""
 "Aceast� op�iune v� va conecta la server folosind o parol� DIGEST-MD5, "
 "dac�serverul suport�."
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Comunicarea cu serverul prea lung� (>2048 octe�i)\n"
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr "Comunicare invalid� cu serverul\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 ""
 "Comunicarea cu serverul a con�inut un element \"calitatea protec�iei\" "
 "invalid\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 "R�spunsul serverului nu con�ine datele de autorizare\n"
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr "R�spunsul serverului con�ine date de autorizare incomplete\n"
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr "R�sunsul serverului nepotrivit\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 ""
+"Acest� op�iune v� va conecta la server folosind autentificare 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 "R�spuns de la server de autentificare e�uat�."
+
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "E�ec la decodarea mesajului."
+
+#: camel/camel-sasl-gssapi.c:299
+#, fuzzy
+msgid "Unsupported security layer."
+msgstr "Verific tipurile suportate"
+
+#: 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 ""
 "Acest� op�iune v� va conecta la server folosind autentificare Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -8843,11 +9027,6 @@ msgstr ""
 "Nu pot lua tichetul Kerberos:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1059
-msgid "Bad authentication response from server."
-msgstr "R�spuns de la server de autentificare e�uat�."
-
 #: camel/camel-sasl-login.c:32
 #, fuzzy
 msgid "Login"
@@ -8898,7 +9077,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 "Compilarea expresiei regulate e�uat�: %s: %s"
@@ -8918,37 +9097,37 @@ msgstr "URL '%s' necesit� o component� gazd�"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' necesit� o component� de cale"
 
-#: camel/camel-service.c:743
+#: camel/camel-service.c:741
 #, c-format
 msgid "Resolving: %s"
 msgstr "Rezolv: %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 "E�ec la c�utarea numelui: %s"
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "E�ec la c�utarea gazdei: %s: gazd� neg�sit�"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "E�ec la c�utarea gazdei: %s: motiv necunoscut"
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 #, fuzzy
 msgid "Resolving address"
 msgstr "Rezolv: %s"
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "E�ec la c�utarea gazdei: %s: gazd� neg�sit�"
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "E�ec la c�utarea gazdei: %s: motiv necunoscut"
@@ -8961,12 +9140,12 @@ msgstr "Furnizor de email �n dosar virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pentru citirea mailului ca o interogare a altui set de dosar"
 
-#: 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 "Nici un furnizor valid pentru protocolul `%s'"
 
-#: camel/camel-session.c:545
+#: camel/camel-session.c:548
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8975,181 +9154,181 @@ msgstr ""
 "Nu pot crea directorul %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 "V� rog introduce�i parola pentru %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 "V� rog preciza�i porecla certificatului pentru a-l semna."
 
-#: camel/camel-smime-context.c:209
+#: camel/camel-smime-context.c:207
 #, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr "Certificatul semn�turii pentru \"%s\". nu exist�."
 
-#: camel/camel-smime-context.c:249
+#: camel/camel-smime-context.c:247
 #, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "Certificatul cript�rii pentru \"%s\" nu exist�."
 
-#: 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 "E�ec la g�sirea certificatului pentru \"%s\"."
 
-#: camel/camel-smime-context.c:556
+#: camel/camel-smime-context.c:554
 msgid "Failed to find a common bulk algorithm."
 msgstr "E�ec la g�sirea algoritmului comun bulk."
 
-#: camel/camel-smime-context.c:810
+#: camel/camel-smime-context.c:808
 msgid "Failed to decode message."
 msgstr "E�ec la decodarea mesajului."
 
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
 msgid "Failed to verify certificates."
 msgstr "E�ec la verificarea certificatului."
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 #, fuzzy
 msgid "Unable to get issuer's certificate"
 msgstr "E�ec la verificarea certificatului."
 
-#: 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 "E�ec la verificarea certificatului."
 
-#: 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 "Fi�ier semn�tur�:"
 
-#: 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 certificat:"
 
-#: 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 "Eroare la �nc�rcarea %s"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 #, fuzzy
 msgid "Out of memory"
 msgstr "Afar� din oficiu"
 
-#: 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 "E�ec la verificarea certificatului."
 
-#: 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 certificat:"
 
-#: 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 "Con�inut invalid al mesajului"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 #, fuzzy
 msgid "Certificate untrusted"
 msgstr "ID certificat:"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 #, fuzzy
 msgid "Certificate rejected"
 msgstr "ID certificat:"
 
-#: 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"
@@ -9158,15 +9337,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"
@@ -9184,7 +9363,7 @@ msgstr ""
 "Dori�i s� accepta�i oricum?"
 
 #. 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"
@@ -9199,35 +9378,35 @@ msgstr ""
 "\n"
 "Dori�i s� accepta�i oricum?"
 
-#: 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 certificat:"
 
-#: 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 certificat:"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nu pot parsa URL `%s'"
@@ -9242,40 +9421,40 @@ msgstr "Eroare la start %s"
 msgid "No such message %s in %s"
 msgstr "Nu exist� mesajul %s �n %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 "Verific mesajele noi �n toate dosarele"
 
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:261
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nu pot crea dosarul blocat la %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 "Nu pot lua dosarul: %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 "Nu pot crea dosarul blocat la %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 "Nu pot lua dosarul: %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
 msgid "Operation cancelled"
 msgstr "Opera�ia anulat�"
 
 #: 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 "Server deconectat nea�teptat"
@@ -9298,53 +9477,53 @@ msgstr "R�spuns nea�teptat de la serverul IMAP: %s"
 msgid "IMAP command failed: %s"
 msgstr "Comanda IMAP e�uat�: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr "R�spunsul serverului terminat prea repede."
 
-#: 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 "R�spunsul serverului IMAP nu con�ine informa�ia %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 "R�spunsul serverului IMAP nea�teptat OK: %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 "Nu pot crea directorul %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 "Nu pot �nc�rca sumarul pentru %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 "Dosarul a fost distrus �i recreat pe server."
 
 #. 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 "Salvez mesajele"
 
-#: 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 "E�ec la decodarea mesajului."
 
-#: 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"
@@ -9353,24 +9532,24 @@ msgstr ""
 "Nu pot lua mesajul: %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 "Nu exist� mesaj"
 
-#: 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 "Mesajul nu este disponibil �n mod curent"
 
-#: 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 "Nu pot g�si corpul mesajului �n r�spunsul FETCH."
 
@@ -9400,7 +9579,7 @@ msgstr "Verific mailurile noi"
 msgid "Check for new messages in all folders"
 msgstr "Verific mesajele noi �n toate dosarele"
 
-#: 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 "Dosare"
 
@@ -9431,7 +9610,7 @@ msgstr "Pentru citirea �i stocarea mesajelor pe servere 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 "Parola"
 
@@ -9450,62 +9629,61 @@ msgstr "Server SMTP %s"
 msgid "IMAP service for %s on %s"
 msgstr "%s serviciu pentru %s �n %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 "Conexiune anulat�"
 
-#: 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 "Nu m� pot conecta la %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 ""
 "Nu m� pot conecta la serverul POP.\n"
 "Eroare la trimiterea numelui utilizator: %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 "Opera�ie nesuportat�"
 
-#: 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 "E�ec la autentificare."
 
-#: 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 "Serverul IMAP %s nu suport� tipul cerut de autentificare %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 "Tip de autentificare nesuportat %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 "%sV� rog intoduce�i parola IMAP pentru %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 "Nu a�i introdus o parol�."
 
-#: 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"
@@ -9516,24 +9694,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 "Nu exist� dosarul %s"
 
-#: 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 "Eroare necunoscut�: %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 ""
 
@@ -9614,8 +9792,8 @@ msgid ""
 msgstr "Pentru stocarea mail-urilor locale �n directoare spool Unix"
 
 #: 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 "Stocarea root %s nu e o cale absolut�"
@@ -9627,36 +9805,36 @@ msgstr "Stocarea root %s nu e director obi�nuit"
 
 #: 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 "Nu pot lua dosarul: %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 "Stoc�rile locale nu au un 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 "Fi�ier mail-uri locale %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 "Nu pot redenumi dosarul %s �n %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 "Nu pot redenumi dosarul: %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 "Nu pot �terge dosarul sumar al fi�ierelor `%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 "Nu pot �terge dosarul index al fi�ierelor `%s': %s"
@@ -9666,7 +9844,7 @@ msgstr "Nu pot �terge dosarul index al fi�ierelor `%s': %s"
 msgid "Could not save summary: %s: %s"
 msgstr "Nu pot �nc�rca sumarul pentru %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 "Nu pot ad�uga mesajul la sumar: motiv necunoscut"
 
@@ -9680,14 +9858,14 @@ msgstr "E�uare la mesajul %d"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nu pot ad�uga mesajul la dosarul 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 "Con�inut invalid al mesajului"
 
 #: 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"
@@ -9699,14 +9877,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 "Dosarul `%s' nu exist�."
 
 #: 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"
@@ -9721,72 +9899,72 @@ msgid "`%s' is not a maildir directory."
 msgstr "`%s' nu e un director de tip 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 "Nu pot �terge dosarul `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:169
 msgid "not a maildir directory"
 msgstr "nu e director 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 "Nu pot scana dosarul `%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 "Nu pot deschide calea c�tre directorul maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:539
+#: camel/providers/local/camel-maildir-summary.c:541
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Verific mailurile noi"
 
-#: camel/providers/local/camel-maildir-summary.c:640
+#: camel/providers/local/camel-maildir-summary.c:644
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Salvez mesajele"
 
-#: 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 "Sincronizare dosar"
 
-#: 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 "Nu pot crea dosarul blocat la %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 "Nu pot deschide c�su�a po�tal�: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:278
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Opera�ia anulat�"
 
-#: 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 "Nu pot ad�uga mesajul la fi�ierul 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"
@@ -9795,11 +9973,11 @@ msgstr ""
 "Nu pot lua mesajul: %s din dosarul %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 "Dosarul pare a fi deteriorat irecuperabil."
 
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Construc�ia mesajului e�uat�: c�su�a po�tal� corupt�?"
 
@@ -9842,79 +10020,79 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Dosarul `%s' nu e gol. Nu s-a �ters."
 
-#: 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 ""
 "Nu pot deschide dosarul `%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 "Eroare fatal� la parserul de mail la pozi�ia %ld �n dosarul %s"
 
-#: 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 "Nu pot lua dosarul: %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 ""
 "Nu pot deschide fi�ierul `%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 "Nu pot deschide c�su�a po�tal� temporar�: %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 "Nu pot �nchide dosarul surs� %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 "Nu pot �nchide dosarul temporar: %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 "Nu pot redenumi dosarul: %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 "Sumarul �i dosarul nu se potrivesc, chiar dup� o sincronizare"
 
-#: 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 "Eroare necunoscut�: %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 "Nu pot redenumi dosarul: %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 "Eroare la scrierea �n c�su�a po�tal� temporar�: %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 "E�ec la scrierea �n c�su�a po�tal�: %s: %s"
@@ -9934,67 +10112,67 @@ msgstr "Nu pot ad�uga mesajul la dosarul mh: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' nu e un director"
 
-#: 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 "Nu pot deschide calea c�tre directorul 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 "Dosarele spool nu pot fi redenumite"
 
-#: 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 "Stocarea root %s nu e director obi�nuit"
 
-#: 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 "Dosarul `%s'/%s nu exist�."
 
-#: 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' nu e un fi�ier obi�nuit."
 
-#: 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 "Fi�ier 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 "Dosarele spool nu pot fi redenumite"
 
-#: camel/providers/local/camel-spool-store.c:213
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr "Dosarele spool nu pot fi redenumite"
 
-#: camel/providers/local/camel-spool-store.c:221
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr "Dosarele spool nu pot fi �terse"
 
-#: 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 "Nu pot sincroniza dosarul temporar: %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 "Nu pot sincroniza dosarul 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 ""
@@ -10077,46 +10255,46 @@ msgid "Retrieving POP summary"
 msgstr "Primesc sumarul 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 "Opera�ia anulat�"
 
-#: 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 "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:306
+#: camel/providers/pop3/camel-pop3-folder.c:308
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Decupeaz� mesajele selectate"
 
-#: 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 "Nici un mesaj cu 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 "Primesc mesajul 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 ""
 "Nu pot lua mesajul: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Precipita�ie necunoscut�"
@@ -10134,7 +10312,7 @@ msgstr "Las� mesajele pe server"
 msgid "Delete after %s day(s)"
 msgstr "�tergere dup� %s zi(le)"
 
-#: 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"
 
@@ -10161,27 +10339,27 @@ msgstr ""
 "prin intermediul protocolului APOP. Aceasta poate s� nu func�ioneze pentru "
 "to�iutilizatorii chiar pe servere care pretind c� suport� acest mod."
 
-#: 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 "Nu m� pot conecta la %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 ""
 "Nu m� pot conecta la serverul POP.\n"
 "Eroare la trimiterea numelui utilizator: %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 "Nu m� pot conecta la serverul POP �n %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 "
@@ -10190,28 +10368,28 @@ msgstr ""
 "Nu m� pot conecta la serverul POP.\n"
 "Mecanismul de autentificare solicitat este nesuportat."
 
-#: 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 "Comanda IMAP e�uat�: %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 "Autentificare nereu�it� la serverul 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 "%sV� rog introduce�i parola POP3 pentru %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"
@@ -10220,13 +10398,13 @@ msgstr ""
 "Nu m� pot conecta la serverul POP.\n"
 "Eroare la trimiterea parolei: %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 "Nu exist� dosarul `%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"
 
@@ -10238,50 +10416,50 @@ msgstr ""
 "Pentru livrarea mailului prin trecerea lui la programul \"sendmail\" �n "
 "sistemul 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 "Nu pot parsa 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 "Nu pot crea conexiunea c�tre sendmail: %s: mailul nu este trimis"
 
-#: 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 "Nu pot bifurca sendmail: %s: mailul nu este trimis"
 
-#: 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 "Nu pot trimite mesajul: %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 oprit cu mesajul %s: mailul nu este trimis."
 
-#: 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 "Nu pot executa %s: mailul nu este trimis."
 
-#: 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 oprit cu starea %d: mailul nu este trimis."
 
-#: 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 "Mail trimis prin intermediul programului 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"
 
@@ -10291,141 +10469,141 @@ msgstr ""
 "Pentru trimiterea mailului prin conectare la un hub de mailuri distant "
 "folosind SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr "Eroare de sintax�, comand� nerecunoscut�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr "Eroare de sintax� la parametri sau argumente"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr "Comand� neimplementat�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr "Parametru al comenzii neimplementat"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr "Starea sistemului, sau r�spuns de ajutor al sistemului"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr "Mesaj de ajutor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr "Serviciu preg�tit"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr "Serviciul �nchide canalul de transmisie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr "Serviciu invalid, canal de transmisie �nchis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr "Ac�iunea cerut� de mail terminat� cu succes"
 
-#: 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 "Utilizatorul nu e local: se va �nainta la <cale-�naintare>"
 
-#: 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 "Ac�iunea cerut� de mail neefectuat�: c�su�a po�tal� indisponibil�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Ac�iunea cerut� neefectuat�: c�su�a po�tal� indisponibil�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr "Ac�iunea cerut� anulat�: eroare la procesare"
 
-#: 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 "Utilizatorul nu este local; �ncerca�i v� rog <cale-�naintare>"
 
-#: 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 ""
 "Ac�iunea cerut� refuzat�: posibilitatea de stocare a sistemului dep�it�"
 
-#: 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 "Ac�iunea cerut� anulat�: dep�e�te posibilit��ile de stocare"
 
-#: 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 "Ac�iunea cerut� anulat�: numele c�su�ei de mail nu este permis"
 
-#: 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 "�ncepe�i introducerea mailului; termina�i cu <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr "Tranzac�ie e�uat�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr "E nevoie de o tranzi�ie a parolei"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr "Mecanismul de autenticare este prea slab"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Mecanismul de autentificare cerut necesit� criptare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr "E�uare temporar� a autentific�rii"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "Necesit� autentificare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 #, fuzzy
 msgid "Welcome response error"
 msgstr "R�spuns de eroare 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 ""
 "Nu m� pot conecta la serverul POP.\n"
 "Eroare la trimiterea numelui utilizator: %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 "Mesajul nu pare a fi formatat corespunz�tor."
 
-#: 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 "Comanda AUTH a expirat: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "R�spuns de eroare 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 "Serverul SMTP %s nu suport� tipul cerut de autentificare %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 "%sIntroduce�i v� rog parola SMTP pentru %s@%s"
@@ -10455,11 +10633,11 @@ msgstr "SMTP mail livrat prin %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Nu pot trimite mesajul: adresa expeditorului invalid�."
 
-#: 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 "Trimit mesaj"
 
-#: camel/providers/smtp/camel-smtp-transport.c:703
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
@@ -10468,65 +10646,65 @@ msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "�nt�lnire"
 
-#: 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 "Timp expirat pentru cererea RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 #, fuzzy
 msgid "HELO response error"
 msgstr "R�spuns de eroare RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentificare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr "Eroare la crearea obiectului de autentificare 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 "Comanda AUTH a expirat: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr "E�ec la cererea 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 "R�spuns de la server: autentificare e�uat�.\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 "Comanda MAIL FROM a expirat: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "R�spuns de eroare la comanda MAIL FROM: %s: mailul nu a fost trimis"
 
-#: 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 "Comanda RCPT TO a expirat: %s: mailul nu a fost trimis"
 
-#: 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 "Comanda DATA a expirat: %s: mailul nu a fost trimis"
@@ -10534,81 +10712,81 @@ msgstr "Comanda DATA a expirat: %s: mailul nu a fost trimis"
 #. 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 "R�spuns de eroare 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 "DATA - timp expirat: terminarea mesajului: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "R�spuns de la server de autentificare e�uat�."
 
-#: 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 "Timp expirat pentru cererea RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 #, fuzzy
 msgid "RSET response error"
 msgstr "R�spuns de eroare 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 "Comanda AUTH a expirat: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 #, fuzzy
 msgid "QUIT response error"
 msgstr "R�spuns de eroare 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 "anex�"
 
-#: 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 "Scoate articolele selectate din lista de anexe"
 
-#: composer/e-msg-composer-attachment-bar.c:551
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Adaug� anex�..."
 
-#: composer/e-msg-composer-attachment-bar.c:552
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "Anexeaz� un fi�ier la mesaj"
 
-#: 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 "Nu pot lua dosarul: %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 "Acesta nu este un fi�ier normal."
@@ -10626,11 +10804,15 @@ msgid "MIME type:"
 msgstr "Tip 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 "Sugerez afi�area automat� a anexei"
 
-#: 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 "Clic aici pentru agend�"
 
@@ -10641,45 +10823,45 @@ msgstr "Clic aici pentru agend�"
 #. * 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 "R�spunde la:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:411
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "De la:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Subiect:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "La:"
 
-#: composer/e-msg-composer-hdrs.c:432
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Introduce�i destinatarul mesajului"
 
-#: 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 "Introduce�i adresele care vor primi o copie a mesajului"
 
-#: 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."
@@ -10690,27 +10872,28 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:447
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "Port:"
 
-#: composer/e-msg-composer-hdrs.c:449
+#: composer/e-msg-composer-hdrs.c:549
 #, fuzzy
 msgid "Posting destination"
 msgstr "Descriere:"
 
-#: 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 "Anexeaz� un fisier"
 
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:533
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Nu pot crea un context pentru o semn�tur� PGP."
 
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10719,34 +10902,30 @@ msgstr ""
 "Eroare la citirea fi�ierului: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1160
-msgid "Warning!"
-msgstr "Avertisment!"
-
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Fi�ierul exist�, suprascriu?"
 
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Eroare la salvarea fi�ierului: %s"
 
-#: composer/e-msg-composer.c:1207
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Eroare la �nc�rcarea fi�ierului: %s"
 
-#: composer/e-msg-composer.c:1240
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Eroare la accesarea fi�ierului: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Nu pot primi mesajul de la editor"
 
-#: composer/e-msg-composer.c:1255
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10755,7 +10934,7 @@ msgstr ""
 "Nu pot c�uta �n fi�ierul: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10764,7 +10943,16 @@ msgstr ""
 "Nu pot trunchia fi�ierul: %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 ""
+"Nu pot c�uta �n fi�ierul: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10773,7 +10961,7 @@ msgstr ""
 "Eroare la salvarea automat� a mesajului: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1388
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -10782,7 +10970,7 @@ msgstr ""
 "Evolution a g�sit fi�iere nesalvate �ntr-o sesiune anterioar�.\n"
 "Dori�i s� �ncerc o restaurare?"
 
-#: composer/e-msg-composer.c:1525
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10792,35 +10980,40 @@ msgstr ""
 "Acest mesaj nu a fost trimis.\n"
 "Dori�i s� salva�i modific�rile?"
 
-#: 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 "Mesaje �naintate"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Deschide fi�ier"
 
-#: composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Signature:"
 msgstr "Salveaz� semn�tura"
 
-#: 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 "Compune un mesaj"
 
-#: 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"
@@ -10831,7 +11024,7 @@ msgstr ""
 "Nu pot crea fereastra de compunere pentru c� n-a�i configurat �nc�\n"
 "nici o identitate �n componen�a mailului."
 
-#: composer/e-msg-composer.c:2879
+#: composer/e-msg-composer.c:2991
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10840,25 +11033,12 @@ msgstr ""
 "Nu pot crea fereastra de compunere pentru c� n-a�i configurat �nc�\n"
 "nici o identitate �n componen�a mailului."
 
-#: 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 ""
-"Nu pot crea fereastra de compunere pentru c� n-a�i configurat �nc�\n"
-"nici o identitate �n componen�a mailului."
-
-#: composer/evolution-composer.c:408
-#, fuzzy
-msgid "Cannot initialize the Evolution composer."
-msgstr "Nu pot ini�ializa compozitorul Evolution."
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Suita de programe Evolution"
@@ -10916,8 +11096,111 @@ msgstr "Numele con�ine"
 msgid "Subject does not contain"
 msgstr "nu con�ine"
 
-#: 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 "Afar� din oficiu"
+
+#: designs/OOA/ooa.glade.h:5
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "Descriere:"
+
+#: 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 "Afar� din oficiu"
+
+#: designs/OOA/ooa.glade.h:13
+#, fuzzy
+msgid "Yes, Change Status"
+msgstr "Stare"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:2
+#, fuzzy
+msgid "<b>Receiving Email</b>"
+msgstr "Primesc email"
+
+#: designs/read_receipts/read.glade.h:3
+#, fuzzy
+msgid "<b>Sending Email:</b>"
+msgstr "Trimit 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 "Destinatari"
+
+#: 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?"
@@ -10925,224 +11208,250 @@ msgstr ""
 "Fi�ier al c�rui nume exist� deja.\n"
 "�l suprascrie�i?"
 
-#: e-util/e-passwords.c:363
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "Suprascrie�i fi�ierul?"
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Memorez aceast� parol�"
 
-#: 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 "Categorii"
 
 #. 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
 #, fuzzy
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%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 %m/%d/%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 %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
 #, fuzzy
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%a %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
 #, fuzzy
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%a %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
 #, fuzzy
 msgid "%m/%d/%Y %H:%M"
 msgstr "%a %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
 #, fuzzy
 msgid "%m/%d/%Y %I %p"
 msgstr "%a %m/%d/%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 "%m/%d/%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
 #, 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 "secunde"
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr "1 secund�"
 
-#: filter/filter-datespec.c:71
-msgid "minute"
-msgstr "minut"
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr "%d secunde"
 
-#: filter/filter-datespec.c:72
-msgid "hour"
-msgstr "or�"
+#: filter/filter-datespec.c:66
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 minut"
 
-#: filter/filter-datespec.c:74
-msgid "week"
-msgstr "s�pt�m�n�"
+#: filter/filter-datespec.c:66
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "%d minute"
 
-#: filter/filter-datespec.c:74 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "s�pt�m�ni"
+#: filter/filter-datespec.c:67
+#, fuzzy
+msgid "1 hour ago"
+msgstr "1 or�"
+
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d ore"
+
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "1 day ago"
+msgstr "1 zi"
+
+#: filter/filter-datespec.c:68
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr "%d zile"
 
-#: filter/filter-datespec.c:75
-msgid "month"
+#: filter/filter-datespec.c:69
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 s�pt�m�n�"
+
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d s�pt�m�ni"
+
+#: filter/filter-datespec.c:70
+#, fuzzy
+msgid "1 month ago"
 msgstr "lun�"
 
-#: filter/filter-datespec.c:75 filter/filter.glade.h:23
-msgid "months"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
 msgstr "luni"
 
-#: filter/filter-datespec.c:76
-msgid "year"
-msgstr "an"
+#: filter/filter-datespec.c:71
+msgid "1 year ago"
+msgstr ""
 
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
-msgid "years"
-msgstr "ani"
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr "%d secunde"
 
-#: filter/filter-datespec.c:174
+#: filter/filter-datespec.c:176
 #, fuzzy
 msgid "You must choose a date."
 msgstr "Oops. A�i uitat s� alege�i o dat�."
 
-#: filter/filter-datespec.c:269
+#: filter/filter-datespec.c:275
 msgid "<click here to select a date>"
 msgstr "<clic aici pentru a selecta o dat�>"
 
-#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
 msgid "now"
 msgstr "acum"
 
 #. 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 %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 "Selectez ora local�"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Reguli 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 "Nume stil:"
 
-#: 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 "Fi�ierul spool `%s' nu exist� sau nu e un fi�ier obi�nuit."
 
-#: filter/filter-file.c:307
+#: filter/filter-file.c:298
 #, fuzzy
 msgid "Choose a file"
 msgstr "Selectez o ac�iune"
 
 #. and now for the action area
-#: filter/filter-filter.c:513
+#: filter/filter-filter.c:491
 msgid "Then"
 msgstr "Atunci"
 
-#: filter/filter-filter.c:527
-msgid "Add action"
-msgstr "Adaug� ac�iune"
-
-#: 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 "Nume stil:"
 
-#: 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 "Alege dosar"
 
-#: filter/filter-input.c:200
+#: filter/filter-input.c:191
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -11151,79 +11460,77 @@ msgstr ""
 "Eroare �n expresia regulat� '%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 "Important"
 
 #. 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 "Lucrez"
 
 #. 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 "La"
 
 #. 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 "dup�"
 
-#: 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
 #, fuzzy
 msgid "You must name this filter."
 msgstr "Schimb� numele acestui dosar"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:751
 msgid "Rule name: "
 msgstr "Nume regul�:"
 
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:755
 msgid "Untitled"
 msgstr "F�r� titlu"
 
-#: filter/filter-rule.c:785
+#: filter/filter-rule.c:772
 msgid "If"
 msgstr "Dac�"
 
-#: filter/filter-rule.c:803
+#: filter/filter-rule.c:790
 msgid "Execute actions"
 msgstr "Execut� ac�iunile"
 
-#: filter/filter-rule.c:807
+#: filter/filter-rule.c:794
 msgid "if all criteria are met"
 msgstr "dac� toate criteriile sunt �ndeplinite"
 
-#: filter/filter-rule.c:812
+#: filter/filter-rule.c:799
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "dac� oricare criteriu e �ndeplinit"
 
-#: filter/filter-rule.c:823
-msgid "Add criterion"
-msgstr "Adaug� criteriu"
-
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "incoming"
 msgstr "intr�"
 
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "outgoing"
 msgstr "iese"
 
@@ -11275,7 +11582,7 @@ msgstr ""
 "Data mesajului va fi comparat� indiferent\n"
 "de ora specificat� aici."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr "Dosare virtuale"
 
@@ -11287,6 +11594,14 @@ msgstr "o or� relativ� la ora curent�"
 msgid "ago"
 msgstr ""
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "luni"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr "secunde"
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "numai dosare specifice"
@@ -11304,6 +11619,10 @@ msgstr "ora specificat�"
 msgid "vFolder Sources"
 msgstr "Surse dosare V"
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "s�pt�m�ni"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "cu toate dosarele distante active"
@@ -11316,6 +11635,10 @@ msgstr "cu toate dosarele locale �i distante active"
 msgid "with all local folders"
 msgstr "cu toate dosarele locale"
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "ani"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -11448,7 +11771,7 @@ msgstr "nu este"
 msgid "is not Flagged"
 msgstr "Marcat"
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 #, fuzzy
 msgid "Label"
 msgstr "eticheta26"
@@ -11479,7 +11802,7 @@ msgstr "Trimite mesaj la contact"
 msgid "Play Sound"
 msgstr "Red� sunetul:"
 
-#: 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 "Cite�te"
 
@@ -11510,12 +11833,12 @@ msgstr "e mai mare dec�t"
 msgid "returns less than"
 msgstr "e mai mic dec�t"
 
-#: 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 "Punctaj"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "Expeditor"
 
@@ -11552,8 +11875,9 @@ msgstr "�ncepe cu"
 msgid "Stop Processing"
 msgstr "Opresc procesarea"
 
-#: 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 "Subiect"
 
@@ -11562,55 +11886,69 @@ msgstr "Subiect"
 msgid "Unset Status"
 msgstr "Seteaz� starea"
 
-#: filter/rule-editor.c:180
-msgid "Rules"
-msgstr "Reguli"
-
-#: 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 "Reguli"
+
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Adaug� reguli"
 
-#: filter/rule-editor.c:388
+#: filter/rule-editor.c:372
 msgid "Edit Rule"
 msgstr "Editez reguli"
 
-#: filter/score-editor.c:130
+#: filter/rule-editor.c:689
+#, fuzzy
+msgid "Rule name"
+msgstr "Nume regul�:"
+
+#: filter/score-editor.c:114
 msgid "Score Rules"
 msgstr "Reguli de punctaj"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Schimb� numele acestui dosar"
 
-#: 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 "Surse dosare V"
+
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 #, fuzzy
 msgid "Evolution is importing your old Elm mail"
 msgstr "Component� Evolution pentru manipularea mailului."
 
 #: 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 "Se import�"
 
 #: 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 "se termin� cu"
 
 #: 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 ""
@@ -11618,18 +11956,20 @@ msgstr ""
 "Start %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
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Trimit \"%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 "Mail"
 
-#: 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?"
@@ -11637,7 +11977,7 @@ msgstr ""
 "Evolution a g�sit fi�iere de mail Elm.\n"
 "Dori�i s� le importa�i �n Evolution?"
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr ""
 
@@ -11649,12 +11989,12 @@ msgstr ""
 "Evolution a g�sit fi�iere fi�iere GnomeCard.\n"
 "Dori�i s� le importa�i �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 "_Prioritate:"
 
-#: 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"
@@ -11669,7 +12009,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"
@@ -11677,7 +12017,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"
@@ -11686,41 +12026,43 @@ 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 "Gunoi"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Fi�ier mail-uri locale %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 "Scanez dosarul IMAP"
 
-#: 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 �nceput:"
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Set�ri"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Editeaz� filtre"
 
-#: 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?"
@@ -11728,11 +12070,11 @@ msgstr ""
 "Evolution a g�sit fi�iere de mail Netscape.\n"
 "Dori�i s� le importa�i �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 ""
 
-#: 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?"
@@ -11740,430 +12082,419 @@ msgstr ""
 "Evolution a g�sit fi�iere de mail Pine.\n"
 "Dori�i s� le importa�i �n Evolution?"
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 #, fuzzy
 msgid "Pine"
 msgstr "Tip�re�te"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
 #, fuzzy
 msgid "Composer Preferences"
 msgstr "Preferin�e calendar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Procesator pentru compozitorul Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Procesator pentru componenta calendarului Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Procesator pentru compozitorul Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Procesator pentru compozitorul 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 "Procesator pentru compozitorul 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 "Creaz� sau editeaz� conturile de mail �i alte preferin�e"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Component� Evolution pentru manipularea mailului."
+#: 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 "Procesator pentru componenta de mail 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 "Compozitorul de mailuiri Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Componenta Evolution pentru sumarul activit��ilor."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Compozitorul de mailuiri Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Componenta Evolution pentru afi�area mailului."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Procesator pentru componenta de mail Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
-msgstr "Componenta Evolution pentru procesarea mailului."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Interfa�a de configurare mail"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
-msgstr "Procesator pentru compozitorul Evolution."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Componenta Evolution pentru afi�area mailului."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
-msgstr "Procesator pentru componenta sumar mail."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Procesator pentru componenta de mail Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Componenta Evolution pentru sumarul activit��ilor."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 #, fuzzy
 msgid "Font Preferences"
 msgstr "Modific� preferin�e"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Conturi"
 
-#: 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 "Preferin�e calendar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-msgid "Mail configuration interface"
-msgstr "Interfa�a de configurare mail"
-
-#: mail/component-factory.c:102
+#: mail/component-factory.c:116
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Dosar V �n lista de mail"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public Mail"
 msgstr "Public"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "Dosar V �n lista de mail"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "Dosare virtuale"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "Dosare virtuale"
 
-#: 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 "_Propriet��i..."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Modific� propriet��ile fi�ierului"
 
-#: 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 "Nu a�i setat o metod� de transport a mailului"
 
-#: 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 "Mesaje �naintate"
-
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Mesaj _mail"
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "Mesaj _mail"
 
-#: mail/component-factory.c:1041
+#: mail/component-factory.c:1061
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Compune un mesaj"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "New Message Post"
 msgstr "Mesaj"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "_Post Message"
 msgstr "Tip�re�te mesaj"
 
-#: mail/component-factory.c:1050
+#: mail/component-factory.c:1070
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Mesaj _mail"
 
-#: mail/component-factory.c:1078
-#, fuzzy
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Nu pot ini�ializa componenta mail Evolution."
-
-#: mail/component-factory.c:1087
-#, fuzzy
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Nu pot ini�ializa componenta mail Evolution."
-
-#: mail/component-factory.c:1093
-#, fuzzy
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Nu pot ini�ializa componenta mail Evolution."
-
-#: mail/component-factory.c:1334 mail/component-factory.c:1364
+#: mail/component-factory.c:1353
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conectare la server..."
 
-#: 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 "Propriet��i pentru \"%s\""
 
-#: mail/folder-browser-ui.c:473
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Propriet��i"
 
-#: 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 "Nu pot crea directorul temporar: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr "%d noi"
 
-#: 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 ascunse"
 
-#: 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 "�terse"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr "%d netrimise"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:801
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d netrimise"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1118
+#: mail/folder-browser.c:1182
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Creaz� dosar virtual din mesaj"
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "Doasr V pe _subiect"
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "Dosar V pe expeditor"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "Dosar V pe destinatari"
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "Dosar V �n lista de mail"
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "Filtru pe subiect"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "Filtru pe expeditor"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "Filtru pe destinatari"
 
-#: 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 "Filtru pe lista de mail"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "_Editeaz� ca mesaj nou..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "Ti_p�re�te"
 
-#: 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 "_R�spunde la expeditor"
 
-#: 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 "R�spunde la _list�"
 
-#: 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 "R�spunde la to�i"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "_�nainteaz�"
 
-#: 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 "Terminat"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1772
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "�terge"
 
 #. 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 "Marcheaz� ca citit"
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1777
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marchez ca necitit"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "Marcheaz� ca important"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1779
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcheaz� ca important"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1784
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Rec_upereaz�"
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1788
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Mut �n folderul..."
 
-#: 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 "_Copiaz� �n dosarul..."
 
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1797
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Adaug� expeditorul �n agend�"
 
-#: mail/folder-browser.c:1774
+#: mail/folder-browser.c:1801
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplic� filtre"
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1805
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Creaz� regul� din mesaj"
 
-#: mail/folder-browser.c:2036
+#: mail/folder-browser.c:2064
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Dosar V �n lista de mail"
 
-#: mail/folder-browser.c:2038
+#: mail/folder-browser.c:2066
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtru pe lista de mail (%s)"
 
-#: mail/folder-browser.c:2039
+#: mail/folder-browser.c:2067
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Dosar V pe lista de mail (%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 "Implicit"
 
-#: mail/folder-info.c:71
+#: mail/folder-info.c:70
 #, fuzzy
 msgid "Getting Folder Information"
 msgstr "Informa�ie op�ional�"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "Procesator pentru importul mbox �n Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Compozitorul de mailuiri Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Compozitorul de mailuiri 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 "Compozitorul de mailuiri Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Import fi�ierele mbox �n 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 "Procesator pentru importul mailurilor Outlook Express 4 �n 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 "Import fi�ierele Outlook Express 4 �n Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Compozitorul de mailuiri Evolution."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -12200,102 +12531,102 @@ 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 "Nu a�i completat toat� informa�ia cerut�."
 
 #. 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 "Editor de conturi 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 "Gazd�:"
 
-#: 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 "Nume utilizator:"
 
-#: 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 "Cale:"
 
-#: 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 "Sunte�i sigur c� dori�i s� �terge�i acest cont?"
 
-#: mail/mail-accounts.c:228
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "Nu �terge"
 
-#: mail/mail-accounts.c:231
-msgid "Really delete account?"
-msgstr "Chiar �terge�i acest cont?"
-
-#: 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 "Invalideaz�"
 
-#: 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 "Valideaz�"
 
-#: 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 "Implicit"
+
+#: 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 "Valideaz�"
 
-#: 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 "Management 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 "Mail la %s"
 
-#: mail/mail-autofilter.c:242
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Subiectul este %s"
 
-#: mail/mail-autofilter.c:258
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail de la %s"
 
-#: mail/mail-autofilter.c:275
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s lista de mail"
 
-#: mail/mail-autofilter.c:327
+#: mail/mail-autofilter.c:323
 msgid "Add Filter Rule"
 msgstr "Adaug� regul� de filtrare"
 
-#: 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"
@@ -12303,7 +12634,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 "Nu ar�ta acest mesaj din nou"
+
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -12315,7 +12651,16 @@ msgstr ""
 "trimite, primi sau compune mailuri.\n"
 "Dori�i s� face�i configurarea acum?"
 
-#: 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 ""
+"Trebuie s� configura�i o identitate\n"
+"�nainte de a putea compune mailuri."
+
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -12323,7 +12668,7 @@ msgstr ""
 "Trebuie s� configura�i o identitate\n"
 "�nainte de a putea compune mailuri."
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -12332,18 +12677,18 @@ msgstr ""
 "�nainte pentru a putea compune mailuri. "
 
 #. 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 "Trimite un email"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12351,18 +12696,18 @@ msgstr ""
 "Acest mesaj nu are subiect.\n"
 "Chiar trimite�i?"
 
-#: 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 "Mesajul con�ine numai cererile nesuportate."
 
-#: mail/mail-callbacks.c:364
+#: mail/mail-callbacks.c:322
 #, fuzzy
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -12374,11 +12719,11 @@ msgstr ""
 "ad�ugarea unui antet Aparent-la.\n"
 "Trimite�i oricum?"
 
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr "Trebuie s� specifica�i un destinatar pentru a trimite acest mesaj."
 
-#: 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?"
@@ -12386,29 +12731,29 @@ msgstr ""
 "Nu pot deschide dosarul cu ciorne pentru acest cont.\n"
 "Dori�i s� folosi�i dosarul cu ciorne implicit?"
 
-#: mail/mail-callbacks.c:1207
+#: mail/mail-callbacks.c:1187
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Eroare necunoscut�"
 
-#: 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 "Mut� mesaj(e) �n"
 
-#: 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 "Copiaz� mesaje(le) �n"
 
-#: mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Sunte�i sigur c� dori�i s� edita�i toate cele %d mesaje?"
 
-#: mail/mail-callbacks.c:2406
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12416,7 +12761,7 @@ msgstr ""
 "Pute�i numai s� edita�i mesajele\n"
 "salvate �n dosarul Ciorne"
 
-#: mail/mail-callbacks.c:2445
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12424,47 +12769,50 @@ msgstr ""
 "Pute�i numai s� retrimite�i mesajele\n"
 "din dosarul Trimise"
 
-#: mail/mail-callbacks.c:2459
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Sunte�i sigur c� dori�i s� retrimite�i toate cele %d mesaje?"
 
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "Nici un mesaj selectat"
 
-#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
-msgid "Overwrite file?"
-msgstr "Suprascrie�i fi�ierul?"
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"Nu pot lua mesajul: %s\n"
+"  %s"
 
-#: mail/mail-callbacks.c:2584
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Fi�ier al c�rui nume exist� deja.\n"
+"�l suprascrie�i?"
+
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "Salveaz� mesajul ca..."
 
-#: mail/mail-callbacks.c:2586
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "Salveaz� mesajele ca..."
 
-#: mail/mail-callbacks.c:2655
-#, fuzzy
-msgid "Go to next folder with unread messages?"
-msgstr "Afi�eaz� urm�torul mesaj necitit"
-
-#: 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"
@@ -12473,66 +12821,66 @@ msgstr ""
 "Eroare la �ncarcarea informa�iei de filtrare:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3030
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "_Filtre..."
 
-#: mail/mail-callbacks.c:3074
+#: mail/mail-callbacks.c:2831
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Primesc mesajul %d din %d"
 
-#: mail/mail-callbacks.c:3129
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "Tip�re�te mesaj"
 
-#: 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 "Tip�rirea mesajului nereu�it�"
 
-#: 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 ""
 "Sunte�i sigur c� dori�i s� deschide�itoate cele %d mesaje �n ferestre "
 "separate?"
 
-#: 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 "Contact schimbat:"
 
-#: 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 "Descriere:"
+msgid "You must specify a valid script name."
+msgstr "Nume stil:"
 
-#: 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 "Descriere:"
 
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
+#: mail/mail-composer-prefs.c:864
 #, fuzzy
-msgid "Unnamed"
-msgstr "Contact schimbat:"
+msgid "Language(s)"
+msgstr "Limbaj"
 
-#: mail/mail-composer-prefs.c:875
+#: mail/mail-composer-prefs.c:906
 #, fuzzy
 msgid "Add script signature"
 msgstr "Adaug� criteriu"
 
-#: mail/mail-composer-prefs.c:876
+#: mail/mail-composer-prefs.c:926
 #, fuzzy
-msgid "Add Signature"
-msgstr "Salveaz� semn�tura"
+msgid "Signature(s)"
+msgstr "Semn�tur� HTML:"
+
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr "Identitate"
 
-#: 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 "
@@ -12543,7 +12891,12 @@ msgstr ""
 "\"de mai jos nu e necesar s� le completa�i dec�t dac� dori�i s� include�i "
 "aceast� informa�ie �n emailul pe care-l trimite�i"
 
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "Primesc mail"
+
+#: mail/mail-config-druid.c:390
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -12553,11 +12906,16 @@ msgstr ""
 "Dac� nu �ti�i ce fel de server folosi�i, contacta�i administratorul "
 "dumneavoastr� de sistem sau furnizorul de serviciu Internet."
 
-#: 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 "Trimit mail"
+
+#: mail/mail-config-druid.c:402
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -12567,7 +12925,11 @@ msgstr ""
 "Dac� nu �ti�i ce protocol folosi�i, contacta�i administratorul dumneavostr� "
 "de sistem sau furnizorul de serviciu Internet."
 
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "Management cont"
+
+#: mail/mail-config-druid.c:409
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -12582,159 +12944,141 @@ msgstr ""
 "rog introduce�i mai jos un nume pentru acest cont. Acest nume va fi folosit "
 "doar pentru afi�are."
 
-#. set window title
-#: mail/mail-config-druid.c:637
-#, fuzzy
-msgid "Evolution Account Assistant"
-msgstr "Asistentul de conturi 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
 msgid "Connecting to server..."
 msgstr "Conectare la server..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid " _Check for supported types "
 msgstr "Verific tipurile suportate"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "Semnarea e nesuportat� de acest cifru"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Semnarea e nesuportat� de acest cifru"
 
-#: 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
 msgid "Account Information"
 msgstr "Informa�ie cont"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "Management cont"
-
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Adaug� criteriu"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Salveaz� semn�tura"
 
-#: 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 "Anexeaz� un fi�ier la mesaj"
 
-#: 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 "Anex�"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentificare"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Verific� automat dac� sunt mailuri noi la fiecare"
 
-#: 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 "Set de caractere necunoscut: %s"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "C_olors"
 msgstr "�nchide"
 
-#: 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 "Verific mailurile noi"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Culoare pentru sarcinile de ast�zi"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Compune un mesaj"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Configuration"
 msgstr "Configurare mail"
 
-#: 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 ""
 "Felicit�ri, configurarea mailului dumneavoastr� e complet�.\n"
 "\n"
@@ -12744,310 +13088,308 @@ msgstr ""
 "\n"
 "Clic \"Terminare\" pentru a salva set�rile"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Setul de caractere implicit: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Primesc mail"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digital IDs..."
 msgstr "ID-uri digitale..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Nu pot deschide mesajul"
 
-#: 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 "Gata"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Dosar ciorne:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "E_nable"
 msgstr "Valideaz�"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Emacs"
 msgstr "Est"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Email-ul con�ine"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Email _address:"
 msgstr "Adresa email:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Gole�te dosarul cu reziduuri la ie�ire"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Evolution Account Assistant"
+msgstr "Asistentul de conturi Evolution"
+
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Execut� ac�iunile"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "se termin� cu"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propriet��i"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Mesaje �naintate"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr "Ia ID digital..."
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Ilumineaz� citatele cu "
 
-#: 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 "Identitate"
-
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "�n linie"
 
-#: 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 "Salveaz� �i �nchide"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "�ncarc� _imaginile"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Loca�ie c�su�� po�tal�"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Antet mesaj"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "Afi�eaz� mesaj"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Numele con�ine"
+
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Microsoft"
 msgstr "Cea��"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configurare 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 "Informa�ie op�ional�"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_za�ie:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID cheie PGP:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Alege o culoare"
 
-#: 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 "�ntreab�-m� c�nd trimit mesaje f�r� subiect"
 
-#: 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 "Tip�re�te contactele selectate"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr "Maildir Qmail "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Quote original message"
 msgstr "Nu pot deschide mesajul"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr "Cotat"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Memorez aceast� parol�"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "R�spunde la:"
 
-#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr "Primesc email"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Op�iuni primire"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Memorez aceast� parol�"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "Informa�ie cerut�"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Securitate"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME securizat"
 
-#: 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 "Trimit email"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Dosar mesaje trimise:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "Trimite �i mesajele ciorn�"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Serverul necesit� _autentificare"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Configurare server"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Tip server:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Scurt�turi"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nume stil:"
 
-#: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
-msgstr ""
-
 #: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr ""
@@ -13086,7 +13428,7 @@ msgstr "Variabil"
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Next\" to begin. "
+"Click \"Forward\" to begin. "
 msgstr ""
 "Bine a�i venit la configurarea Mail Druid a Evolution.\n"
 "\n"
@@ -13165,123 +13507,128 @@ msgid "_Enable"
 msgstr "Valideaz�"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr ""
-
-#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Forward style:"
 msgstr "�nainteaz� ca"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nume complet:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "�n mailuri HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitate"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "�ncarc� imaginile dac� expeditorul e �n agend�"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "F� contul acesta contul meu implicit"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Marcheaz� mesajele ca \"Citit\" dup�"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Name:"
 msgstr "Nume:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Never load images off the net"
 msgstr "Nu �nc�rca niciodat� imaginile neconectat"
 
-#: 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 "�ntreab�-m� c�nd trimit mesaje f�r� subiect"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "�ntreab�-m� c�nd trimit mesaje f�r� subiect"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Primesc mail"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Reply style:"
 msgstr "R�spunde la to�i"
 
-#: 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 "_Securitate"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Trimit mail"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Ploaie toren�ial�"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "Semn�tur� HTML:"
 
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "Mbox Unix standard"
+
 #: mail/mail-config.glade.h:175
 #, fuzzy
-msgid "_Use secure connection (SSL):"
-msgstr "Folose�te conectare securizat� (SSL)"
+msgid "_Terminal Font:"
+msgstr "Contact original:"
 
 #: mail/mail-config.glade.h:176
 #, fuzzy
-msgid "_Variable-width:"
-msgstr "Variabil"
+msgid "_Use secure connection (SSL):"
+msgstr "Folose�te conectare securizat� (SSL)"
 
 #: 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 "Fiecare"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "color"
 msgstr " culoare"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "description"
 msgstr "Descriere:"
@@ -13306,189 +13653,191 @@ msgstr "Nu pot crea un context pentru anvelopa S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nu pot crea contextul pentru decodarea S/MIME."
 
-#: mail/mail-display.c:321
+#: mail/mail-display.c:193
+#, fuzzy, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Fi�ier al c�rui nume exist� deja.\n"
+"�l suprascrie�i?"
+
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Salveaz� anexa"
 
-#: mail/mail-display.c:386
+#: mail/mail-display.c:406
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Nu pot crea temporar mbox `%s': %s"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:454
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Salveaz� anexa"
 
-#: mail/mail-display.c:433
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr "Vedere inline"
 
-#: mail/mail-display.c:434
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "Deschide �n %s..."
 
-#: mail/mail-display.c:494
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vedere inline (via %s)"
 
-#: mail/mail-display.c:498
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "Ascund"
 
-#: mail/mail-display.c:519
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "Vizualizator extern"
 
-#: mail/mail-display.c:1319
+#: mail/mail-display.c:1365
 #, fuzzy
 msgid "Downloading images"
 msgstr "�ncarc� _imaginile"
 
-#: mail/mail-display.c:1496
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "�ncarc con�inut mesaj"
 
-#: mail/mail-display.c:1783
+#: mail/mail-display.c:1879
 #, fuzzy
 msgid "Overdue:"
 msgstr "Termen dep�it"
 
-#: 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 "Deschide leg�tura �n navigator"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Copiaz� leg�tura c�tre loca�ia"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Salveaz� leg�tura ca (FIXME)"
 
-#: mail/mail-display.c:2119
+#: mail/mail-display.c:2245
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Salveaz� imaginea ca..."
 
-#: mail/mail-folder-cache.c:743
+#: mail/mail-folder-cache.c:744
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Trimit \"%s\""
 
-#: mail/mail-format.c:656
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr "%s anex�"
 
-#: 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 "Nu pot parsa mesajul MIME. Afi�ez ca surs�."
 
-#: 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
 #, fuzzy
 msgid "Bad Address"
 msgstr "Adresa email:"
 
-#: 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 "De la"
 
-#: mail/mail-format.c:917
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "R�spuns-la:"
 
-#: 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 "La"
 
-#: mail/mail-format.c:927
+#: mail/mail-format.c:900
 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 ""
-"\n"
-"Program de mail:"
-
-#: mail/mail-format.c:1848
+#: mail/mail-format.c:1451
 #, fuzzy
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr "Acest mesaj este semnat digital �i este autentic."
 
-#: mail/mail-format.c:1875
+#: mail/mail-format.c:1479
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nu pot crea un context pentru o verificare PGP."
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Acest mesaj este semnat digital �i este autentic."
 
-#: 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 "Acest mesaj este semnat digital dar nu se poate dovedi c� e autentic."
 
-#: mail/mail-format.c:2157
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Indicator c�tre site-ul 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 "Indicator c�tre fi�ierul local (%s) valid pe site-ul \"%s\""
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Indicator c�tre fi�ierul local (%s)"
 
-#: mail/mail-format.c:2205
+#: mail/mail-format.c:1799
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Indicator c�tre site-ul FTP (%s)"
 
-#: mail/mail-format.c:2213
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Indicator c�tre o dat� extern� necunoscut� (tip \"%s\")"
 
-#: mail/mail-format.c:2218
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr "Corpul extern al mesajului par�ial deformat."
 
-#: 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 "Dosare speciale"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr "Reconfigurez dosarul"
 
-#: 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"
@@ -13497,12 +13846,12 @@ msgstr ""
 "Nu pot salva informa�ia meta a dosarului; probabil c� nu ve�i mai putea\n"
 "deschide acest dosar: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:804
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
@@ -13514,7 +13863,7 @@ msgstr ""
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Schimb dosarul \"%s\" �n formatul \"%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."
@@ -13522,12 +13871,12 @@ msgstr ""
 "Dac� nu o s� pute�i deschide aceast� c�su�� po�tal�, atunci\n"
 "probabil va trebui s� o repara�i manual."
 
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigureaz� %s"
 
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "Nu pute�i copia mesaje din acest dosar"
@@ -13550,110 +13899,110 @@ msgstr ""
 "Eroare �n timpul opera�iei:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Lucrez"
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Actualizez dosarul"
 
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:264
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "Primesc mail"
 
-#: 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 "Trimit \"%s\""
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Trimit mesajul %d din %d"
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "E�ec la mesajul %d din %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 "Terminat"
 
-#: mail/mail-ops.c:853
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Salvez mesaj �n dosar"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mut mesajele �n %s"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiez mesajele �n %s"
 
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanez dosarele �n \"%s\""
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Mesaje �naintate"
 
-#: mail/mail-ops.c:1277
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Deschid dosarul %s"
 
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "Deschid rezerva %s"
 
-#: mail/mail-ops.c:1422
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "�terg dosarul %s"
 
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1507
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creez dosar nou"
 
-#: mail/mail-ops.c:1567
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Actualizez dosarul"
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1594
 msgid "Expunging folder"
 msgstr "Distrug dosarul"
 
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Primesc mesajul %s"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1715
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Primesc mesaje"
 
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1801
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvez mesajele"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13662,7 +14011,7 @@ msgstr ""
 "Nu pot crea fi�ierul de ie�ire: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13671,11 +14020,11 @@ msgstr ""
 "Eroare la salvarea mesajului: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "Salvez anexa"
 
-#: mail/mail-ops.c:2041
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13684,56 +14033,56 @@ msgstr ""
 "Nu pot crea fi�ierul de ie�ire: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2071
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nu pot scrie data: %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Deconectare de la %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Deconectare de la %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "_Caut�"
-
-#: mail/mail-search.c:137
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(Mesaj f�r� titlu)"
 
-#: mail/mail-search.c:240
+#: mail/mail-search.c:232
 #, fuzzy
 msgid "Untitled Message"
 msgstr "(Mesaj f�r� titlu)"
 
-#: mail/mail-search.c:244
+#: mail/mail-search.c:234
 #, fuzzy
 msgid "Empty Message"
 msgstr "Mesaj"
 
-#: mail/mail-search.c:291
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "G�se�te �n mesaj"
 
-#: mail/mail-search.c:321
+#: mail/mail-search.c:285
+msgid "Search"
+msgstr "Caut�"
+
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr "Caut� �nainte"
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "G�se�te:"
 
-#: mail/mail-search.c:346
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "Potriviri:"
 
@@ -13741,74 +14090,70 @@ msgstr "Potriviri:"
 msgid "Cancelling..."
 msgstr "Renun�..."
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Tip: %s"
 
-#: 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 "Tip:"
 
-#: mail/mail-send-recv.c:293
+#: mail/mail-send-recv.c:297
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Trimite & Prime�te mailul"
 
-#: mail/mail-send-recv.c:295
+#: mail/mail-send-recv.c:299
 #, fuzzy
 msgid "Cancel All"
 msgstr "Renun��"
 
-#: mail/mail-send-recv.c:355
+#: mail/mail-send-recv.c:378
 msgid "Updating..."
 msgstr "Actualizez..."
 
-#: 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 "A�tept..."
 
-#: mail/mail-session.c:221
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr "Opera�ie anulat� de utilizator."
 
-#: mail/mail-session.c:272
-#, fuzzy
-msgid "_Remember this password"
-msgstr "Memorez aceast� parol�"
-
-#: 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 "Introduce�i parola pentru %s"
 
-#: mail/mail-session.c:333
+#: mail/mail-session.c:260
 #, fuzzy
 msgid "Enter Password"
 msgstr "Introduce�i parola pentru %s"
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-session.c:280
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Memorez aceast� parol�"
+
+#: 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 ""
 "Nu pot deschde fi�ierul semn�tur� %s:\n"
 "%s"
 
-#: mail/mail-signature-editor.c:175
-msgid "Save signature"
-msgstr "Salveaz� semn�tura"
-
-#: 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"
@@ -13817,46 +14162,54 @@ msgstr ""
 "Aceast� semn�tur� a fost modificat�, dar n-a fost salvat�.\n"
 "Dori�i s� salva�i modific�rile?"
 
-#: 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 "Salveaz� semn�tura"
+
+#: mail/mail-signature-editor.c:389
 #, fuzzy
 msgid "Edit signature"
 msgstr "Adaug� criteriu"
 
-#: mail/mail-signature-editor.c:372
+#: mail/mail-signature-editor.c:429
 #, fuzzy
 msgid "Enter a name for this signature."
 msgstr "Semn�tur� 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 "Nume:"
 
-#: mail/mail-tools.c:262
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mesaj �naintat - %s"
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:271
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Mesaje �naintate"
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:431
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Mesaje �naintate"
 
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:92
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Creez dosar nou"
 
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:210
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Scanez dosarele �n \"%s\""
 
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13865,100 +14218,100 @@ 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 "Dosare V"
 
-#: mail/mail-vfolder.c:819
+#: mail/mail-vfolder.c:835
 #, fuzzy
 msgid "vFolders"
 msgstr "Dosare"
 
-#: mail/mail-vfolder.c:861
+#: mail/mail-vfolder.c:874
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editeaz� dosare 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 ""
 
-#: mail/mail-vfolder.c:931
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Dosar V Nou"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:224
 #, fuzzy
 msgid "(No subject)"
 msgstr "�naintat: (f�r� subiect)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:226
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "Mesaj"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:740
 msgid "Unseen"
 msgstr "Nev�zut"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:741
 msgid "Seen"
 msgstr "V�zut"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr "R�spuns"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:743
 msgid "Multiple Unseen Messages"
 msgstr "Mesaje nev�zute multiple"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:744
 msgid "Multiple Messages"
 msgstr "Mesaje multiple"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:748
 msgid "Lowest"
 msgstr "Cea mai sc�zut�"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:749
 msgid "Lower"
 msgstr "Mai sc�zut�"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:753
 msgid "Higher"
 msgstr "Mai mare"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:754
 msgid "Highest"
 msgstr "Cea mai mare"
 
-#: 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 "Ast�zi %l:%M %p"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %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
 #, fuzzy
 msgid "Generating message list"
 msgstr "Salvez mesajele"
@@ -13993,47 +14346,47 @@ msgstr "Primit"
 msgid "Size"
 msgstr "M�rime"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:62
 #, fuzzy
 msgid "Call"
 msgstr "Rechemare"
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Mergi �nainte �n timp"
 
-#: 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 "Informa�ie surs�"
 
-#: 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 "�nainteaz�"
 
-#: 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 "R�spunde"
 
-#: 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 "R�spunde la to�i"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:71
 #, fuzzy
 msgid "Review"
 msgstr "Previzualizare"
 
-#: 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 ""
 
@@ -14063,55 +14416,45 @@ msgstr "_Data scadent�:"
 msgid "_Flag:"
 msgstr "Nume fi�ier:"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Scanez dosarele �n \"%s\""
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, fuzzy, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Scanez dosarele �n \"%s\""
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonare la dosarul \"%s\""
 
-#: mail/subscribe-dialog.c:338
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Dezabonare de la dosarul \"%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 "Dosar"
 
-#: mail/subscribe-dialog.c:1450
+#: mail/subscribe-dialog.c:1389
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Salveaz� �n dosar..."
 
-#: mail/subscribe-dialog.c:1557
+#: mail/subscribe-dialog.c:1503
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Acest eveniment a fost �ters."
 
-#: 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 "Toate dosarele:"
-
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "Apri file"
-msgstr "Aprilie"
-
 #: 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
@@ -14122,68 +14465,49 @@ msgid "Close"
 msgstr "�nchide"
 
 #: mail/subscribe-dialog.glade.h:4
-#, fuzzy
-msgid "Display Options"
-msgstr "Afi�eaz� sta�iile:"
-
-#: mail/subscribe-dialog.glade.h:5
-msgid "Folders whose names begin with:"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:6
 msgid "Manage Subscriptions"
 msgstr "Administrare abon�ri"
 
-#: 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 "Re�mprosp�teaz� lista"
 
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:6
 #, fuzzy
 msgid "S_elect server: "
 msgstr "Selecteaz� tot"
 
-#: mail/subscribe-dialog.glade.h:9
-#, fuzzy
-msgid "Salve file"
-msgstr "Selecteaz� un fi�ier"
-
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:7
 #, fuzzy
 msgid "_Subscribe"
 msgstr "Aboneaz�"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:8
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "Dezaboneaz�"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for the Evolution Summary."
-msgstr "Componenta Evolution pentru sumarul activit��ilor."
-
-#: 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 "Componenta Evolution pentru sumarul activit��ilor."
 
-#: 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 "Compozitorul de mailuiri 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 "Procesator pentru componenta de mail Evolution."
+msgid "Evolution Summary component"
+msgstr "Compozitorul de mailuiri 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 "Procesator pentru componenta sumar a activit��ilor."
+msgid "Evolution Summary configuration control"
+msgstr "Procesator pentru componenta de mail 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 "Preferin�e calendar"
@@ -17907,7 +18231,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 "Grindin�"
 
@@ -19727,6466 +20051,6455 @@ msgid "Marion-Wytheville"
 msgstr ""
 
 #: my-evolution/Locations.h:1325
-#, fuzzy
-msgid "Marquette"
-msgstr "Mai"
-
-#: 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 "Martie"
 
-#: 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 "Mai"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "Marchez ca necitit"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Martinsburg"
 msgstr "Margini"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsville"
 msgstr "Margini"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Maryland"
 msgstr "Corean"
 
-#: 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 "Martie"
 
-#: 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 "Culori"
 
-#: 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
 #, fuzzy
 msgid "Mayaguez"
 msgstr "Manager"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayport"
 msgstr "Mai"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mazatlan"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mazu"
 msgstr "Martie"
 
-#: 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 "Tot"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 #, fuzzy
 msgid "McCall"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCarthy"
 msgstr "Martie"
 
-#: 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
 #, fuzzy
 msgid "Meacham"
 msgstr "Martie"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Medford"
 msgstr "�nainte"
 
-#: 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
 #, fuzzy
 msgid "Melfa"
 msgstr "Mail"
 
-#: 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 "Luni"
 
-#: 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 "Vineri"
 
-#: 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 "C�mpul De la"
 
-#: 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 "Mail"
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 #, fuzzy
 msgid "Miami"
 msgstr "Mail"
 
-#: 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 "Ini�iala tat�lui:"
 
-#: 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 "Ini�iala tat�lui:"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Midland"
 msgstr "Finlanda"
 
-#: 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 "Tip fi�ier:"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Milford"
 msgstr "pentru"
 
-#: 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 "Mail la %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 ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 #, fuzzy
 msgid "Minchumina"
 msgstr "intr�"
 
-#: 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 "minute"
 
-#: 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 "nu este"
 
-#: 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 "D-ra."
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 #, fuzzy
 msgid "Missouri"
 msgstr "D-ra."
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 #, fuzzy
 msgid "Mitchell"
 msgstr "Potriviri:"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 msgid "Mitilini"
 msgstr "Lista de mail"
 
-#: 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 "Telefon mobil"
 
-#: 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 "Mobil"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Modesto"
 msgstr "Negur� moderat�"
 
-#: 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 "Mut�"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Molde"
 msgstr "Mobil"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Moldova"
 msgstr "Luni"
 
-#: 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 "Mail"
 
-#: 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 "Luni"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Moncton"
 msgstr "Luni"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Monida"
 msgstr "Luni"
 
-#: 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 "Luni"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Montague"
 msgstr "Manager"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montana"
 msgstr "con�ine"
 
-#: 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 "Ninsoare moderat�"
 
-#: 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 "Afi�are lun�"
 
-#: 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 "Luna"
 
-#: 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 "Luni"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Montpelier"
 msgstr "Afi�are lun�"
 
-#: 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 "Fonturi"
 
-#: 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 "Corean"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morgantown"
 msgstr "Organiza�ie"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Moriarty"
 msgstr "Principal"
 
-#: 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 "Mobil"
 
-#: 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 "Afi�are lun�"
 
-#: 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 "Sud Est"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "Afi�are lun�"
 
-#: 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
 #, fuzzy
 msgid "Muncie"
 msgstr "Iunie"
 
-#: 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 "August"
 
-#: 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 "minute"
 
-#: 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
 #, fuzzy
 msgid "Mykonos"
 msgstr "Fonturi"
 
-#: 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 "Nume"
 
-#: 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 "Avertisment"
 
-#: 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 "Japonez"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Naples"
 msgstr "Nume"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Napoli"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Narvik"
 msgstr "Porecl�"
 
-#: 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 "Mail"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natchez"
 msgstr "Potriviri:"
 
-#: 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 "Sarcin� nou�"
 
-#: 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 "Canada"
 
-#: 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 "Canada"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 #, fuzzy
 msgid "Newark"
 msgstr "Sarcin� nou�"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "New Bedford"
 msgstr "Dosar _nou"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bern"
 msgstr "_Eveniment nou"
 
-#: 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 "�tiri"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "Mail nou"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "Newfoundland"
 msgstr "Mail nou"
 
-#: 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 "_Eveniment nou"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Iberia"
 msgstr "Contact nou"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Jersey"
 msgstr "Mesaj nou"
 
-#: 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 "Selec_teaz� �nl�n�uirea"
 
-#: 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 "Nord"
 
-#: 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 "_Eveniment nou"
 
-#: 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 "Dosar V Nou"
 
-#: 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 "Dimensiuni:"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nipawin"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nis"
 msgstr "este"
 
-#: 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 "Nume"
 
-#: 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 "Lucrez"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "North Adams"
 msgstr "Nord Est"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Bend"
 msgstr "Nord"
 
-#: 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 "Acum"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Dakota"
 msgstr "Nord Est"
 
-#: 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 "Nord Est"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "Northway"
 msgstr "Acum"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "Nord Vest"
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 #, fuzzy
 msgid "Norwich"
 msgstr "Nord"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwood"
 msgstr "Acum"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Notodden"
 msgstr "Not�"
 
-#: 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 "Nepornit"
 
-#: 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 "Finlanda"
 
-#: 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 "Mail"
 
-#: 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 "Unu"
 
-#: 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 "Deschide"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Ogden"
 msgstr "Deschide"
 
-#: 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 "Alte"
 
-#: 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 "Alte"
 
-#: 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 "Ok"
 
-#: 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 "Ok"
 
-#: 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 "Orientare"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Oostende"
 msgstr "Participare"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Oran"
 msgstr "Renun��"
 
-#: 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 "Org"
 
-#: 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 "Org"
 
-#: 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 "Corean"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orlando"
 msgstr "Corean"
 
-#: 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 "Eroare"
 
-#: 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 "secund�"
 
-#: 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 "s�pt�m�n�"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Oxford"
 msgstr "pentru"
 
-#: 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 "Pagin�"
 
-#: 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 "Pager"
 
-#: 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 "Set�ri _mail..."
 
-#: 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 "Fum"
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 #, fuzzy
 msgid "Panama City"
 msgstr "Canada"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Pantelleria"
 msgstr "Revocat"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Papa"
 msgstr "Japonez"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Paphos"
 msgstr "Cea mai sc�zut�"
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 #, fuzzy
 msgid "Paris"
 msgstr "Margini"
 
-#: 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 "Cea�� par�ial�"
 
-#: 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 "Parola"
 
-#: 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 "Canada"
 
-#: 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 "Red� sunetul:"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Payson"
 msgstr "Red� sunetul:"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Pellston"
 msgstr "�ntrebare"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pelotas"
 msgstr "Re�ncarc�"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pendleton"
 msgstr "Selec�ie"
 
-#: 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 "Principal"
 
-#: 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 "H�rtie"
 
-#: 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 "H�rtie"
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 #, fuzzy
 msgid "Perugia"
 msgstr "H�rtie"
 
-#: 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 "H�rtie"
 
-#: 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 "Previzualizare"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 #, fuzzy
 msgid "Pine Bluff"
 msgstr "Mail Pine"
 
-#: 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 "Lipe�te"
 
-#: 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 "lun�"
 
-#: 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 "Tip�re�te plic"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Lay"
 msgstr "Rezumat"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Mugu"
 msgstr "Tip�re�te mesaj"
 
-#: 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 "Propriet��i"
 
-#: 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 "Lista de telefoane"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 #, fuzzy
 msgid "Ponce"
 msgstr "Inexistent"
 
-#: 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 "Contacte"
 
-#: 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 "Finlanda"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Port Alexander"
 msgstr "Tip�re�te calendar"
 
-#: 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 "Tip�re�te plic"
 
-#: 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 "Previzualizare"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Port Hardy"
 msgstr "Tip�re�te calendar"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hedland"
 msgstr "Finlanda"
 
-#: 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 "Finlanda"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Porto"
 msgstr "Port:"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "�n desf�urare"
 
-#: 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 "Finlanda"
 
-#: 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 "Finlanda"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Praha"
 msgstr "Gunoi"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 #, fuzzy
 msgid "Pratica di Mare"
 msgstr "Burni�� par�ial"
 
-#: 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 "Previzualizeaz� tip�rirea"
 
-#: 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 "Portret"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Preveza"
 msgstr "Prev"
 
-#: 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 "Tradi�ional"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Providence"
 msgstr "_Stat/Provincie"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Provincetown"
 msgstr "Previzualizare"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provo"
 msgstr "Prev"
 
-#: 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 "Public"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Pueblo"
 msgstr "Public"
 
-#: 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 "�ntrebare"
 
-#: 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 "Rezumat"
 
-#: 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 "Finlanda"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pullman"
 msgstr "Finlanda"
 
-#: 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 "Tip�re�te calendar"
 
-#: 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 "�ntrebare"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quebec"
 msgstr "Subiect"
 
-#: 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 "R�spuns la"
 
-#: 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 "Ploaie"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 msgid "Reading"
 msgstr "Titluri"
 
-#: 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 "Primit"
 
-#: 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 "Titluri"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redig"
 msgstr "Cite�te"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redmond"
 msgstr "Repetare"
 
-#: 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 "Regiuni"
 
-#: 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 "Memorator"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Reno"
 msgstr "Repetare"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Renton"
 msgstr "Regiuni"
 
-#: 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 "Reguli"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reyes"
 msgstr "ani"
 
-#: 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 "Re�ncarc�"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Rhinelander"
 msgstr "Finlanda"
 
-#: 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 "Porecl�"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rieti"
 msgstr "Grindin�"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rifle"
 msgstr "Rol"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rijeka"
 msgstr "Cite�te"
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rimini"
 msgstr "Ploaie"
 
-#: 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
 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 "Mai mare"
 
-#: 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 "Tip�re�te"
 
-#: 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 "Cite�te"
 
-#: 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 "Ploaie"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Robore"
 msgstr "�nainte"
 
-#: 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 "Finlanda"
 
-#: 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 "Repetare"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rogers"
 msgstr "Dosare"
 
-#: 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 "Culori"
 
-#: 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 "Rol"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Rost"
 msgstr "Gazd�"
 
-#: 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 "Revenire"
 
-#: 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 "August"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1929
 #, fuzzy
 msgid "Rutland"
 msgstr "Finlanda"
 
-#: 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 "Ploaie"
 
-#: 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 "Tip�re�te calendar"
 
-#: 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 "Ploaie"
 
-#: 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 "Salveaz�"
 
-#: 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 "Fum"
 
-#: 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 "Mail"
 
-#: 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 "S�m"
 
-#: 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 "Fum"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samos"
 msgstr "Fum"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samsun"
 msgstr "Dum"
 
-#: 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 "Salveaz� �i �nchide"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "Sandane"
 msgstr "Dum"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandberg"
 msgstr "Expeditor"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sanderson"
 msgstr "Expeditor"
 
-#: 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 "pentru"
 
-#: 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 "Umbrire"
 
-#: 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 "Salveaz� �i �nchide"
 
-#: 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 "Dum"
 
-#: 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 "Expeditor"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santarem"
 msgstr "dup�"
 
-#: 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
 #, fuzzy
 msgid "Santorini"
 msgstr "Lapovi�� �i ninsoare"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2019
 #, fuzzy
 msgid "Santos"
 msgstr "Stare"
 
-#: 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 "Fum"
 
-#: 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 "Finlanda"
 
-#: 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 "Dum"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Scatsta"
 msgstr "Stare"
 
-#: 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 "Organiza�ie"
 
-#: 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 "Set�ri"
 
-#: 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 "V�zut"
 
-#: 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 �nceput:"
 
-#: 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 "Caut�"
 
-#: 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 "Umbrire"
 
-#: 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 "Caut�"
 
-#: 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 "S�mb�t�"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Shawbury"
 msgstr "S�mb�t�"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shearwater"
 msgstr "Data �nceput"
 
-#: 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 "V�zut"
 
-#: 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 "Selec�ie"
 
-#: 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 "Dum"
 
-#: 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�rime"
 
-#: 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 "Punctaj"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Show Low"
 msgstr "Ninsoare superficial�"
 
-#: 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 "Tip�re�te"
 
-#: 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 "Securitate"
 
-#: 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 "M�rime"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skopje"
 msgstr "Stop"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skwentna"
 msgstr "Trimis"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Slana"
 msgstr "Fum"
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2102
 #, fuzzy
 msgid "Smithers"
 msgstr "minute"
 
-#: 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 "Avers� de z�pad�"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2105
 #, fuzzy
 msgid "Sochi"
 msgstr "Sud"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Socorro"
 msgstr "Punctaj"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Socotra"
 msgstr "Punctaj"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2108
 #, fuzzy
 msgid "Soda Springs"
 msgstr "Lapovi�� �i ninsoare"
 
-#: 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 "Ploaie toren�ial�"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Sonderborg"
 msgstr "Expeditor"
 
-#: 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 "Sud Est"
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "South Bend"
 msgstr "Sud"
 
-#: 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 "Sud Est"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "Southend"
 msgstr "Sud"
 
-#: 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 "Expeditor"
 
-#: 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 "Cea��"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Spokane"
 msgstr "Ploaie"
 
-#: 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 "Simplificat"
 
-#: 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 "�nt�lnire �ncheiat�:"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "Stauning"
 msgstr "Set�ri"
 
-#: 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 "Set�ri"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Stavropol"
 msgstr "Stop"
 
-#: 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 "Program"
 
-#: 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
 #, fuzzy
 msgid "St Joseph"
 msgstr "Stop"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Louis"
 msgstr "Opre�te �nc�rcarea"
 
-#: 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 "Data �nceput"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Stornoway"
 msgstr "Acum"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "St Paul"
 msgstr "Stare"
 
-#: 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 "Subarbore"
 
-#: 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 "S�mb�t�"
 
-#: 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 "Punctaj"
 
-#: 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 "Rezumat"
 
-#: 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 "Dum"
 
-#: 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 "Tradi�ional"
 
-#: 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 "Sarcin�"
 
-#: 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 "Martie"
 
-#: 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 "Atunci"
 
-#: 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 "Ploaie"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Tainan"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2203
 #, fuzzy
 msgid "Taiyuan"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiz"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Tajima"
 msgstr "Ploaie"
 
-#: 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 "Ploaie"
 
-#: 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 "Japonez"
 
-#: 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 "H�rtie"
 
-#: 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 "Canada"
 
-#: 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 "Cea mai sc�zut�"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taoyuan"
 msgstr "Ploaie"
 
-#: 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 "Ploaie"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Tarbes"
 msgstr "Sarcin�"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarija"
 msgstr "Ploaie"
 
-#: 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 "Tradi�ional"
 
-#: 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 "Sarcin�"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2243
 #, fuzzy
 msgid "The Dalles"
 msgstr "Program"
 
-#: 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 "Titlu"
 
-#: 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 "Joi"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Tianjin"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2251
 #, fuzzy
 msgid "Tijuana"
 msgstr "Grindin� u�oar�"
 
-#: 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 "Ploaie"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2255
 #, fuzzy
 msgid "Tiree"
 msgstr "Grec"
 
-#: 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 "Titlu"
 
-#: 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 "Comut�"
 
-#: 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 "Ast�zi"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Topeka"
 msgstr "Sus:"
 
-#: 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 "Sus:"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torrance"
 msgstr "Renun��"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torreon"
 msgstr "Corean"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "_Data �nceput:"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Toulouse"
 msgstr "�nchide"
 
-#: 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 "Japonez"
 
-#: 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 "Orientare"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trevico"
 msgstr "Precedent"
 
-#: 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 "Test"
 
-#: 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 "Mar"
 
-#: 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 "Mar�i"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulsa"
 msgstr "Mar�i"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tupelo"
 msgstr "Mar"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Turaif"
 msgstr "Turc"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turin"
 msgstr "Turc"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2319
 #, fuzzy
 msgid "Turku"
 msgstr "Mar"
 
-#: 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 "Tentativ�"
 
-#: 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 "Tip"
 
-#: 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 "Mar"
 
-#: 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 "(Mesaj f�r� titlu)"
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2341
 #, fuzzy
 msgid "Unst"
 msgstr "Nev�zut"
 
-#: 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 "Japonez"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2344
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "Ucrainean"
 
-#: 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 "Ata�eaz�"
 
-#: 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 "Variabil"
 
-#: 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 ""
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2356
 #, fuzzy
 msgid "Valdosta"
 msgstr "Mail"
 
-#: 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 "Calendar"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2359
 #, fuzzy
 msgid "Valentine"
 msgstr "Vedere inline"
 
-#: 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
 #, fuzzy
 msgid "Vandel"
 msgstr "Renun��"
 
-#: 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 "Variabil"
 
-#: 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 "Variabil"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2374
 #, fuzzy
 msgid "Vasteras"
 msgstr "dup�"
 
-#: 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
 #, fuzzy
 msgid "Venice"
 msgstr "Unicod"
 
-#: 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 "lun�"
 
-#: 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 "Nume fi�ier:"
 
-#: 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 "Alarme vizuale"
 
-#: 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 "Alarme vizuale"
 
-#: 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 "Finlanda"
 
-#: 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 "Rol"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volk Field"
 msgstr "C�mpul De la"
 
-#: 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 "Luni"
 
-#: 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 "Avertisment"
 
-#: 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 "Vremea"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterloo"
 msgstr "Vremea"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Watertown"
 msgstr "Vremea"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Waterville"
 msgstr "Categorii"
 
-#: 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 "Site web"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2437
 #, fuzzy
 msgid "Wejh"
 msgstr "Mi"
 
-#: 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 "Vremea"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wendover"
 msgstr "Expeditor"
 
-#: 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 "Europa de vest"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "Westerland"
 msgstr "Selec_teaz� �nl�n�uirea"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westfield"
 msgstr "Vest"
 
-#: 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 "Progra_mare �nt�lniri"
 
-#: 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 "Porecl�"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wien"
 msgstr "Mi"
 
-#: 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 "Cea��"
 
-#: 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 "acum"
 
-#: 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 "Introduce�i parola pentru %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 "secunde"
 
-#: 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 "Mi"
 
-#: 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 "Subsol:"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Worcester"
 msgstr "�ntotdeauna"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worland"
 msgstr "Finlanda"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worthington"
 msgstr "Lucrez"
 
-#: 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 "Lucrez"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Xiamen"
 msgstr "Nume"
 
-#: 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 "Nu importa"
 
-#: 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 "V�zut"
 
-#: 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 "Calendar"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zagreb"
 msgstr "Pagin�"
 
-#: 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 "Revocat"
 
-#: 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 "Turc"
 
-#: 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 "�nt�lniri"
 
-#: my-evolution/e-summary-calendar.c:382
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
 msgstr "Nu exist� �nt�lniri"
 
-#: 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
+#: my-evolution/e-summary-calendar.c:407
 #, fuzzy
-msgid "%l:%M %d %B"
+msgid "%l:%M%P %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:438
+#: my-evolution/e-summary-calendar.c:425
 #, fuzzy
 msgid "No description"
 msgstr "Descriere:"
 
-#: my-evolution/e-summary-mail.c:153
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "Sumar mail"
 
-#: 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 "Dosare speciale"
 
-#. 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 "Dictionary.com Vorba zilei"
 
-#: my-evolution/e-summary-preferences.c:602
+#: my-evolution/e-summary-preferences.c:374
 msgid "Quotes of the Day"
 msgstr "Cotele zilei"
 
-#: my-evolution/e-summary-preferences.c:840
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr "Adaug� o surs� de �tiri"
 
-#: 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 "Introduce�i URL-ul sursei de �tiri pe care o ad�uga�i"
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Eroare �n timpul desc�rc�rii RDF</b>"
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
 #, fuzzy
 msgid "News Feed"
 msgstr "Dosar _nou"
 
-#: my-evolution/e-summary-shown.c:519
+#: my-evolution/e-summary-shown.c:518
 msgid "All"
 msgstr "Tot"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:531
+#: my-evolution/e-summary-shown.c:530
 #, fuzzy
 msgid "Add"
 msgstr "Adaug�"
 
-#: 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 "Ploaie toren�ial�"
 
-#: my-evolution/e-summary-tasks.c:328
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "Nu exist� sarcini"
 
-#: my-evolution/e-summary-tasks.c:372
+#: my-evolution/e-summary-tasks.c:365
 #, fuzzy
 msgid "(No Description)"
 msgstr "Descriere:"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:73
 msgid "My Weather"
 msgstr "Vremea"
 
-#: my-evolution/e-summary-weather.c:268
+#: my-evolution/e-summary-weather.c:262
 #, fuzzy
 msgid "There was an error downloading data for"
 msgstr "S-a produs o eroare la desc�rcarea sursei de �tiri</dt>"
 
-#: my-evolution/e-summary-weather.c:489
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr "Vremea"
 
-#: 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, %B %d, %Y"
 
-#: my-evolution/e-summary.c:504
+#: my-evolution/e-summary.c:523
 #, fuzzy
 msgid "Please wait..."
 msgstr "se termin� cu"
 
-#: 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 "Rezumat"
 
-#: my-evolution/e-summary.c:640
+#: my-evolution/e-summary.c:623
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "Tip�rirea mesajului nereu�it�"
 
-#: my-evolution/main.c:68
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "Componenta sumar a activit��ilor nu poate ini�ializa Bonobo.\n"
-
-#: 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 ", "
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 #, fuzzy
 msgid "knots"
 msgstr "Fonturi"
 
-#: 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 "Mut"
 
-#: 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 "_Filtre..."
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 #, fuzzy
 msgid "kilometers"
 msgstr "_Filtre..."
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Clear sky"
 msgstr "Cer senin"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Broken clouds"
 msgstr "Temporar noros"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Scattered clouds"
 msgstr "Nori r�zle�i"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Few clouds"
 msgstr "Pu�in noros"
 
-#: my-evolution/metar.c:48
+#: my-evolution/metar.c:49
 msgid "Overcast"
 msgstr "Cer noros"
 
-#: 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 "Invalid"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Variable"
 msgstr "Variabil"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North"
 msgstr "Nord"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North - NorthEast"
 msgstr "Nord - Nord Est"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Northeast"
 msgstr "Nord Est"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - NorthEast"
 msgstr "Est - Nord Est"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East"
 msgstr "Est"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East - Southeast"
 msgstr "Est - Sud Est"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southeast"
 msgstr "Sud Est"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southeast"
 msgstr "Sud - Sud Est"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South"
 msgstr "Sud"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South - Southwest"
 msgstr "Sud - Sud Vest"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Southwest"
 msgstr "Sud Vest"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Southwest"
 msgstr "Vest - Sud Vest"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West"
 msgstr "Vest"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West - Northwest"
 msgstr "Vest - Nord Vest"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "Northwest"
 msgstr "Nord Vest"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "North - Northwest"
 msgstr "Nord - Nord Vest"
 
 #. DRIZZLE
-#: my-evolution/metar.c:127
+#: my-evolution/metar.c:128
 msgid "Drizzle"
 msgstr "Burni��"
 
-#: my-evolution/metar.c:128
+#: my-evolution/metar.c:129
 msgid "Drizzle in the vicinity"
 msgstr "Burni�� �n �mprejurimi"
 
-#: my-evolution/metar.c:129
+#: my-evolution/metar.c:130
 msgid "Light drizzle"
 msgstr "Burni�� u�oar�"
 
-#: my-evolution/metar.c:130
+#: my-evolution/metar.c:131
 msgid "Moderate drizzle"
 msgstr "Burni�� moderat�"
 
-#: my-evolution/metar.c:131
+#: my-evolution/metar.c:132
 msgid "Heavy drizzle"
 msgstr "Burni�� puternic�"
 
-#: my-evolution/metar.c:132
+#: my-evolution/metar.c:133
 msgid "Shallow drizzle"
 msgstr "Burni�� superficial�"
 
-#: my-evolution/metar.c:133
+#: my-evolution/metar.c:134
 msgid "Patches of drizzle"
 msgstr "Burni�� pe alocuri"
 
-#: my-evolution/metar.c:134
+#: my-evolution/metar.c:135
 msgid "Partial drizzle"
 msgstr "Burni�� par�ial"
 
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
 msgid "Thunderstorm"
 msgstr "Furtun�"
 
-#: my-evolution/metar.c:136
+#: my-evolution/metar.c:137
 msgid "Windy drizzle"
 msgstr "Burni�� cu v�nt"
 
-#: my-evolution/metar.c:137
+#: my-evolution/metar.c:138
 msgid "Showers"
 msgstr "Ploaie toren�ial�"
 
-#: my-evolution/metar.c:138
+#: my-evolution/metar.c:139
 msgid "Drifting drizzle"
 msgstr "Burni�� viscolit�"
 
-#: my-evolution/metar.c:139
+#: my-evolution/metar.c:140
 msgid "Freezing drizzle"
 msgstr "Burni�� cu ghea��"
 
 #. RAIN
-#: my-evolution/metar.c:142
+#: my-evolution/metar.c:143
 msgid "Rain"
 msgstr "Ploaie"
 
-#: my-evolution/metar.c:143
+#: my-evolution/metar.c:144
 msgid "Rain in the vicinity"
 msgstr "Ploaie �n �mprejurimi"
 
-#: my-evolution/metar.c:144
+#: my-evolution/metar.c:145
 msgid "Light rain"
 msgstr "Ploaie u�oar�"
 
-#: my-evolution/metar.c:145
+#: my-evolution/metar.c:146
 msgid "Moderate rain"
 msgstr "Ploaie moderat�"
 
-#: my-evolution/metar.c:146
+#: my-evolution/metar.c:147
 msgid "Heavy rain"
 msgstr "Ploaie puternic�"
 
-#: my-evolution/metar.c:147
+#: my-evolution/metar.c:148
 msgid "Shallow rain"
 msgstr "Ploaie superficial�"
 
-#: my-evolution/metar.c:148
+#: my-evolution/metar.c:149
 msgid "Patches of rain"
 msgstr "Ploaie pe alocuri"
 
-#: my-evolution/metar.c:149
+#: my-evolution/metar.c:150
 msgid "Partial rainfall"
 msgstr "Avers� de ploaie par�ial�"
 
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:152
 msgid "Blowing rainfall"
 msgstr "Ploaie �n rafale"
 
-#: my-evolution/metar.c:152
+#: my-evolution/metar.c:153
 msgid "Rain showers"
 msgstr "Avers� de ploaie"
 
-#: my-evolution/metar.c:153
+#: my-evolution/metar.c:154
 msgid "Drifting rain"
 msgstr "Ploaie viscolit�"
 
-#: my-evolution/metar.c:154
+#: my-evolution/metar.c:155
 msgid "Freezing rain"
 msgstr "Ploaie cu ghea��"
 
 #. SNOW
-#: my-evolution/metar.c:157
+#: my-evolution/metar.c:158
 msgid "Snow"
 msgstr "Ninsoare"
 
-#: my-evolution/metar.c:158
+#: my-evolution/metar.c:159
 msgid "Snow in the vicinity"
 msgstr "Ninge �n �mprejurimi"
 
-#: my-evolution/metar.c:159
+#: my-evolution/metar.c:160
 msgid "Light snow"
 msgstr "Ninsoare u�oare"
 
-#: my-evolution/metar.c:160
+#: my-evolution/metar.c:161
 msgid "Moderate snow"
 msgstr "Ninsoare moderat�"
 
-#: my-evolution/metar.c:161
+#: my-evolution/metar.c:162
 msgid "Heavy snow"
 msgstr "Ninsoare puternic�"
 
-#: my-evolution/metar.c:162
+#: my-evolution/metar.c:163
 msgid "Shallow snow"
 msgstr "Ninsoare superficial�"
 
-#: my-evolution/metar.c:163
+#: my-evolution/metar.c:164
 msgid "Patches of snow"
 msgstr "Ninsoare pe alocuri"
 
-#: my-evolution/metar.c:164
+#: my-evolution/metar.c:165
 msgid "Partial snowfall"
 msgstr "Ninsoare par�ial�"
 
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr "Furtun� de z�pad�"
 
-#: my-evolution/metar.c:166
+#: my-evolution/metar.c:167
 msgid "Blowing snowfall"
 msgstr "Ninsoare cu rafale de v�nt"
 
-#: my-evolution/metar.c:167
+#: my-evolution/metar.c:168
 msgid "Snow showers"
 msgstr "Avers� de z�pad�"
 
-#: my-evolution/metar.c:168
+#: my-evolution/metar.c:169
 msgid "Drifting snow"
 msgstr "Z�pad� viscolit�"
 
-#: my-evolution/metar.c:169
+#: my-evolution/metar.c:170
 msgid "Freezing snow"
 msgstr "Z�pad� cu ghea��"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:172
+#: my-evolution/metar.c:173
 msgid "Snow grains"
 msgstr "Lapovi�� �i ninsoare"
 
-#: my-evolution/metar.c:173
+#: my-evolution/metar.c:174
 msgid "Snow grains in the vicinity"
 msgstr "Lapovi�� �i ninsoare �n �mprejurimi"
 
-#: my-evolution/metar.c:174
+#: my-evolution/metar.c:175
 msgid "Light snow grains"
 msgstr "Lapovi�� �i ninsoare u�oar�"
 
-#: my-evolution/metar.c:175
+#: my-evolution/metar.c:176
 msgid "Moderate snow grains"
 msgstr "Lapovi�� �i ninsoare moderat�"
 
-#: my-evolution/metar.c:176
+#: my-evolution/metar.c:177
 msgid "Heavy snow grains"
 msgstr "Lapovi�� �i ninsoare puternic�"
 
-#: my-evolution/metar.c:177
+#: my-evolution/metar.c:178
 msgid "Shallow snow grains"
 msgstr "Lapovi�� �i ninsoare superficial�"
 
-#: my-evolution/metar.c:178
+#: my-evolution/metar.c:179
 msgid "Patches of snow grains"
 msgstr "Lapovi�� �i ninsoare pe alocuri"
 
-#: my-evolution/metar.c:179
+#: my-evolution/metar.c:180
 msgid "Partial snow grains"
 msgstr "Lapovi�� �i ninsoare par�ial�"
 
-#: my-evolution/metar.c:181
+#: my-evolution/metar.c:182
 msgid "Blowing snow grains"
 msgstr "Lapovi�� �i ninsoare �n rafale"
 
-#: my-evolution/metar.c:182
+#: my-evolution/metar.c:183
 msgid "Snow grain showers"
 msgstr "Averse de lapovi�� �i ninsoare"
 
-#: my-evolution/metar.c:183
+#: my-evolution/metar.c:184
 msgid "Drifting snow grains"
 msgstr "Lapovi�� �i ninsoare viscolit�"
 
-#: my-evolution/metar.c:184
+#: my-evolution/metar.c:185
 msgid "Freezing snow grains"
 msgstr "Lapovi�� �i ninsoare cu ghea��"
 
 #. 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 "Grindin� �n �mprejurimi"
 
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
+#: my-evolution/metar.c:220 my-evolution/metar.c:235
 msgid "Light hail"
 msgstr "Grindin� u�oar�"
 
-#: my-evolution/metar.c:220
+#: my-evolution/metar.c:221
 msgid "Moderate hail"
 msgstr "Grindin� moderat�"
 
-#: my-evolution/metar.c:221
+#: my-evolution/metar.c:222
 msgid "Heavy hail"
 msgstr "Grindin� puternic�"
 
-#: my-evolution/metar.c:222
+#: my-evolution/metar.c:223
 msgid "Shallow hail"
 msgstr "Grindin� superficial�"
 
-#: my-evolution/metar.c:223
+#: my-evolution/metar.c:224
 msgid "Patches of hail"
 msgstr "Grindin� pe alocuri"
 
-#: my-evolution/metar.c:224
+#: my-evolution/metar.c:225
 msgid "Partial hail"
 msgstr "Grindin� par�ial�"
 
-#: my-evolution/metar.c:225
+#: my-evolution/metar.c:226
 msgid "Hailstorm"
 msgstr "Furtun� cu grindin�"
 
-#: my-evolution/metar.c:226
+#: my-evolution/metar.c:227
 msgid "Blowing hail"
 msgstr "Grindin� �n rafale"
 
-#: my-evolution/metar.c:227
+#: my-evolution/metar.c:228
 msgid "Hail showers"
 msgstr "Avers� de grindin�"
 
-#: my-evolution/metar.c:228
+#: my-evolution/metar.c:229
 msgid "Drifting hail"
 msgstr "Grindin� viscolit�"
 
-#: my-evolution/metar.c:229
+#: my-evolution/metar.c:230
 msgid "Freezing hail"
 msgstr "Grindin� cu ghea��"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:232
+#: my-evolution/metar.c:233
 msgid "Small hail"
 msgstr "Grindin� m�runt�"
 
-#: my-evolution/metar.c:233
+#: my-evolution/metar.c:234
 msgid "Small hail in the vicinity"
 msgstr "Grindin� m�runt� �n �mprejurimi"
 
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:236
 msgid "Moderate small hail"
 msgstr "Grindin� m�runt� moderat�"
 
-#: my-evolution/metar.c:236
+#: my-evolution/metar.c:237
 msgid "Heavy small hail"
 msgstr "Grindin� m�runt� moderat�"
 
-#: my-evolution/metar.c:237
+#: my-evolution/metar.c:238
 msgid "Shallow small hail"
 msgstr "Grindin� m�runt� superficial�"
 
-#: my-evolution/metar.c:238
+#: my-evolution/metar.c:239
 msgid "Patches of small hail"
 msgstr "Grindin� m�runt� pe alocuri"
 
-#: my-evolution/metar.c:239
+#: my-evolution/metar.c:240
 msgid "Partial small hail"
 msgstr "Grindin� m�runt� par�ial"
 
-#: my-evolution/metar.c:240
+#: my-evolution/metar.c:241
 msgid "Small hailstorm"
 msgstr "Furtun� cu grindin� m�runt�"
 
-#: my-evolution/metar.c:241
+#: my-evolution/metar.c:242
 msgid "Blowing small hail"
 msgstr "Grindin� m�runt� �n rafale"
 
-#: my-evolution/metar.c:242
+#: my-evolution/metar.c:243
 msgid "Showers of small hail"
 msgstr "Averse de grindin� m�runt�"
 
-#: my-evolution/metar.c:243
+#: my-evolution/metar.c:244
 msgid "Drifting small hail"
 msgstr "Grindin� m�runt� viscolit�"
 
-#: my-evolution/metar.c:244
+#: my-evolution/metar.c:245
 msgid "Freezing small hail"
 msgstr "Grindin� m�runt� cu ghea��"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:247
+#: my-evolution/metar.c:248
 msgid "Unknown precipitation"
 msgstr "Precipita�ie necunoscut�"
 
-#: my-evolution/metar.c:248
+#: my-evolution/metar.c:249
 msgid "Precipitation in the vicinity"
 msgstr "Precipita�ii �n �mprejurimi"
 
-#: my-evolution/metar.c:249
+#: my-evolution/metar.c:250
 msgid "Light precipitation"
 msgstr "Precipita�ii u�oare"
 
-#: my-evolution/metar.c:250
+#: my-evolution/metar.c:251
 msgid "Moderate precipitation"
 msgstr "Precipita�ii moderate"
 
-#: my-evolution/metar.c:251
+#: my-evolution/metar.c:252
 msgid "Heavy precipitation"
 msgstr "Precipita�ii puternice"
 
-#: my-evolution/metar.c:252
+#: my-evolution/metar.c:253
 msgid "Shallow precipitation"
 msgstr "Precipita�ie superficial�"
 
-#: my-evolution/metar.c:253
+#: my-evolution/metar.c:254
 msgid "Patches of precipitation"
 msgstr "Precipita�ii pe alocuri"
 
-#: my-evolution/metar.c:254
+#: my-evolution/metar.c:255
 msgid "Partial precipitation"
 msgstr "Precipita�ii par�iale"
 
-#: my-evolution/metar.c:255
+#: my-evolution/metar.c:256
 msgid "Unknown thunderstorm"
 msgstr "Furtun� necunoscut�"
 
-#: my-evolution/metar.c:256
+#: my-evolution/metar.c:257
 msgid "Blowing precipitation"
 msgstr "Precipita�ii �n rafale"
 
-#: my-evolution/metar.c:257
+#: my-evolution/metar.c:258
 msgid "Showers, type unknown"
 msgstr "Avers� de tip necunoscut"
 
-#: my-evolution/metar.c:258
+#: my-evolution/metar.c:259
 msgid "Drifting precipitation"
 msgstr "Precipita�ii cu viscol"
 
-#: my-evolution/metar.c:259
+#: my-evolution/metar.c:260
 msgid "Freezing precipitation"
 msgstr "Precipit�ii cu ghea��"
 
 #. MIST
-#: my-evolution/metar.c:262
+#: my-evolution/metar.c:263
 msgid "Mist"
 msgstr "Cea��"
 
-#: my-evolution/metar.c:263
+#: my-evolution/metar.c:264
 msgid "Mist in the vicinity"
 msgstr "Cea�� �n �mprejurimi"
 
-#: my-evolution/metar.c:264
+#: my-evolution/metar.c:265
 msgid "Light mist"
 msgstr "Cea�� u�oar�"
 
-#: my-evolution/metar.c:265
+#: my-evolution/metar.c:266
 msgid "Moderate mist"
 msgstr "Cea�� moderat�"
 
-#: my-evolution/metar.c:266
+#: my-evolution/metar.c:267
 msgid "Thick mist"
 msgstr "Cea�� dens�"
 
-#: my-evolution/metar.c:267
+#: my-evolution/metar.c:268
 msgid "Shallow mist"
 msgstr "Cea�� superficial�"
 
-#: my-evolution/metar.c:268
+#: my-evolution/metar.c:269
 msgid "Patches of mist"
 msgstr "Cea�� pe alocuri"
 
-#: my-evolution/metar.c:269
+#: my-evolution/metar.c:270
 msgid "Partial mist"
 msgstr "Cea�� par�ial�"
 
-#: my-evolution/metar.c:271
+#: my-evolution/metar.c:272
 msgid "Mist with wind"
 msgstr "Cea�� cu v�nt"
 
-#: my-evolution/metar.c:273
+#: my-evolution/metar.c:274
 msgid "Drifting mist"
 msgstr "Cea�� cu viscol"
 
-#: my-evolution/metar.c:274
+#: my-evolution/metar.c:275
 msgid "Freezing mist"
 msgstr "Cea�� cu ghea��"
 
 #. FOG
-#: my-evolution/metar.c:277
+#: my-evolution/metar.c:278
 msgid "Fog"
 msgstr "Negur�"
 
-#: my-evolution/metar.c:278
+#: my-evolution/metar.c:279
 msgid "Fog in the vicinity"
 msgstr "Negur� �n �mprejurimi"
 
-#: my-evolution/metar.c:279
+#: my-evolution/metar.c:280
 msgid "Light fog"
 msgstr "Negur� u�oar�"
 
-#: my-evolution/metar.c:280
+#: my-evolution/metar.c:281
 msgid "Moderate fog"
 msgstr "Negur� moderat�"
 
-#: my-evolution/metar.c:281
+#: my-evolution/metar.c:282
 msgid "Thick fog"
 msgstr "Negur� dens�"
 
-#: my-evolution/metar.c:282
+#: my-evolution/metar.c:283
 msgid "Shallow fog"
 msgstr "Negur� superficial�"
 
-#: my-evolution/metar.c:283
+#: my-evolution/metar.c:284
 msgid "Patches of fog"
 msgstr "Negur� pe alocuri"
 
-#: my-evolution/metar.c:284
+#: my-evolution/metar.c:285
 msgid "Partial fog"
 msgstr "Negur� par�ial�"
 
-#: my-evolution/metar.c:286
+#: my-evolution/metar.c:287
 msgid "Fog with wind"
 msgstr "Negur� cu v�nt"
 
-#: my-evolution/metar.c:288
+#: my-evolution/metar.c:289
 msgid "Drifting fog"
 msgstr "Negur� cu viscol"
 
-#: my-evolution/metar.c:289
+#: my-evolution/metar.c:290
 msgid "Freezing fog"
 msgstr "Negur� cu ghea��"
 
 #. SMOKE
-#: my-evolution/metar.c:292
+#: my-evolution/metar.c:293
 msgid "Smoke"
 msgstr "Fum"
 
-#: my-evolution/metar.c:293
+#: my-evolution/metar.c:294
 msgid "Smoke in the vicinity"
 msgstr "Fum �n imprejurimi"
 
-#: my-evolution/metar.c:294
+#: my-evolution/metar.c:295
 msgid "Thin smoke"
 msgstr "Fum u�or"
 
-#: my-evolution/metar.c:295
+#: my-evolution/metar.c:296
 msgid "Moderate smoke"
 msgstr "Fum moderat"
 
-#: my-evolution/metar.c:296
+#: my-evolution/metar.c:297
 msgid "Thick smoke"
 msgstr "Fum dens"
 
-#: my-evolution/metar.c:297
+#: my-evolution/metar.c:298
 msgid "Shallow smoke"
 msgstr "Fum superficial"
 
-#: my-evolution/metar.c:298
+#: my-evolution/metar.c:299
 msgid "Patches of smoke"
 msgstr "Fum pe alocuri"
 
-#: my-evolution/metar.c:299
+#: my-evolution/metar.c:300
 msgid "Partial smoke"
 msgstr "Fum par�ial"
 
-#: my-evolution/metar.c:300
+#: my-evolution/metar.c:301
 #, fuzzy
 msgid "Thunderous smoke"
 msgstr "Fum u�or"
 
-#: my-evolution/metar.c:301
+#: my-evolution/metar.c:302
 msgid "Smoke with wind"
 msgstr "Fum cu v�nt"
 
-#: my-evolution/metar.c:303
+#: my-evolution/metar.c:304
 msgid "Drifting smoke"
 msgstr "Fum viscolit"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:307
+#: my-evolution/metar.c:308
 msgid "Volcanic ash"
 msgstr "Cenu�� vulcanic�"
 
-#: my-evolution/metar.c:308
+#: my-evolution/metar.c:309
 msgid "Volcanic ash in the vicinity"
 msgstr "Cenu�� vulcanic� �n �mprejurimi"
 
-#: my-evolution/metar.c:310
+#: my-evolution/metar.c:311
 msgid "Moderate volcanic ash"
 msgstr "Cenu�� vulcanic� moderat�"
 
-#: my-evolution/metar.c:311
+#: my-evolution/metar.c:312
 msgid "Thick volcanic ash"
 msgstr "Cenu�� vulcanic� dens�"
 
-#: my-evolution/metar.c:312
+#: my-evolution/metar.c:313
 msgid "Shallow volcanic ash"
 msgstr "Cenu�� vulcanic� superficial�"
 
-#: my-evolution/metar.c:313
+#: my-evolution/metar.c:314
 msgid "Patches of volcanic ash"
 msgstr "Cenu�� vulcanic� pe alocuri"
 
-#: my-evolution/metar.c:314
+#: my-evolution/metar.c:315
 msgid "Partial volcanic ash"
 msgstr "Cenus� vulcanic� par�ial�"
 
-#: my-evolution/metar.c:315
+#: my-evolution/metar.c:316
 #, fuzzy
 msgid "Thunderous volcanic ash"
 msgstr "Cenu�� vulcanic� dens�"
 
-#: 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 "Cenu�� vulcanic� pe alocuri"
 
-#: 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
 #, fuzzy
 msgid "Haze"
 msgstr "Cap"
 
-#: 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
 #, fuzzy
 msgid "Spray"
 msgstr "zile"
 
-#: my-evolution/metar.c:353
+#: my-evolution/metar.c:354
 #, fuzzy
 msgid "Spray in the vicinity"
 msgstr "Grindin� �n �mprejurimi"
 
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
 #, fuzzy
 msgid "Light spray"
 msgstr "Ploaie u�oar�"
 
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
 #, fuzzy
 msgid "Moderate spray"
 msgstr "Ploaie moderat�"
 
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
 #, fuzzy
 msgid "Heavy spray"
 msgstr "Ploaie puternic�"
 
-#: my-evolution/metar.c:357
+#: my-evolution/metar.c:358
 #, fuzzy
 msgid "Shallow spray"
 msgstr "Ploaie superficial�"
 
-#: my-evolution/metar.c:358
+#: my-evolution/metar.c:359
 #, fuzzy
 msgid "Patches of spray"
 msgstr "Ploaie pe alocuri"
 
-#: my-evolution/metar.c:359
+#: my-evolution/metar.c:360
 #, fuzzy
 msgid "Partial spray"
 msgstr "Cea�� par�ial�"
 
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
 #, fuzzy
 msgid "Blowing spray"
 msgstr "Grindin� �n rafale"
 
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
 #, fuzzy
 msgid "Drifting spray"
 msgstr "Ploaie viscolit�"
 
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
 #, fuzzy
 msgid "Freezing spray"
 msgstr "Ploaie cu ghea��"
 
 #. DUST
-#: my-evolution/metar.c:367
+#: my-evolution/metar.c:368
 #, fuzzy
 msgid "Dust"
 msgstr "August"
 
-#: 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 ""
 
@@ -26299,33 +26612,34 @@ msgstr "Program"
 msgid "_Weather"
 msgstr "Vremea"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for Evolution folder settings."
-msgstr "Procesator pentru compozitorul 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 "Procesator pentru componenta de mail Evolution."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
 #, fuzzy
 msgid "Folder Settings"
 msgstr "Set�ri"
 
-#: 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 "Arat� detalii"
 
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
 msgid "Cancel Operation"
 msgstr "Anulare opera�ie"
 
-#: shell/e-folder-dnd-bridge.c:53
+#: shell/e-folder-dnd-bridge.c:55
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -26334,59 +26648,41 @@ msgstr ""
 "Nu pot �terge dosarul `%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 "Deschide �n %s..."
 
-#: shell/e-folder-list.c:312
+#: shell/e-folder-list.c:338
 #, fuzzy
 msgid "Add a Folder"
 msgstr "Alege dosar"
 
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
 #, fuzzy
 msgid "Drafts"
 msgstr "Ciorn�"
 
-#: 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
 #, fuzzy
 msgid "Outbox"
 msgstr "mbox"
 
-#: shell/e-local-storage.c:181
+#: shell/e-local-storage.c:182
 #, fuzzy
 msgid "Sent"
 msgstr "V�zut"
 
-#: shell/e-setup.c:126
-msgid "Evolution installation"
-msgstr "Instalare Evolution"
-
-#: shell/e-setup.c:130
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Acest� versiune de Evolution are nevoie s� instaleze fi�iere �n plus\n"
-"�n directorul dumneavoastr� personal"
-
-#: shell/e-setup.c:131
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"V� rog s� da�i clic pe \"OK\" pentru a instala fi�ierele, sau \"Renun��\" "
-"pentru ie�ire"
-
-#: shell/e-setup.c:171
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "Nu pot actualiza fi�ierele corect"
 
-#: shell/e-setup.c:194
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -26397,7 +26693,7 @@ msgstr ""
 "%s\n"
 "Eroare: %s"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -26406,33 +26702,7 @@ msgstr ""
 "A ap�rut o eroare �n timpul copierii fi�ierului �n\n"
 "`%s'."
 
-#: shell/e-setup.c:282
-#, fuzzy, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Nu pot crea directorul %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"
@@ -26443,16 +26713,7 @@ msgstr ""
 "V� rog s�-l muta�i pentru a permite instalarea\n"
 "fi�ierelor utilizator 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"
@@ -26467,27 +26728,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 "Data terminare"
 
-#: shell/e-shell-config-default-folders.c:133
+#: shell/e-shell-config-default-folders.c:149
 #, fuzzy
 msgid "Select Default Folder"
 msgstr "Dosare speciale"
 
-#: shell/e-shell-config-folder-settings.c:71
+#: shell/e-shell-config-folder-settings.c:70
 #, fuzzy
 msgid "Default Folders"
 msgstr "Dosare speciale"
 
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
 #, fuzzy
 msgid "Offline Folders"
 msgstr "Dosare speciale"
 
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 #, fuzzy
 msgid "Autocompletion Folders"
 msgstr "Data terminare"
@@ -26497,44 +26758,44 @@ msgstr "Data terminare"
 msgid "Cannot copy folder: %s"
 msgstr "Nu pot lua dosarul: %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 ""
 "Nu pot �terge dosarul `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr "Nu pot muta un dosar peste el �nsu�i."
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr "Nu copia un dosar peste el �nsu�i."
 
-#: 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 "Nu pot muta un dosar �ntr-unul din descenden�ii s�i/"
 
-#: 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 "Preciza�i un dosar pentru a copia dosarul \"%s\" �n:"
 
-#: shell/e-shell-folder-commands.c:325
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr "Copiaz� dosarul"
 
-#: 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 "Preciza�i un dosar pentru a muta dosarul \"%s\" �n:"
 
-#: shell/e-shell-folder-commands.c:369
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "Mut� dosarul"
 
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:391
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -26543,17 +26804,17 @@ msgstr ""
 "Nu pot �terge dosarul `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:406
-#, fuzzy, c-format
-msgid "Delete \"%s\""
-msgstr "�terg"
-
-#: shell/e-shell-folder-commands.c:407
+#: shell/e-shell-folder-commands.c:405
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "�terge dosarul '%s'"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:412
+#, fuzzy, c-format
+msgid "Delete \"%s\""
+msgstr "�terg"
+
+#: shell/e-shell-folder-commands.c:485
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -26562,27 +26823,27 @@ msgstr ""
 "Nu pot �terge dosarul `%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 "Redenum�te dosarul '%s'"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:540
 #, fuzzy
 msgid "Rename folder"
 msgstr "Redenum�te dosarul '%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 "Numele dosarului specificat este invalid."
 
-#: 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"
@@ -26591,7 +26852,7 @@ msgstr ""
 "Nu pot �terge dosarul `%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"
@@ -26600,24 +26861,20 @@ msgstr ""
 "Nu pot crea dosarulul precizat:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:308
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Crez� dosar nou..."
 
-#: 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 "(F�r� titlu)"
 
-#: 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"
@@ -26631,11 +26888,11 @@ msgstr ""
 "Pute�i selecta \"Automat\" dac� nu �ti�i tipul �i Evolution va �ncerca s�-l "
 "determine automat."
 
-#: 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"
@@ -26644,23 +26901,23 @@ msgstr ""
 "Se import� %s\n"
 "Se import� articol %d."
 
-#: shell/e-shell-importer.c:355
+#: shell/e-shell-importer.c:351
 #, fuzzy
 msgid "Select importer"
 msgstr "Alege dosar"
 
-#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:492
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Dosarul `%s' nu exist�."
 
-#: 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"
@@ -26669,11 +26926,11 @@ msgstr ""
 "Nu se reu�e�te importul\n"
 "%s"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "Se import�"
 
-#: shell/e-shell-importer.c:522
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -26682,17 +26939,17 @@ msgstr ""
 "Se import� %s.\n"
 "Start %s"
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "Eroare la start %s"
 
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Eroare la �nc�rcarea %s"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26701,215 +26958,217 @@ msgstr ""
 "Se import� %s\n"
 "Se import� elementul 1."
 
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "Automat"
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Nume fi�ier:"
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Selecteaz� un fi�ier"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Tip fi�ier:"
 
-#: 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 "Import fi�iere"
 
-#: 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 la:"
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Alege dosarul"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Alege�i dosarul destina�ie pentru importul datelor"
 
-#: 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 "Import"
 
-#: shell/e-shell-offline-handler.c:582
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "�nchid conexiunile..."
 
-#: shell/e-shell-offline-sync.c:161
+#: shell/e-shell-offline-sync.c:163
 #, fuzzy, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
 "%s"
 msgstr "Sincronizare dosar"
 
-#: shell/e-shell-offline-sync.c:239
+#: shell/e-shell-offline-sync.c:232
 #, fuzzy
 msgid "Syncing Folder"
 msgstr "Sincronizare dosar"
 
 #. 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 "Sincronizare dosar"
 
-#: shell/e-shell-settings-dialog.c:326
+#: shell/e-shell-settings-dialog.c:345
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Set�ri 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 "�terge sarcinile selectate"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Deschid dosarul %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 "Deschid dosarul %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 "Deschide �n %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 "Nu pot redenumi dosarul: %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 ""
 "Nu pot crea dosarulul precizat:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:159
-#, fuzzy, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr "Nu pot ini�ializa componenta mail Evolution."
-
-#: shell/e-shell-startup-wizard.c:169
-#, fuzzy
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "Nu pot ini�ializa componenta mail 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 "Nici un destinatar specificat"
 
-#: 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 slashes."
+msgid "Folder name cannot contain the character \"/\"."
 msgstr "Nu pot deschide directorul cache: %s"
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "Nu pot deschide directorul cache: %s"
+
+#: 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 "Eroare execu�ie filtru: %s: %s"
 
-#: shell/e-shell-view-menu.c:196
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug buddy nu a fost g�sit �n $PATH."
+#: shell/e-shell-view-menu.c:193
+#, fuzzy
+msgid "Bug buddy is not installed."
+msgstr "Bug buddy nu poate fi rulat."
 
-#: shell/e-shell-view-menu.c:204
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy nu poate fi rulat."
 
-#: shell/e-shell-view-menu.c:248
+#: shell/e-shell-view-menu.c:247
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Despre Evolution..."
 
-#: shell/e-shell-view-menu.c:503
+#: shell/e-shell-view-menu.c:502
 msgid "Go to folder..."
 msgstr "Mergi la dosarul..."
 
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:503
 msgid "Select the folder that you want to open"
 msgstr "Alege�i dosarul pe care dori�i s�-l deschide�i"
 
-#: shell/e-shell-view-menu.c:625
+#: shell/e-shell-view-menu.c:617
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "Creaz� o scurt�tur� nou�"
 
-#: 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 "Alege�i dosarul spre care dori�i s� indice scurt�tura:"
 
-#: shell/e-shell-view-menu.c:788
+#: shell/e-shell-view-menu.c:769
 #, fuzzy
 msgid "_Work Online"
 msgstr "Lucreaz� offline"
 
-#: 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 "Lucreaz� deconectat"
 
-#: 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 "Lucreaz� deconectat"
 
-#: shell/e-shell-view.c:226
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "(Nici un dosar afi�at)"
 
-#: shell/e-shell-view.c:1861
+#: shell/e-shell-view.c:2045
 #, fuzzy, c-format
 msgid "%s (%d)"
 msgstr "%s (...)"
 
-#: shell/e-shell-view.c:1863
+#: shell/e-shell-view.c:2047
 #, fuzzy
 msgid "(None)"
 msgstr "(F�r� nume)"
 
-#: shell/e-shell-view.c:1910
+#: shell/e-shell-view.c:2091
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
@@ -26917,12 +27176,12 @@ msgstr ""
 "Evolution este actualmente conectat. Da�i clic pe buton pentru a lucra "
 "deconectat."
 
-#: shell/e-shell-view.c:1917
+#: shell/e-shell-view.c:2098
 #, fuzzy
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution este �n proces de deconectare."
 
-#: shell/e-shell-view.c:1923
+#: shell/e-shell-view.c:2104
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
@@ -26938,12 +27197,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:739
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nu pot seta stocarea 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"
@@ -26951,153 +27210,147 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2178
+#: shell/e-shell.c:2067
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Con�inut invalid al mesajului"
 
-#: 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 "Eroare generic�"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:80
 msgid "Create new shortcut group"
 msgstr "Creaz� un grup nou de scurt�turi."
 
-#: shell/e-shortcuts-view.c:77
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
 msgstr "Nume 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 ""
 "Chiar dori�i s� �nl�tura�i grupul\n"
 "`%s' din bara de scurt�turi?"
 
-#: shell/e-shortcuts-view.c:178
-msgid "Don't remove"
-msgstr "Nu �nl�tura"
-
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr "Redenume�te grupul de scurt�turi"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr "Redenume�te grupul de scurt�turi selectat �n:"
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "Iconuri mici"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr "Arat� scurt�turile ca iconuri mici"
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr "Iconuri mari"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr "Arat� scurt�turile ca iconuri mari"
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr "Grup _Nou..."
 
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr "Creaz� un grup nou de scurt�turi"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
 msgstr "�nl�tur� acest g_rup..."
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr "�nl�tur� acest grup de scurt�turi"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
 msgstr "Rede_nume�te acest grup..."
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr "Redenume�te acest grup de scurt�turi"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr "Ascunde bara de scurt�turi"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr "Ascunde bara de scurt�turi"
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:281
 #, fuzzy
 msgid "Create _Default Shortcuts"
 msgstr "Creaz� o scurt�tur� nou�"
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:282
 #, fuzzy
 msgid "Create Default Shortcuts"
 msgstr "Creaz� o scurt�tur� nou�"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr "Redenume�te scurt�tura"
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr "Redenume�te scurt�tura selectat� �n:"
 
-#: shell/e-shortcuts-view.c:408
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr "Deschide dosarul legat la aceast� scurt�tur�."
 
-#: 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 "Deschide �n fereastr� noua"
 
-#: 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 "Deschide dosarul legat la aceast� scurt�tur� �ntr-o fereastr� nou�"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 #, fuzzy
 msgid "_Rename"
 msgstr "Redenume�te"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr "Redenume�te aceast� scurt�tur�"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 #, fuzzy
 msgid "Re_move"
 msgstr "�terge"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "�nl�tur� aceast� scurt�tur� din bara de scurt�turi"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr "Eroare la salvarea scurt�turilor."
 
-#: shell/e-shortcuts.c:1080
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr "Scurt�turi"
 
@@ -27105,76 +27358,76 @@ msgstr "Scurt�turi"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:569
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "F�r� eroare"
 
-#: shell/e-storage.c:573
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr "Exist� deja un dosar cu acela�i nume"
 
-#: shell/e-storage.c:575
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr "Tipul de dosar specificat nu e valid"
 
-#: shell/e-storage.c:577
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "Eroare I/O"
 
-#: shell/e-storage.c:579
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr "Spa�iu insuficient pentru a crea dosarul"
 
-#: 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 "Dosarul specificat nu a fost g�sit"
 
-#: shell/e-storage.c:585
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr "Func�ie neimplementat� �n aceast� stocare"
 
-#: shell/e-storage.c:589
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr "Opera�ie nesuportat�"
 
-#: shell/e-storage.c:591
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr "Tipul specificat nu e suportat �n acest� stocare"
 
-#: shell/e-storage.c:593
+#: shell/e-storage.c:594
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "Dosarul specificat nu a fost g�sit"
 
-#: shell/e-storage.c:595
+#: shell/e-storage.c:596
 #, fuzzy
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Nu pot muta un dosar �ntr-unul din descenden�ii s�i/"
 
-#: shell/e-storage.c:597
+#: shell/e-storage.c:598
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Nu pot crea dosarul blocat la %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 "%s (...)"
 
-#: shell/e-task-widget.c:196
+#: shell/e-task-widget.c:216
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complet)"
 
-#: shell/evolution-folder-selector-button.c:94
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<clic aici s� alege�i un dosar>"
 
@@ -27204,95 +27457,92 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1145
+#: shell/evolution-shell-component.c:1182
 #, fuzzy
 msgid "CORBA error"
 msgstr "Eroare I/O"
 
-#: 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 "Con�inut invalid al mesajului"
 
-#: 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 "Nimeni"
 
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1192
 #, fuzzy
 msgid "Not found"
 msgstr "Nu g�sesc fi�ierul"
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1194
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Verific tipurile suportate"
 
-#: 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 "Opera�ie anulat� de utilizator."
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1200
 #, fuzzy
 msgid "Internal error"
 msgstr "Alt� eroare"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1204
 #, fuzzy
 msgid "Exists"
 msgstr "Exist�"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1206
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Invalid"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1210
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Nu exist� dosarul %s"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1212
 #, fuzzy
 msgid "No space left"
 msgstr "Nici un mesaj selectat"
 
-#: 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 "Tip fi�ier:"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr "Conexiuni active"
+#: shell/evolution-test-component.c:703
+#, fuzzy
+msgid "Evolution Test Component"
+msgstr "Compozitorul de mailuiri 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 "Da�i clic pe OK pentru a �nchide aceast� conexiune �i a v� deconecta"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "Gazd�"
-
-#: 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 "Urmatoarele conexiuni sunt actualmente active:"
 
@@ -27316,15 +27566,15 @@ msgstr "Mail"
 msgid "_Tasks:"
 msgstr "Sarcini"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder name:"
 msgstr "Nume dosar:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder type:"
 msgstr "Tip dosar:"
 
-#: 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 "Preciza�i unde s� fie creat dosarul:"
 
@@ -27348,40 +27598,40 @@ msgstr "Nume dosar:"
 msgid "_User:"
 msgstr "Nume utilizator:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Evolution Setup Assistant"
 msgstr "Utilitate de import Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 #, fuzzy
 msgid "Importing Files"
 msgstr "Se import�"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 #, fuzzy
 msgid "Timezone "
 msgstr "Zona temporal�:"
 
-#: 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
@@ -27424,43 +27674,44 @@ msgstr ""
 "Cu acest asistent ve�i fi ghidat prin procesul de\n"
 "import al fi�ierelor extene �n Evolution."
 
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
 msgid "Importers"
 msgstr "Importatori"
 
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Nu importa"
 
-#: shell/importer/intelligent.c:198
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Nu m� �ntreba din nou"
 
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
 #, fuzzy
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution a g�sit urm�toarea surs� de date:"
 
-#: 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 "Set�ri Evolution..."
 
-#: 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"
@@ -27482,7 +27733,7 @@ msgstr ""
 "Sper�m s� v� bucura�i de rezultatele eforturilor noastre, �i a�tept�m\n"
 "cu ner�bdare contribu�ia dumneavostr�!\n"
 
-#: shell/main.c:250
+#: shell/main.c:290
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -27491,78 +27742,112 @@ msgstr ""
 "V� mul�umim\n"
 "Echipa Evolution\n"
 
-#: shell/main.c:259
+#: shell/main.c:298
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Nu m� �ntreba din nou"
 
-#: shell/main.c:394
+#: shell/main.c:387
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nu pot accesa shell-ul Evolution."
 
-#: shell/main.c:403
+#: shell/main.c:396
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nu pot accesa shell-ul Evolution."
 
-#: shell/main.c:485
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Invalideaz� ecranul de pornire"
 
-#: shell/main.c:487
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "_Data �nceput:"
 
-#: shell/main.c:489
+#: shell/main.c:532
 #, fuzzy
 msgid "Start in online mode"
 msgstr "_Data �nceput:"
 
-#: 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 ""
 "Trimite ie�irile pentru depanare ale tuturor componentelor �ntr-un fi�ier."
 
-#: 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 "Nu pot ini�ializa sistemul de componente 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 "Eroare la �nc�rcarea fi�ierului: %s"
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 #, fuzzy
 msgid "Input File"
 msgstr "Insereaz� fi�ier"
 
-#: tools/evolution-addressbook-export.c:46
-#, fuzzy
-msgid "Output File"
-msgstr "Deschide fi�ier"
-
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 #, fuzzy
 msgid "No filename provided."
 msgstr "Nici un destinatar specificat"
 
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "Adaug� anex�..."
+
+#: 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 "Descrierea con�ine"
+
+#: 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 "Decupeaz� mesajele selectate"
+
+#. 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 "Nu pot redenumi dosarul: %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..."
@@ -27657,7 +27942,7 @@ msgstr "ora curent�"
 #: 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 "_Ac�iuni"
 
@@ -27788,7 +28073,7 @@ msgid "Print this item"
 msgstr "Tip�re�te acest articol"
 
 #: 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 "Salveaz�"
 
@@ -27816,7 +28101,7 @@ msgstr "Salveaz� acest articol pe disc"
 #: 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�ier"
 
@@ -28074,7 +28359,7 @@ msgstr "List� de mesaje �nl�n�uite"
 msgid "_Expunge"
 msgstr "Distrug_e"
 
-#: 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 "Dosar"
 
@@ -28342,7 +28627,7 @@ msgstr "R�spunde"
 
 #: 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 "Verific mesajele noi �n toate dosarele"
 
 #: ui/evolution-mail-message.xml.h:64
@@ -28511,7 +28796,7 @@ msgstr "Cotat"
 msgid "_Resend..."
 msgstr "_Redenume�te..."
 
-#: 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 "_Unelte"
 
@@ -28526,12 +28811,12 @@ msgstr "�nchide aceast� fereastr�"
 #: 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 "�n_chide"
 
 #: 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 "_Vizualizare"
 
@@ -28539,6 +28824,10 @@ msgstr "_Vizualizare"
 msgid "Attach"
 msgstr "Ata�eaz�"
 
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Anexeaz� un fisier"
+
 #: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "�nchid fi�ierul curent"
@@ -28712,7 +29001,7 @@ msgstr "HTML"
 msgid "Save the current file and close the window"
 msgstr "Salveaz� lista �i �nchide c�su�a de dialog"
 
-#: 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 "Ajutor"
 
@@ -28903,129 +29192,119 @@ msgstr "Set�ri _pilot..."
 
 #: ui/evolution.xml.h:27
 #, fuzzy
-msgid "Pilot Con_duit Settings..."
-msgstr "Set�ri _pilot..."
-
-#: ui/evolution.xml.h:28
-#, fuzzy
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "Crez� dosar nou..."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "Trimite / Prime�te"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Trimite mailurile din coad� �i descarc� mailurile noi"
 
-#: ui/evolution.xml.h:31
-#, fuzzy
-msgid "Set up Pilot conduit configuration"
-msgstr "Configurare mail"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Configurare mail"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Arat� informa�ii despre Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Raporteaz� o eroare"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "Raporteaz� o eroare"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Raporteaz� o problem� folosind Bug Buddy"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "Comut�"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "Comut� �n timp ce se arat� bara folder"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Comut� �n timp ce se arat� bara cu scurt�turi"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr "Selecteaz� �n timp lucr�m deconecta�i"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "Vizualizeaz� dosarul selectat"
 
-#: 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 "Despre Ximian Evolution..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "_Copiaz�..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Bara dosar"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Folder..."
 msgstr "Dosar"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "Mer_gi la dosarul..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr "_Import�..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "_Mut�..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "_Nou"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "Dosar _nou"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Remove Other User's Folder"
 msgstr "Crez� dosar nou..."
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_Redenume�te..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "Trimite / Prime�te"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "Bara cu _scurt�turi"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Scurt�tur�"
@@ -29113,9 +29392,8 @@ msgstr "Cu categorie"
 msgid "_Tasks"
 msgstr "Sarcin�"
 
-#. 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 ""
 
@@ -29141,22 +29419,22 @@ msgstr ""
 "selecta�i ora local�.\n"
 " Folosi�i butonul din dreapta al mausului pentru a mic�ora."
 
-#: widgets/menus/gal-view-menus.c:295
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr "Vizualizarea _curent�"
 
 #. 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 "Personalizeaz�"
 
-#: widgets/menus/gal-view-menus.c:366
+#: widgets/menus/gal-view-menus.c:359
 #, fuzzy
 msgid "Save Custom View"
 msgstr "Personalizeaz�"
 
-#: widgets/menus/gal-view-menus.c:379
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr "Define�te vizualiz�ri"
 
@@ -29167,19 +29445,19 @@ msgid "MTWTFSS"
 msgstr "LMMJVSD"
 
 #. 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 "Acum"
 
-#: 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 "Ast�zi"
 
-#: 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 "Ora trebuie s� fie �n formatul: %s"
@@ -29188,81 +29466,81 @@ msgstr "Ora trebuie s� fie �n formatul: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Valorile procentuale pot fi �ntre 0 �i 100, inclusiv"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "Baltic"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "Europa central�"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "Chinez"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "Chirilic"
 
-#: 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 ""
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr "Japonez"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "Corean"
 
-#: 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 "Unicod"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
 msgstr "Europa de vest"
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "Tradi�ional"
 
-#: 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 "Simplificat"
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "Ucrainean"
 
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:97
 #, fuzzy
 msgid "Visual"
 msgstr "Alarme vizuale"
 
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Set de caractere necunoscut: %s"
 
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr "Introduce�i setul de carcatere de folosit"
 
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "Alte..."
 
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr "Codare caractere"
 
@@ -29270,12 +29548,13 @@ msgstr "Codare caractere"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:189
+#: widgets/misc/e-filter-bar.c:183
 #, fuzzy
 msgid "Search Editor"
 msgstr "Caut� �nainte"
 
-#: widgets/misc/e-filter-bar.c:211
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "Salveaz� c�utarea"
 
@@ -29294,68 +29573,580 @@ msgstr "Salveaz� c�utarea"
 msgid "_Advanced..."
 msgstr "Avansat..."
 
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
 msgid "Information"
 msgstr "Informa�ie"
 
-#: widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:168
 msgid "Error"
 msgstr "Eroare"
 
-#: widgets/misc/e-messagebox.c:173
+#: widgets/misc/e-messagebox.c:175
 msgid "Question"
 msgstr "�ntrebare"
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
 msgid "Message"
 msgstr "Mesaj"
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
-msgstr "Nu ar�ta acest mesaj din nou"
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "_Caut�"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:537
 #, fuzzy
 msgid "_Find Now"
 msgstr "Leg�tura DN:"
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 #, fuzzy
 msgid "_Clear"
 msgstr "�terge"
 
-#: widgets/misc/e-search-bar.c:895
+#: widgets/misc/e-search-bar.c:833
+#, fuzzy
+msgid "Item ID"
+msgstr "Art_icol (FIXME)"
+
+#: 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
 #, fuzzy
 msgid "Clear"
 msgstr "�terge"
 
-#: widgets/misc/e-search-bar.c:897
+#: widgets/misc/e-search-bar.c:927
 #, fuzzy
 msgid "Find Now"
 msgstr "Leg�tura DN:"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Serverul personal agend� de adrese"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Vizualizor agend� minicard 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 "Evolution calendar iTip/iMip vizualizator"
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Vizualizor agend� minicard Evolution"
+
+#, fuzzy
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Procesator pentru  importul fi�ierelor GnomeCard in Evolution"
+
+#, fuzzy
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Import fi�ierele card V �n Evolution."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Procesator pentru  importul fi�ierelor GnomeCard in Evolution"
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Import fi�ierele card V �n Evolution."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "Control Bonobo pentru aparitia unei adrese."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Control Bonobo pentru afi�area unei adrese."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Control Bonobo de prob� care afi�eaz� o agend�."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr "Procesator pentru componentele agendei Evolution."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Control care afi�eaz� o agend� minicard pentru Evolution"
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Component� Evolution pentru manipulare contacte"
+
+#~ msgid "Factory for the Addressbook Minicard control"
+#~ msgstr "Procesator pentru controlul agendei minicard"
+
+#~ msgid "Factory for the Addressbook's address displayer"
+#~ msgstr "Procesator pentru afi�orul agendei de adrese"
+
+#, fuzzy
+#~ msgid ""
+#~ "Factory for the configuration controls for the Evolution Addressbook."
+#~ msgstr "Procesator pentru componentele agendei Evolution."
+
+#~ msgid "Factory for the sample Addressbook control"
+#~ msgstr "Procesator pentru controlul mostr� agend�"
+
+#, fuzzy
+#~ msgid "1234"
+#~ msgstr "123"
+
+#, fuzzy
+#~ msgid "380"
+#~ msgstr "389"
+
+#, fuzzy
+#~ msgid "<- _Remove"
+#~ msgstr "�te_rge"
+
+#, fuzzy
+#~ msgid "<< Fewer Options"
+#~ msgstr "Op�iuni"
+
+#, fuzzy
+#~ msgid "DN Customization"
+#~ msgstr "Personalizeaz�"
+
+#, fuzzy
+#~ msgid "Evolution Attribute"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "LDAP Attribute"
+#~ msgstr "Autentificare"
+
+#, fuzzy
+#~ msgid "Mappings"
+#~ msgstr "Margini"
+
+#, fuzzy
+#~ msgid "R_estore Defaults"
+#~ msgstr "Implicit"
+
+#, fuzzy
+#~ msgid "Re_store Defaults"
+#~ msgstr "Implicit"
+
+#, fuzzy
+#~ msgid "Select"
+#~ msgstr "Selecteaz� tot"
+
+#, fuzzy
+#~ msgid "_Add ->"
+#~ msgstr "Adaug� ->"
+
+#, fuzzy
+#~ msgid "_Add Mapping"
+#~ msgstr "Adaug� ac�iune"
+
+#, fuzzy
+#~ msgid "_Add to DN"
+#~ msgstr "Adaug� ac�iune"
+
+#, fuzzy
+#~ msgid "_Always"
+#~ msgstr "Alarme"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "Serverul personal calendar; procesatorul pentru calendar"
+#, fuzzy
+#~ msgid "_Delete Mapping"
+#~ msgstr "�terge tot"
 
-#: wombat/wombat.c:199
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): nu pot ini�ializa GNOME_VFS"
+#, fuzzy
+#~ msgid "_Edit Mapping"
+#~ msgstr "_Editeaz� �nt�lnire"
 
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): nu pot ini�ializa GNOME"
+#, fuzzy
+#~ msgid "_Evolution attribute:"
+#~ msgstr "Evolution"
 
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
+#, fuzzy
+#~ msgid "_More Options >>"
+#~ msgstr "_Op�iuni"
+
+#, fuzzy
+#~ msgid "_Restore Defaults"
+#~ msgstr "Implicit"
+
+#, fuzzy
+#~ msgid "account-druid"
+#~ msgstr "Cont"
+
+#, fuzzy
+#~ msgid "account-editor"
+#~ msgstr "editor-lista-contact"
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr "Procesator interfa�a de selectare nume a agendei"
+
+#, fuzzy
+#~ msgid "Edit Contact List"
+#~ msgstr "_Contact"
+
+#, fuzzy
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Contact schimbat:"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontacte..."
+
+#~ msgid "Phone Types"
+#~ msgstr "Tipuri de telefon"
+
+#~ msgid "Delete Contact?"
+#~ msgstr "�terg persoana de contact?"
+
+#, fuzzy
+#~ msgid "Display Cards?"
+#~ msgstr "Afi�eaz�"
+
+#, fuzzy
+#~ msgid "Display Cards"
+#~ msgstr "Afi�eaz�"
+
+#, fuzzy
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Mostr� de control Bonobo care afi�eaza un calendar."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Mostr� de control Bonobo care afi�eaza un calendar."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Procesator pentru componenta calendarului Evolution."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Component� Evolution pentru manipularea calendarului."
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Tasks control"
+#~ msgstr "Procesator pentru componenta de mail Evolution."
+
+#~ msgid "Factory for the calendar iTip view control"
+#~ msgstr "Procesator pentru controlul calendar iTip"
+
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr "Procesator pentru mostra controlului calendar"
+
+#, fuzzy
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr "Procesator pentru componenta calendarului Evolution."
+
+#, fuzzy
+#~ msgid "Factory to create a component editor factory"
+#~ msgstr "Procesator pentru componenta calendarului Evolution."
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Serviciu notificare alarme"
+
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "Nu pot ini�ializa GNOME"
+
+#, fuzzy
+#~ msgid "st"
+#~ msgstr "1"
+
+#, fuzzy
+#~ msgid "nd"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "rd"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "Could not activate Bonobo"
+#~ msgstr "Nu pot ini�ializa Bonobo"
+
+#, fuzzy
+#~ msgid "Could not create the component editor factory"
+#~ msgstr "Nu pot crea procesatorul servicului de notificare alarm�"
+
+#~ msgid "Print Calendar"
+#~ msgstr "Tip�re�te calendar"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create the tasks view.  Please check your ORBit and OAF setup."
+#~ msgstr ""
+#~ "Nu pot crea vederea calendar. Verifica�i set�rile pentru ORBit si OAF"
+
+#~ msgid ""
+#~ "Evolution has taken the tasks that were in your calendar folder and "
+#~ "automatically migrated them to the new tasks folder."
+#~ msgstr ""
+#~ "Evolution a preluat sarcinile care au fost in dosarul calendar �i le-a "
+#~ "transferat �ntr-un nou dosar de sarcini."
+
+#~ 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 �ncercat s� preia sarcinile care au fost �n dosarul calendar "
+#~ "�i le-a transferat �ntr-un nou dosar de sarcini.C�teva sarcini nu pot fi "
+#~ "transferate, a�a c� acest proces se poate relua �n viitor"
+
+#~ msgid ""
+#~ "Could not open `%s'; no items from the calendar folder will be migrated "
+#~ "to the tasks folder."
+#~ msgstr ""
+#~ "Nu pot deschide `%s'; nici un articol din dosarul calendar nu va fi "
+#~ "transferat �n dosarul de sarcini"
+
+#~ msgid ""
+#~ "The method required to load `%s' is not supported; no items from the "
+#~ "calendar folder will be migrated to the tasks folder."
+#~ msgstr ""
+#~ "Metoda cerut� pentru a �nc�rca `%s' nu e suportat�; nici un articol din "
+#~ "dosarul calendar nu va fi transferat �n dosarul de sarcini"
+
+#, fuzzy
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Procesator pentru  importul fi�ierelor GnomeCard in Evolution"
+
+#, fuzzy
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Import fi�ierele card V �n Evolution."
+
+#, fuzzy
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Import fi�ierele card V �n Evolution."
+
+#, fuzzy
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr ""
+#~ "Nu pot lua mesajul: %s din dosarul %s\n"
+#~ "  %s"
+
+#, fuzzy
+#~ msgid "Can't call getFolderAtPath on storage: %s"
+#~ msgstr "Nu m� pot conecta la serverul: %s"
+
+#~ msgid "Warning!"
+#~ msgstr "Avertisment!"
+
+#~ msgid ""
+#~ "Could not create composer window, because you have not yet\n"
+#~ "configured any identities in the mail component."
+#~ msgstr ""
+#~ "Nu pot crea fereastra de compunere pentru c� n-a�i configurat �nc�\n"
+#~ "nici o identitate �n componen�a mailului."
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "Nu pot ini�ializa compozitorul Evolution."
+
+#~ msgid "minute"
+#~ msgstr "minut"
+
+#~ msgid "hour"
+#~ msgstr "or�"
+
+#~ msgid "week"
+#~ msgstr "s�pt�m�n�"
+
+#~ msgid "year"
+#~ msgstr "an"
+
+#~ msgid "Add action"
+#~ msgstr "Adaug� ac�iune"
+
+#~ msgid "Add criterion"
+#~ msgstr "Adaug� criteriu"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Procesator pentru compozitorul Evolution."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Procesator pentru componenta calendarului Evolution."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Procesator pentru compozitorul Evolution."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Procesator pentru compozitorul Evolution."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Component� Evolution pentru manipularea mailului."
+
+#~ msgid "Evolution mail folder factory component."
+#~ msgstr "Componenta Evolution pentru procesarea mailului."
+
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr "Procesator pentru compozitorul Evolution."
+
+#~ msgid "Factory for the Mail Summary component."
+#~ msgstr "Procesator pentru componenta sumar mail."
+
+#, fuzzy
+#~ msgid "Warning: Unsent Messages"
+#~ msgstr "Mesaje �naintate"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "Nu pot ini�ializa componenta mail Evolution."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "Nu pot ini�ializa componenta mail Evolution."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Nu pot ini�ializa componenta mail Evolution."
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Procesator pentru importul mbox �n Evolution"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Import fi�ierele mbox �n Evolution"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr ""
+#~ "Procesator pentru importul mailurilor Outlook Express 4 �n Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Import fi�ierele Outlook Express 4 �n Evolution"
+
+#~ msgid "Really delete account?"
+#~ msgstr "Chiar �terge�i acest cont?"
+
+#, fuzzy
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "Afi�eaz� urm�torul mesaj necitit"
+
+#, fuzzy
+#~ msgid "Add Signature"
+#~ msgstr "Salveaz� semn�tura"
+
+#, fuzzy
+#~ msgid "Account %d"
+#~ msgstr "Cont"
+
+#, fuzzy
+#~ msgid "_Variable-width:"
+#~ msgstr "Variabil"
+
+#, fuzzy
+#~ msgid "All folders"
+#~ msgstr "Toate dosarele:"
+
+#, fuzzy
+#~ msgid "Apri file"
+#~ msgstr "Aprilie"
+
+#, fuzzy
+#~ msgid "Display Options"
+#~ msgstr "Afi�eaz� sta�iile:"
+
+#, fuzzy
+#~ msgid "Salve file"
+#~ msgstr "Selecteaz� un fi�ier"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Componenta Evolution pentru sumarul activit��ilor."
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Summary component."
+#~ msgstr "Procesator pentru componenta sumar a activit��ilor."
+
+#, fuzzy
+#~ msgid "Marquette"
+#~ msgstr "Mai"
+
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "Componenta sumar a activit��ilor nu poate ini�ializa Bonobo.\n"
+
+#, fuzzy
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Procesator pentru compozitorul Evolution."
+
+#~ msgid "Evolution installation"
+#~ msgstr "Instalare Evolution"
+
+#~ msgid ""
+#~ "This new version of Evolution needs to install additional files\n"
+#~ "into your personal Evolution directory"
+#~ msgstr ""
+#~ "Acest� versiune de Evolution are nevoie s� instaleze fi�iere �n plus\n"
+#~ "�n directorul dumneavoastr� personal"
+
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr ""
+#~ "V� rog s� da�i clic pe \"OK\" pentru a instala fi�ierele, sau \"Renun��\" "
+#~ "pentru ie�ire"
+
+#, fuzzy
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nu pot crea directorul %s:\n"
+#~ "%s"
+
+#~ msgid "New..."
+#~ msgstr "Nou..."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr "Nu pot ini�ializa componenta mail Evolution."
+
+#, fuzzy
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr "Nu pot ini�ializa componenta mail Evolution."
+
+#~ msgid "Bug buddy was not found in your $PATH."
+#~ msgstr "Bug buddy nu a fost g�sit �n $PATH."
+
+#~ msgid "Don't remove"
+#~ msgstr "Nu �nl�tura"
+
+#~ msgid "Active connections"
+#~ msgstr "Conexiuni active"
+
+#~ msgid "Host"
+#~ msgstr "Gazd�"
+
+#~ msgid "Cannot initialize the Bonobo component system."
+#~ msgstr "Nu pot ini�ializa sistemul de componente Bonobo."
+
+#, fuzzy
+#~ msgid "Output File"
+#~ msgstr "Deschide fi�ier"
+
+#, fuzzy
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "Set�ri _pilot..."
+
+#, fuzzy
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "Configurare mail"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Serverul personal agend� de adrese"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "Serverul personal calendar; procesatorul pentru calendar"
+
+#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
+#~ msgstr "setup_vfs(): nu pot ini�ializa GNOME_VFS"
+
+#~ msgid "init_corba(): could not initialize GNOME"
+#~ msgstr "init_corba(): nu pot ini�ializa GNOME"
+
+#~ msgid "init_bonobo(): could not initialize Bonobo"
+#~ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 
 #, fuzzy
 #~ msgid "_Configure..."
@@ -29392,9 +30183,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Copy selected messages"
 #~ msgstr "Copiaz� mesajele selectate"
 
-#~ msgid "Cut selected messages"
-#~ msgstr "Decupeaz� mesajele selectate"
-
 #, fuzzy
 #~ msgid "&lt;- _Remove"
 #~ msgstr "�te_rge"
@@ -29435,10 +30223,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ "A�tepta�i 5 secunde s� �ncerc din nou."
 
 #, fuzzy
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Utilitar de import Evolution"
-
-#, fuzzy
 #~ msgid "_Preferences..."
 #~ msgstr "Preferin�e sarcini..."
 
@@ -29565,9 +30349,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ "Data mesajului va fi comparat� indiferent dac�\n"
 #~ "filtrul ruleaz� sau dosarul v este deschis."
 
-#~ msgid "Evolution News Editor"
-#~ msgstr "Editor de �tiri Evolution"
-
 #~ msgid "Are you sure you want to delete this news account?"
 #~ msgstr "Sunte�i sigur c� dori�i s� �terge�i acest cont nou?"
 
@@ -29583,9 +30364,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "News Servers"
 #~ msgstr "Dosar _nou"
 
-#~ msgid "Source"
-#~ msgstr "Surs�"
-
 #~ msgid "Source Information"
 #~ msgstr "Informa�ie surs�"
 
@@ -29750,10 +30528,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgstr "Editez"
 
 #, fuzzy
-#~ msgid " New "
-#~ msgstr "Nou"
-
-#, fuzzy
 #~ msgid "Advanced Options"
 #~ msgstr "Op�iuni avansate LDAP "
 
@@ -30023,9 +30797,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "New Contact _List"
 #~ msgstr "List� contacte nou�"
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "Editare agend�"
-
 #~ msgid "Add Addressbook"
 #~ msgstr "Ad�ugare agend�"
 
@@ -30278,10 +31049,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgstr "(F�r� nume)"
 
 #, fuzzy
-#~ msgid "New List"
-#~ msgstr "List� nou�"
-
-#, fuzzy
 #~ msgid "Create a New All Day _Event"
 #~ msgstr "Creaz� un eveniment zilnic nou"
 
@@ -30934,9 +31701,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "_Task (FIXME)"
 #~ msgstr "_Sarcin� (FIXME)"
 
-#~ msgid "Save calendar"
-#~ msgstr "Salveaz� calendarul"
-
 #~ msgid "Delete all Occurrences"
 #~ msgstr "�terge toate apari�iile"
 
@@ -31138,9 +31902,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Inline attachment"
 #~ msgstr "Ata� inline"
 
-#~ msgid "Send as:"
-#~ msgstr "Timite ca:"
-
 #~ msgid "That file exists but is not readable."
 #~ msgstr "Acest fi�ier exist� dar nu se poate citi."
 
@@ -31329,9 +32090,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "_About..."
 #~ msgstr "_Despre..."
 
-#~ msgid "_Item (FIXME)"
-#~ msgstr "Art_icol (FIXME)"
-
 #~ msgid "_Journal Entry (FIXME)"
 #~ msgstr "Intrare _jurnal (FIXME)"
 
diff --git a/po/ru.po b/po/ru.po
index 3791b1bff7..2fdc6e319d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-ru\n"
-"POT-Creation-Date: 2003-02-04 12:25-0500\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-02-10 15:26+0200\n"
 "Last-Translator: Leonid Kanter <leon@asplinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -17,40 +17,52 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr "Фабрика для импорта файлов LDIF в Evolution."
+#: 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 в Evolution."
+#: 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 в 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."
-msgstr "Импортирует файлы VCard в 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:76 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:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "Основной"
 
@@ -60,16 +72,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:1744
+#: 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:1745
-#: addressbook/gui/contact-editor/e-contact-editor.c:1812
+#: 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 "Рабочий"
 
@@ -79,12 +92,12 @@ msgid "Bus"
 msgstr "Раб."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: 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:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "Компания"
 
@@ -95,12 +108,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:1751
-#: addressbook/gui/contact-editor/e-contact-editor.c:1813
+#: 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 "Организация"
@@ -111,18 +125,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:1755
+#: 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:1749
+#: 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:1747
+#: 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 "Рабочий факс"
@@ -132,13 +146,13 @@ msgid "Bus Fax"
 msgstr "Раб. факс"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: 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:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "Рабочий 2"
 
@@ -147,43 +161,43 @@ msgid "Bus 2"
 msgstr "Раб. 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: 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:1754
+#: 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:1756
-#: addressbook/gui/contact-editor/e-contact-editor.c:1814
+#: 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:1757
+#: 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:1758
+#: 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:1760
+#: 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:1761
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Телекс"
@@ -194,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:1787
+#: 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:1788
+#: 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"
@@ -226,6 +240,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 "Офис"
@@ -235,6 +250,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 "Заголовок"
@@ -249,6 +265,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 "Мeнеджер"
@@ -262,6 +279,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 "Псевдоним"
@@ -271,16 +289,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 календаря"
 
@@ -298,289 +319,377 @@ 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: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
 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
+msgid "Mailer"
+msgstr "Почтовый клиент"
+
+#: 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/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 "I"
+
+#: 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/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
-#: tools/evolution-launch-composer.c:344
+#: 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:3021
+#: 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:730
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+#, fuzzy
+msgid "Using Distinguished Name (DN)"
+msgstr "По отличительному имени (DN)"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "По почтовому адресу"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 msgid "Reconnecting to LDAP server..."
 msgstr "Повторное подключение к серверу LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1273
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr "Создание карточки на сервере LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1379
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr "Удаление карточки с сервера LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1615
-#: addressbook/backend/pas/pas-backend-ldap.c:1618
+#: 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:2932
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "Получение результатов поиска с сервера LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:3041
+#: 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 "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
-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 "Настройте здесь доступ к серверу каталогов LDAP"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr ""
-"Управляющий элемент, отображающий миникарточку адресной книги 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 "Компонент Evolution для просмотра миникарточек адресной книги"
+#: 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 "Интерфейс выбора имени в адресной книге Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Фабрика для управляющего элемента миникарточки адресной книги."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+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 "Компонент Evolution для просмотра миникарточек адресной книги"
 
-#: 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 "Компонент Evolution для просмотра миникарточек адресной книги"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
-msgid "Factory for the configuration controls for the Evolution Addressbook."
-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.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 "Компонент Evolution для просмотра миникарточек адресной книги"
 
-#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:630
-#: 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:1063
+#: 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
 msgid "Public Contacts"
 msgstr "Публичные контакты"
 
-#: 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:586
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Создать контакт"
 
-#: addressbook/gui/component/addressbook-component.c:586
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "Контакт"
 
-#: addressbook/gui/component/addressbook-component.c:587
-#: ui/evolution-addressbook.h:15
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Create a new contact"
 msgstr "Создание нового контакта"
 
-#: addressbook/gui/component/addressbook-component.c:590
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Создать список контактов"
 
-#: addressbook/gui/component/addressbook-component.c:590
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "Список _контактов"
 
-#: addressbook/gui/component/addressbook-component.c:591
+#: 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 "Не удается подключиться к серверу LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 msgid "Failed to authenticate with LDAP server"
 msgstr "Сбой аутентификации на сервере LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:239
+#: addressbook/gui/component/addressbook-config.c:259
 msgid "Could not perform query on Root DSE"
 msgstr "Не удается выполнить запрос в корневом DSE"
 
-#: 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 "Этот сервер не поддерживает информацию LDAPv3 schema"
 
-#: addressbook/gui/component/addressbook-config.c:1176
+#: addressbook/gui/component/addressbook-config.c:1215
 msgid "Error retrieving schema information"
 msgstr "Ошибка при загрузке информации schema"
 
-#: addressbook/gui/component/addressbook-config.c:1184
+#: addressbook/gui/component/addressbook-config.c:1223
 msgid "Server did not respond with valid schema information"
 msgstr "Сервер не отвечает корректной информацией schema"
 
-#: addressbook/gui/component/addressbook-config.c:1630
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "В этой сборке Evolution LDAP не поддерживается"
-
-#: 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
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "В этой сборке Evolution LDAP не поддерживается"
 
-#: 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."
@@ -588,7 +697,7 @@ msgstr ""
 "Не удается открыть эту адресную книгу. Проверьте, что путь существует\n"
 "и что у вас имеются необходимые права доступа."
 
-#: 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"
@@ -598,7 +707,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"
@@ -611,7 +720,7 @@ msgstr ""
 "установки OpenLDAP; получить его можно по приведенной\n"
 "ниже ссылке.\n"
 
-#: 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"
@@ -621,45 +730,48 @@ msgstr ""
 "что либо введен неверный URI, либо сервер \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 "Анонимное подключение к серверу LDAP"
 
-#: addressbook/gui/component/addressbook.c:625
+#: addressbook/gui/component/addressbook.c:667
 msgid "Failed to authenticate.\n"
 msgstr "Ошибка проверки подлинности.\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
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sВведите пароль для %s (пользователь %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
 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"
@@ -672,7 +784,7 @@ msgstr ""
 "поднимите ограничения для выдачи результатов в\n"
 "настройках сервера каталога для этой адресной книги."
 
-#: 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"
@@ -685,27 +797,27 @@ msgstr ""
 "поднимите ограничения времени в настройках сервера\n"
 "каталога для этой адресной книги."
 
-#: 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 "URI, отображаемый программой просмотра папок"
 
@@ -714,55 +826,54 @@ msgstr "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 "(нет)"
 
-#: 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:1786
+#: 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 "Включить очереди (Опасно!)"
 
@@ -777,8 +888,16 @@ msgid "  S_how Supported Bases "
 msgstr "  _Показывать поддерживаемые типы "
 
 #: 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"
@@ -793,59 +912,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 "<- _Удалить"
-
-#: addressbook/gui/component/ldap-config.glade.h:14
-msgid "<< Fewer Options"
-msgstr "<< Меньше параметров"
-
-#: 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 "Сервер LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
 msgstr "Источники адресных книг"
 
-#: addressbook/gui/component/ldap-config.glade.h:17 mail/mail-account-gui.c:58
+#: 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:18
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Anonymously"
 msgstr "Анонимно"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
-msgid "Associated LDAP Attribute"
-msgstr "Соответствующий атрибут LDAP"
-
-#: addressbook/gui/component/ldap-config.glade.h:20
-msgid "Attribute"
-msgstr "Атрибут"
-
-#: 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"
@@ -858,71 +954,57 @@ msgstr ""
 "\n"
 "Нажмите кнопку \"Готово\", чтобы сохранить изменения."
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
 msgstr "Подключение"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
-msgid "Corresponding Evolution Attribute"
-msgstr "Соответствующий атрибут Evolution"
-
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "DN Customization"
-msgstr "Настройка DN"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "_Удалить"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "Отличительное _имя (DN):"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: 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:31
-msgid "Evolution Attribute"
-msgstr "Атрибут 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 будет использовать это значение DN для проверки вашей подлинности "
 "на сервере"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "Evolution will use this email address to authenticate you with the server"
+#: 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:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Finished"
 msgstr "Готово"
 
-#: 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 "Общие"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "LDAP Attribute"
-msgstr "Атрибут LDAP"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "LDAP Configuration Assistant"
 msgstr "Помощник по настройке LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
-msgid "Mappings"
-msgstr "Переназначение полей"
-
-#: addressbook/gui/component/ldap-config.glade.h:39 mail/mail-account-gui.c:60
+#: 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: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"
@@ -937,58 +1019,26 @@ msgstr ""
 "Узнайте у вашего системного администратора, используются ли эти\n"
 "протоколы на вашем сервере LDAP "
 
-#: 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 "Классы объектов, используемые в Evolution:"
-
-#: 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 "Один"
 
-#: addressbook/gui/component/ldap-config.glade.h:47
-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: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"
@@ -998,7 +1048,7 @@ msgstr ""
 "вашим\n"
 "сервером LDAP только в том случае, если он поддерживает SSL or TLS."
 
-#: 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"
@@ -1015,7 +1065,7 @@ msgstr ""
 "вы и ваш сервер LDAP находятся за межсетевым экраном, то Evolution не будет\n"
 "использовать SSL/TLS, так как ваше соединение уже достаточно безопасно."
 
-#: 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"
@@ -1026,7 +1076,7 @@ msgstr ""
 "Выбор этой опции означает, что ваш сервер не поддерживает протоколы SSL\n"
 "и TLS . Это означает, что ваше соединение с сервером будет уязвимым для атак."
 
-#: 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"
@@ -1035,7 +1085,7 @@ msgstr ""
 "Выбор этой опции позволит вам изменить настройки Evolution по умолчанию\n"
 "для поисков LDAP и для создания и редактирования контактов."
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
@@ -1043,31 +1093,31 @@ msgstr ""
 "Указание отображаемого имени является последним шагом в настройке сервера "
 "LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 1: Server Information"
 msgstr "Шаг 1: Сведения о сервере"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Step 2: Connecting to Server"
 msgstr "Шаг 2: Подключение к серверу"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr "Шаг 3: Поиск в каталоге"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr "Шаг 4: Отображаемое имя"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr "Под"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Supported Search Bases"
 msgstr "Поддерживаемые базы поиска"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: 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"
@@ -1078,7 +1128,7 @@ msgstr ""
 "и вашей регистрационной информации. Если вы не уверены, что точно\n"
 "знаете все подробности, то узнайте их у вашего системного администратора."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1090,7 +1140,7 @@ msgstr ""
 "в ваших поисках, и как долго должен выполняться запрос. Спросите у \n"
 "вашего системного администратора, нужно ли вам изменять эти опции."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: 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,7 +1151,7 @@ msgstr ""
 "откуда начнется ваш поиск. Если вы оставите это поле пустым,\n"
 "то поиск начнется с корня дерева каталогов."
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: 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"
@@ -1115,7 +1165,7 @@ msgstr ""
 "под каталогом начала поиска. Глубина поиска \"one\" включает в себя\n"
 "элементы на один уровень ниже каталога начала поиска.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: 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"
@@ -1131,13 +1181,13 @@ msgstr ""
 "информации о нем. Если вы точно не знаете всех данных, то\n"
 "узнайте их у вашего системного администратора."
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Полное имя вашего сервера LDAP. Например: \"ldap.mycompany.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -1146,7 +1196,7 @@ msgstr ""
 "Максимальное число элементов для загрузки. Установка очень большого\n"
 "значения может серьезно замедлить работу вашей адресной книги."
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: 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 "
@@ -1156,7 +1206,7 @@ msgstr ""
 "что установка этого параметра в \"Адрес эл. почты\" требует анонимного "
 "доступа к вашему серверу LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: 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"
@@ -1165,7 +1215,7 @@ msgstr ""
 "Это имя сервера будет появляться в списке каталогов Evolution.\n"
 "Оно используется только для отображения."
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: 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"
@@ -1176,285 +1226,186 @@ msgstr ""
 "Список стандартных портов ранее уже был предоставлен. Спросите вашего\n"
 "системного администратора, какой из них вам необходимо использовать."
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: 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:100
-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"
-"требуемыми значениями для всех новых контактов, добавляемых\n"
-"в каталог на сервере LDAP."
-
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr "И_спользовать SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr "По отличительному имени (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using email address"
 msgstr "По почтовому адресу"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
+#: 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:107
-#: 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
-#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
+#: 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:108
-msgid "_Add ->"
-msgstr "_Добавить ->"
-
-#: addressbook/gui/component/ldap-config.glade.h:109
-msgid "_Add Mapping"
-msgstr "_Добавить переназначение"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-msgid "_Add to DN"
-msgstr "_Добавить к DN"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-msgid "_Always"
-msgstr "_Всегда"
-
-#: addressbook/gui/component/ldap-config.glade.h:112
-msgid "_Delete Mapping"
-msgstr "_Удалить переназначение"
-
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Display name:"
 msgstr "Показать имя:"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
-msgid "_Distinguished Name (DN):"
-msgstr "_Отличительное имя (DN)"
-
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_Don't use SSL/TLS"
-msgstr "_Не использовать SSL/TLS"
-
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr "Ограничение загрузки:"
 
-#: addressbook/gui/component/ldap-config.glade.h:117 filter/filter.glade.h:16
-#: mail/mail-config.glade.h:152 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.h:40
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Правка"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
-msgid "_Edit Mapping"
-msgstr "_Изменить переназначение"
-
-#: addressbook/gui/component/ldap-config.glade.h:119
-msgid "_Evolution attribute:"
-msgstr "_Атрибут Evolution:"
-
-#: addressbook/gui/component/ldap-config.glade.h:120
-msgid "_If necessary "
-msgstr "_Если необходимо"
-
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_LDAP attribute:"
-msgstr "Атрибут _LDAP:"
-
-#: addressbook/gui/component/ldap-config.glade.h:122
-msgid "_LDAP attributes:"
-msgstr "Атрибуты _LDAP:"
-
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr "_Метод подключения:"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
-msgid "_More Options >>"
-msgstr "_Больше параметров >>"
-
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Port number:"
 msgstr "_Номер порта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
-msgid "_Restore Defaults"
-msgstr "_Восстановить исходные параметры"
-
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Search base:"
 msgstr "_База поиска:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "Имя _сервера:"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Timeout (minutes):"
 msgstr "_Задержка (минут):"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
-msgid "account-druid"
-msgstr "мастер учетных записей"
-
-#: addressbook/gui/component/ldap-config.glade.h:131
-msgid "account-editor"
-msgstr "редактор учетных записей"
-
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "cards"
 msgstr "карточек"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "connecting-tab"
 msgstr "вкладка соединения"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
-msgid "dn-customization-tab"
-msgstr "вкладка определения DN"
-
-#: addressbook/gui/component/ldap-config.glade.h:135
-msgid "edit_server_window_simple"
-msgstr "edit_server_window_simple"
-
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "general-tab"
 msgstr "общая вкладка"
 
-#: addressbook/gui/component/ldap-config.glade.h:137
-msgid "mappings-tab"
-msgstr "вкладка отображения"
-
-#: addressbook/gui/component/ldap-config.glade.h:138
-msgid "objectclasses-tab"
-msgstr "вкладка классов объекта"
-
-#: addressbook/gui/component/ldap-config.glade.h:139
+#: 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
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
 msgstr "Интерфейс выбора имени в адресной книге 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
+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:707
-#: 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:509
+#: 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:572
+#: 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
-#: ui/evolution-addressbook.h:16
+#: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Найти"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "Выбрать имена"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "Selected Contacts:"
 msgstr "Выбранные контакты:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:5
 msgid "Show Contacts"
 msgstr "Показать контакты"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: 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:7
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Category:"
 msgstr "_Категория:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: 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 "Ка_тегории..."
@@ -1465,7 +1416,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 "Редактор контактов"
 
@@ -1474,7 +1425,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 "Сведения"
 
@@ -1516,1139 +1467,1187 @@ 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"
 
-#: 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:150
-#: 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 "URI публичного календаря:"
 
-#: 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 "Включить"
+
+#: 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 "Острова Heard и Макдональд"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr "Holy See"
 
-#: 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 "United States Minor Outlying Islands"
 
-#: 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
+#, fuzzy
+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
+#, fuzzy
+msgid "Card"
+msgstr "Автомобиль"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
+msgid "Is New Card"
 msgstr ""
-"Вы действительно хотите\n"
-"удалить этот контакт?"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "Удалить контакт?"
+#: 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 "Чад"
 
-#: 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
 msgid "Save Contact as VCard"
 msgstr "Сохранить как VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1762
+#: 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:2455
+#: 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 "Эл.адрес"
 
+#: 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:103
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:179
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 msgid "list"
 msgstr "список"
 
-#: 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"
@@ -2657,149 +2656,146 @@ 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 "Don't bother translating this string.  It's not used."
-
-#: 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 "Адрес _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 "Почтовый индекс:"
 
-#: 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 "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 "Имя:"
 
-#: 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: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 "Редактор списка контактов"
 
+#: 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"
 
@@ -2852,141 +2848,148 @@ 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 "Quimper"
+
+#: 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 "Молде"
+
 #: 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 "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: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 "Dinard"
+
+#: 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"
@@ -2995,116 +2998,132 @@ msgstr ""
 "Открытие %d карточек также откроет %d новых окон.\n"
 "Вы действительно хотите показать все эти карточки?"
 
-#: 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 "Множество 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
 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 "Настройка 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
-#: ui/evolution-addressbook.h:18 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
+#: 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.h:20 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: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 "Текущий вид"
 
@@ -3112,7 +3131,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,А Б,В Г,Д Е,Ж З,И К,Л М,Н О,П Р,С Т,У Ф,Х Ц,Ч Ш,Щ Э,Ю Я"
 
@@ -3120,11 +3139,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"
@@ -3195,20 +3214,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
 msgid ""
 "\n"
 "\n"
@@ -3222,7 +3282,7 @@ msgstr ""
 "\n"
 "Дважды щелкните здесь, чтобы создать новый контакт."
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 msgid ""
 "\n"
 "\n"
@@ -3232,21 +3292,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 "Напечатать карточку"
 
@@ -3319,7 +3399,6 @@ msgid "Include:"
 msgstr "Включить:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Альбом"
 
@@ -3339,17 +3418,16 @@ msgstr "Поля"
 msgid "Number of columns:"
 msgstr "Число столбцов:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: 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 "Страница"
 
@@ -3365,9 +3443,7 @@ msgstr "Бумага"
 msgid "Paper source:"
 msgstr "Источник бумаги:"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Портрет"
 
@@ -3427,43 +3503,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 "Не удается прочитать блок приложения календарь Пилота"
 
@@ -3471,84 +3671,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 "Управляющий элемент 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
 msgid "Calendar and Tasks"
 msgstr "Календарь и задачи"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-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 "Компонент для просмотра календаря iTip/iMip календаря Evolution"
-
-#: 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:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Календарь и задачи"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Evolution Tasks control"
-msgstr "Фабрика для управляющего элемента Evolution Задачи"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Компонент Executive Summary календаря программы Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the calendar iTip view control"
-msgstr "Фабрика для управляющего элемента просмотра iTip календаря"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Компонент Executive Summary календаря программы Evolution."
 
-#: 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:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Компонент для просмотра календаря iTip/iMip календаря Evolution"
 
-#: 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 "Компонент для просмотра календаря iTip/iMip календаря 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:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Редактор новостей 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 "Редактор новостей 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
+#, fuzzy
+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
 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"
@@ -3570,11 +3762,17 @@ msgstr "Напомнить через (минут)"
 msgid "_Edit appointment"
 msgstr "Правка встречи"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:681
+#: 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: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"
@@ -3586,13 +3784,7 @@ msgstr ""
 "Вместо этого Evolution отобразит нормальный диалог\n"
 "напоминания."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:760
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2924
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Предупреждение"
-
-#: calendar/gui/alarm-notify/alarm-queue.c:765
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3609,15 +3801,15 @@ msgstr ""
 "\n"
 "Вы действительно хотите запустить эту программу?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:779
+#: 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 "Не удается инициализировать 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 "Не удается создать фабрику сервиса уведомления о сигнале"
 
@@ -3633,106 +3825,195 @@ 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"
 
 #: calendar/gui/calendar-commands.c:799
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
 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
+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 "Новая ежедневная встреча"
+
+#: calendar/gui/calendar-component.c:745
+msgid "All _Day Appointment"
+msgstr "Еже_дневная встреча"
+
+#: calendar/gui/calendar-component.c:746
+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"
@@ -3743,331 +4024,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:468 mail/mail-config.glade.h:79
-#: 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:569
-#: calendar/gui/e-meeting-model.c:863
+#: 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:864
+#: 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:1372
-#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1055
-msgid "Calendar"
-msgstr "Календарь"
-
-#: calendar/gui/component-factory.c:72
-msgid "Folder containing appointments and events"
-msgstr "Папка, содержащая встречи и события"
-
-#: calendar/gui/component-factory.c:76
-msgid "Public Calendar"
-msgstr "Публичный календарь"
-
-#: calendar/gui/component-factory.c:77
-msgid "Public folder containing appointments and events"
-msgstr "Публичная папка, содержащая встречи и события"
-
-#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:738
-#: 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:1059
-msgid "Tasks"
-msgstr "Задачи"
-
-#: calendar/gui/component-factory.c:82
-msgid "Folder containing to-do items"
-msgstr "Папка содержащая элементы \"Выполнить\""
-
-#: calendar/gui/component-factory.c:86
-msgid "Public Tasks"
-msgstr "Общие задачи"
-
-#: calendar/gui/component-factory.c:87
-msgid "Public folder containing to-do items"
-msgstr "Общая папка, содержащая элементы для выполнения"
-
-#: calendar/gui/component-factory.c:750
-msgid "New appointment"
-msgstr "Новая встреча"
-
-#: calendar/gui/component-factory.c:750
-msgid "_Appointment"
-msgstr "_Встреча"
-
-#: calendar/gui/component-factory.c:751
-msgid "Create a new appointment"
-msgstr "Создать новую встречу"
-
-#: calendar/gui/component-factory.c:755
-msgid "New meeting"
-msgstr "Новое собрание"
-
-#: calendar/gui/component-factory.c:755
-msgid "_Meeting"
-msgstr "_Собрание"
-
-#: calendar/gui/component-factory.c:756
-msgid "Create a new meeting request"
-msgstr "Создать новое приглашение на собрание"
-
-#: calendar/gui/component-factory.c:760
-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
-msgid "New All Day Appointment"
-msgstr "Новая ежедневная встреча"
+#: calendar/gui/comp-editor-factory.c:456
+#, fuzzy
+msgid "Error while opening the calendar"
+msgstr "Ошибка при подключении к серверу календаря"
 
-#: calendar/gui/component-factory.c:765
-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
-msgid "Create a new all-day appointment"
-msgstr "Создать новую ежедневную встречу"
+#: calendar/gui/comp-editor-factory.c:473
+#, fuzzy
+msgid "Permission denied to open the calendar"
+msgstr "Отказ в доступе"
 
-#: calendar/gui/control-factory.c:123
+#: calendar/gui/control-factory.c:119
 #, 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 ""
-"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: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 "Отправить почту"
-
-#: 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"
@@ -4078,46 +4183,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 "Отправить почту"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1027 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:182
+#: 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 "начало встречи"
 
@@ -4166,8 +4288,8 @@ msgid "Days"
 msgstr "Дней"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1135
-#: calendar/gui/e-itip-control.c:655
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr "Пятница"
 
@@ -4180,8 +4302,8 @@ msgid "Minutes"
 msgstr "Минут"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1131
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr "Понедельник"
 
@@ -4190,8 +4312,8 @@ msgid "S_un"
 msgstr "Вск"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1136
-#: calendar/gui/e-itip-control.c:656
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr "Суббота"
 
@@ -4204,8 +4326,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/e-itip-control.c:650
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
 msgid "Sunday"
 msgstr "Воскресенье"
 
@@ -4222,8 +4344,8 @@ msgid "Task List"
 msgstr "Список задач"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1134
-#: calendar/gui/e-itip-control.c:654
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr "Четверг"
 
@@ -4240,8 +4362,8 @@ msgid "Time format:"
 msgstr "Формат времени:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1132
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr "Вторник"
 
@@ -4250,8 +4372,8 @@ msgid "W_eek starts:"
 msgstr "Начало недели:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1133
-#: calendar/gui/e-itip-control.c:653
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr "Среда"
 
@@ -4293,7 +4415,7 @@ msgid "_Fri"
 msgstr "Пят"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "Общие"
 
@@ -4333,18 +4455,18 @@ 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?"
@@ -4352,11 +4474,11 @@ 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?"
@@ -4364,133 +4486,134 @@ 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-page.c:414
+#: calendar/gui/dialogs/comp-editor-page.c:409
 #, c-format
 msgid "Validation error: %s"
 msgstr "Ошибка проверки: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
+#: 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
 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
 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
+#, fuzzy
+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 "Не удается применить текущую версию!"
 
@@ -4548,103 +4671,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:435
+#: 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:438 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:662 calendar/gui/dialogs/task-page.c:567
+#: 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:672
+#: calendar/gui/dialogs/event-page.c:610
 msgid "End date is wrong"
 msgstr "Неверная дата завершения"
 
-#: calendar/gui/dialogs/event-page.c:695
+#: calendar/gui/dialogs/event-page.c:633
 msgid "Start time is wrong"
 msgstr "Неверное время начала"
 
-#: calendar/gui/dialogs/event-page.c:702
+#: 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 "Коне_ц:"
@@ -4653,19 +4771,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 "Доверить..."
 
@@ -4705,16 +4827,11 @@ msgid "Member"
 msgstr "Участник"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1151
+#: 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
@@ -4722,13 +4839,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:"
@@ -4739,114 +4849,83 @@ 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
-#: calendar/gui/e-itip-control.c:603 calendar/gui/e-itip-control.c:623
-#: calendar/gui/e-itip-control.c:633
-msgid "st"
-msgstr "й"
-
-#: calendar/gui/dialogs/recurrence-page.c:127
-#: calendar/gui/dialogs/recurrence-page.c:147
-#: calendar/gui/e-itip-control.c:604 calendar/gui/e-itip-control.c:624
-msgid "nd"
-msgstr "й"
-
-#: calendar/gui/dialogs/recurrence-page.c:128
-#: calendar/gui/dialogs/recurrence-page.c:148
-#: calendar/gui/e-itip-control.c:605 calendar/gui/e-itip-control.c:625
-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
-#: calendar/gui/e-itip-control.c:606 calendar/gui/e-itip-control.c:607
-#: calendar/gui/e-itip-control.c:608 calendar/gui/e-itip-control.c:609
-#: calendar/gui/e-itip-control.c:610 calendar/gui/e-itip-control.c:611
-#: calendar/gui/e-itip-control.c:612 calendar/gui/e-itip-control.c:613
-#: calendar/gui/e-itip-control.c:614 calendar/gui/e-itip-control.c:615
-#: calendar/gui/e-itip-control.c:616 calendar/gui/e-itip-control.c:617
-#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:619
-#: calendar/gui/e-itip-control.c:620 calendar/gui/e-itip-control.c:621
-#: calendar/gui/e-itip-control.c:622 calendar/gui/e-itip-control.c:626
-#: calendar/gui/e-itip-control.c:627 calendar/gui/e-itip-control.c:628
-#: calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:630
-#: calendar/gui/e-itip-control.c:631 calendar/gui/e-itip-control.c:632
-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
+#, 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:898
-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: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
 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 "случаи"
 
@@ -4910,24 +4989,24 @@ 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:420
+#: calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr "Дата выполнения некорректна"
 
@@ -4941,44 +5020,38 @@ 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:575 calendar/gui/e-meeting-model.c:876
-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.c:540
+#: 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:1081
+#: 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:"
@@ -4988,135 +5061,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 "%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 "%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
 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 "_Переслать как iCalendar"
 
-#: 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:1278 calendar/gui/e-day-view.c:7586
-#: calendar/gui/e-week-view.c:4241
+#: 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:1361
+#: calendar/gui/e-calendar-table.c:1327
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Щёлкните здесь, чтобы добавить задачу"
@@ -5125,8 +5295,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 "Выполнено"
 
@@ -5155,8 +5325,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:1047
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
+#: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Сводка"
 
@@ -5164,19 +5334,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, %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"
 
@@ -5191,205 +5357,205 @@ 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
 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 "_Переслать как iCalendar..."
 
-#: 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:684
+#: calendar/gui/e-itip-control.c:704
 msgid "Yes. (Complex Recurrence)"
 msgstr "Да. (Сложное повторение)"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:716
 msgid "Every day"
 msgstr "Каждый день"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:718
 #, c-format
 msgid "Every %d days"
 msgstr "Каждые %d дня(дней)"
 
-#: calendar/gui/e-itip-control.c:704
+#: calendar/gui/e-itip-control.c:724
 msgid "Every week"
 msgstr "Каждую неделю"
 
-#: calendar/gui/e-itip-control.c:706
+#: calendar/gui/e-itip-control.c:726
 #, c-format
 msgid "Every %d weeks"
 msgstr "Каждые %d недели(недель)"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:729
 msgid "Every week on "
 msgstr "Каждую неделю в "
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:731
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Каждые %d недели(недель) в "
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:739
 msgid " and "
 msgstr " и "
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:746
 #, c-format
 msgid "The %s day of "
 msgstr "%s дней "
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:759
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
-#: calendar/gui/e-itip-control.c:744
+#: calendar/gui/e-itip-control.c:764
 msgid "every month"
 msgstr "каждый месяц"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:769
 #, c-format
 msgid "every %d months"
 msgstr "каждые %d месяца(ев)"
 
-#: calendar/gui/e-itip-control.c:755
+#: calendar/gui/e-itip-control.c:775
 msgid "Every year"
 msgstr "Каждый год"
 
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every %d years"
 msgstr "Каждые %d года(лет)"
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:789
 #, c-format
 msgid " a total of %d times"
 msgstr " всего %d раз"
 
-#: calendar/gui/e-itip-control.c:777
+#: calendar/gui/e-itip-control.c:797
 msgid ", ending on "
 msgstr ", заканчивается на"
 
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr "<b>Начинается:</b> "
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:831
 msgid "<b>Ends:</b> "
 msgstr "<b>Заканчивается:</b>"
 
-#: calendar/gui/e-itip-control.c:831
+#: calendar/gui/e-itip-control.c:851
 msgid "<b>Completed:</b> "
 msgstr "<b>Выполнено:</b>"
 
-#: calendar/gui/e-itip-control.c:841
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr "<b>К:</b> "
 
-#: calendar/gui/e-itip-control.c:878 calendar/gui/e-itip-control.c:928
+#: 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:893
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr "Ошибка iCalendar"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/e-itip-control.c:975
-#: calendar/gui/e-itip-control.c:986 calendar/gui/e-itip-control.c:1003
+#: 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:1010
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5397,339 +5563,340 @@ msgstr ""
 "<b> Пересмотрите следующую информацию и выберите действие из расположенного "
 "ниже меню."
 
-#: calendar/gui/e-itip-control.c:1025
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Нет</i>"
 
-#: calendar/gui/e-itip-control.c:1035
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "Расположение:"
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr "Состояние:"
 
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:877
-#: 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:1058 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:1062 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:878
-#: 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:1066 calendar/gui/e-itip-control.c:1272
-#: 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:835
-#: calendar/gui/e-meeting-model.c:851 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:901 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:1119 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
+#: 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:1120
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Обновить"
 
-#: calendar/gui/e-itip-control.c:1121 calendar/gui/e-itip-control.c:1152
-#: calendar/gui/e-itip-control.c:1175 calendar/gui/e-itip-control.c:1188
+#: 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
-#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
+#: 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:1148
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr "Принять"
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Принять экспериментально"
 
-#: calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Отклонить"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Отправить информацию о занятости"
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Обновить состояние"
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Отправить последнюю информацию"
 
-#: calendar/gui/e-itip-control.c:1213 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:1294
+#: 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:1295
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Информация о встрече"
 
-#: calendar/gui/e-itip-control.c:1300
+#: 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:1302
+#: 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:1303
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Предложение собрания"
 
-#: calendar/gui/e-itip-control.c:1307
+#: 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:1308
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Обновление собрания"
 
-#: calendar/gui/e-itip-control.c:1312
+#: 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:1313
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "Запрос обновления собрания"
 
-#: calendar/gui/e-itip-control.c:1320
+#: 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:1321
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Ответ собрания"
 
-#: calendar/gui/e-itip-control.c:1328
+#: 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:1329
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Отмена собрания"
 
-#: calendar/gui/e-itip-control.c:1336 calendar/gui/e-itip-control.c:1403
-#: calendar/gui/e-itip-control.c:1438
+#: 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:1337
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Неверное сообщение собрания"
 
-#: calendar/gui/e-itip-control.c:1361
+#: 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:1362
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Информация о задаче"
 
-#: calendar/gui/e-itip-control.c:1367
+#: 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:1369
+#: 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:1370
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Предложение задачи"
 
-#: calendar/gui/e-itip-control.c:1374
+#: 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:1375
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Обновление задачи"
 
-#: calendar/gui/e-itip-control.c:1379
+#: 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:1380
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Запрос обновления задачи"
 
-#: calendar/gui/e-itip-control.c:1387
+#: 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:1388
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Ответ собрания"
 
-#: calendar/gui/e-itip-control.c:1395
+#: 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:1396
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Отмена задачи"
 
-#: calendar/gui/e-itip-control.c:1404
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Сообщение календаря"
 
-#: calendar/gui/e-itip-control.c:1423
+#: 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:1424
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Информация о занятости"
 
-#: calendar/gui/e-itip-control.c:1428
+#: 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:1429
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Запрос информации о занятости"
 
-#: calendar/gui/e-itip-control.c:1433
+#: 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:1434
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Ответ занятости"
 
-#: calendar/gui/e-itip-control.c:1439
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Неверное сообщение о занятости"
 
-#: calendar/gui/e-itip-control.c:1513
+#: calendar/gui/e-itip-control.c:1541
 msgid "The message does not appear to be properly formed"
 msgstr "Похоже что сообщение не было правильно сформировано"
 
-#: calendar/gui/e-itip-control.c:1575
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "Это сообщение содержит только неподдерживаемые запросы"
 
-#: calendar/gui/e-itip-control.c:1603 calendar/gui/e-itip-control.c:1609
+#: 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:1634
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "Вложение не содержит пригодных для просмотра элементов календаря."
 
-#: calendar/gui/e-itip-control.c:1856 calendar/gui/e-itip-control.c:1948
+#: 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:1859 calendar/gui/e-itip-control.c:1951
+#: 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:1862 calendar/gui/e-itip-control.c:1954
+#: 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:1865
+#: 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:1868
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Обновление закончено\n"
 
-#: calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "Файл календаря не может быть обновлён!\n"
 
-#: calendar/gui/e-itip-control.c:1900 calendar/gui/e-itip-control.c:1966
+#: 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:1921
+#: 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:1933
+#: 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:1957
+#: 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:1960
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Статус участника обновлён!\n"
 
-#: calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "Статус участника не может быть обновлён!\n"
 
-#: calendar/gui/e-itip-control.c:1998
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Удаление завершено"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: 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:2030 calendar/gui/e-itip-control.c:2082
+#: 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:2155
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr "Выбрать папку календаря"
 
-#: calendar/gui/e-itip-control.c:2162
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr "Выбрать папку Заданий"
 
@@ -5770,180 +5937,185 @@ 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:1764
+#: 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:565 calendar/gui/e-meeting-model.c:831
+#: 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:832
+#: 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:833
+#: 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:834
+#: 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:847
+#: 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:567 calendar/gui/e-meeting-model.c:848
+#: 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:849
+#: 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:850
+#: 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:879 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:880
+#: 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 "Вне офиса"
 
-#: 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:358 calendar/gui/gnome-cal.c:2036
-#: calendar/gui/gnome-cal.c:2047
+#: 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:387 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:402
+#: 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:416 calendar/gui/gnome-cal.c:1561
+#: 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:484 calendar/gui/gnome-cal.c:1765
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5952,11 +6124,11 @@ msgstr ""
 "Ошибка в \"%s\":\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:556
+#: calendar/gui/e-tasks.c:554
 msgid "Completing tasks..."
 msgstr "Завершение выполнения задач..."
 
-#: calendar/gui/e-tasks.c:579
+#: calendar/gui/e-tasks.c:577
 msgid "Deleting selected objects..."
 msgstr "Удаление выделенных объектов..."
 
@@ -5964,26 +6136,26 @@ msgstr "Удаление выделенных объектов..."
 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:1533
+#: calendar/gui/gnome-cal.c:1503
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Не удается открыть папку \"%s\""
 
-#: calendar/gui/gnome-cal.c:1547
+#: calendar/gui/gnome-cal.c:1517
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Метод, необходимый для открытия \"%s\", не поддерживается"
 
-#: calendar/gui/gnome-cal.c:1593
+#: calendar/gui/gnome-cal.c:1563
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Добавление сигналов для %s"
 
-#: calendar/gui/gnome-cal.c:1786
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5994,7 +6166,7 @@ msgstr ""
 "%s.\n"
 "Необходимо перезапустить Evolution."
 
-#: calendar/gui/gnome-cal.c:1791
+#: calendar/gui/gnome-cal.c:1764
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6005,12 +6177,12 @@ msgstr ""
 "%s.\n"
 "Необходимо перезапустить Evolution."
 
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/gnome-cal.c:1995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Открытие календаря %s"
 
-#: calendar/gui/gnome-cal.c:2058
+#: calendar/gui/gnome-cal.c:2035
 msgid "Opening default tasks folder"
 msgstr "Открытие папки заданий по умолчанию"
 
@@ -6070,314 +6242,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:595
+#: 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:589
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Информация о занятости (%s в %s)"
 
-#: calendar/gui/itip-utils.c:601
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "Информация iCalendar"
 
-#: calendar/gui/itip-utils.c:759
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Вы должны быть участником события."
 
-#: calendar/gui/main.c:70
-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 "Cб"
 
 #. 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:3216
-#: 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
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6389,86 +6420,51 @@ msgstr ""
 "\n"
 "Действительно уничтожить эти задания?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2696
-#: mail/mail-callbacks.c:2938
+#: 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 ""
-"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: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"
-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.oaf.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.oaf.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:168
-#, 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:180
-#, 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: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?"
@@ -6476,10 +6472,14 @@ msgstr ""
 "Evolution обнаружены файлы календаря Gnome.\n"
 "Хотите импортировать их в Evolution?"
 
-#: calendar/importers/icalendar-importer.c:729
+#: 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 "time-now не предполагает аргументов"
@@ -8121,27 +8121,37 @@ msgstr "Pacific/Wallis"
 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
 msgid "Unable to create cache path"
 msgstr "Не удается создать путь для кэша"
 
-#: camel/camel-data-cache.c:443
+#: camel/camel-data-cache.c:370
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Не удается удалить кэшированный элемент: %s: %s"
@@ -8181,84 +8191,91 @@ msgstr "Подготовка папки \"%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
+#, 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 "Не удается открыть папку спула"
 
-#: 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 "Получение сообщения %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
 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
-#, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Сбой при создании канала к \"%s\": %s"
-
-#: camel/camel-filter-search.c:550
-#, c-format
-msgid "Failed to 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"
@@ -8267,7 +8284,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"
@@ -8276,11 +8293,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 "Запрашивается неизвестный заголовок: %s"
@@ -8309,7 +8326,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"
@@ -8320,15 +8337,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:711
+#: camel/camel-gpg-context.c:738
 msgid "Failed to parse gpg userid hint."
 msgstr "Ошибка при обработке подсказки gpg userid."
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:761
 msgid "Failed to parse gpg passphrase request."
 msgstr "Ошибка при обработке запроса парольной фразы gpg."
 
-#: 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"
@@ -8337,36 +8354,36 @@ msgstr ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 
-#: 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 ""
 "Сбой при разблокировании секретного ключа: указано 3 некорректных парольных "
 "фразы."
 
-#: camel/camel-gpg-context.c:777
+#: camel/camel-gpg-context.c:804
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неожиданный ответ от GnuPG: %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
 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 ""
@@ -8374,23 +8391,24 @@ msgstr ""
 "\n"
 "%.*s"
 
-#: camel/camel-gpg-context.c:1088
-#, c-format
-msgid "Failed to GPG %s message: %s\n"
+#: camel/camel-gpg-context.c:1131
+#, fuzzy, c-format
+msgid "Failed to GPG %s: %s\n"
 msgstr "Сбой при кодировании GPG %s сообщения: %s\n"
 
-#: camel/camel-gpg-context.c:1197
+#: 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: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 "Сбой при исполнении gpg."
 
-#: 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 ""
@@ -8416,25 +8434,24 @@ msgstr "Не удается заблокировать \"%s\": ошибка пр
 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 "Не удается получить блокировку используя 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 "Не удается получить блокировку используя flock(2): %s"
@@ -8444,51 +8461,51 @@ msgstr "Не удается получить блокировку использ
 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 "Не удается запустить: %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"
@@ -8505,26 +8522,26 @@ msgstr "Сбой при декодировании части MIME: некорр
 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 "Ошибка обработки"
 
-#: 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: в модуле нет инициализирующего кода."
@@ -8580,11 +8597,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."
@@ -8592,39 +8609,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 "Ответ сервера слишком длинный (>2048 байт)\n"
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr "Недопустимый ответ сервера\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 "Ответ сервера содержит недопустимый жетон \"Качество защиты\"\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"
@@ -8633,11 +8726,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
 msgid "Login"
 msgstr "Регистрация"
@@ -8688,7 +8776,7 @@ msgstr "POP до SMTP авторизация, используя неизвес�
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP до 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"
@@ -8708,35 +8796,35 @@ 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
 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 "Сбой поиска узла: неизвестная причина"
 
@@ -8748,12 +8836,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"
@@ -8762,168 +8850,168 @@ 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
 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 "Не удается проверить листовую подпись"
 
-#: 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:805
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8936,15 +9024,15 @@ msgstr ""
 "Отпечаток:         %s\n"
 "Подпись:           %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:811
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr "GOOD"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:811
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr "BAD"
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8963,7 +9051,7 @@ msgstr ""
 "Принять сертификат в любом случае?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:815
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8978,7 +9066,7 @@ msgstr ""
 "\n"
 "Всё равно принять?"
 
-#: camel/camel-tcp-stream-ssl.c:859
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -8987,7 +9075,7 @@ msgstr ""
 "Проблема с сертификатом: %s\n"
 "Поставщик: %s"
 
-#: camel/camel-tcp-stream-ssl.c:911
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -8996,7 +9084,7 @@ msgstr ""
 "Некорректный домен сертификата: %s\n"
 "Поставщик: %s"
 
-#: camel/camel-tcp-stream-ssl.c:929
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9005,7 +9093,7 @@ msgstr ""
 "Истек срок действия сертификата: %s\n"
 "Поставщик: %s"
 
-#: camel/camel-tcp-stream-ssl.c:946
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9014,7 +9102,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\""
@@ -9029,39 +9117,39 @@ 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: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:2656
+#: 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:2659
+#: camel/providers/imap/camel-imap-store.c:2645
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Сервер неожиданно отключился: %s"
@@ -9086,52 +9174,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
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Не удается получить сообщение: %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"
@@ -9140,24 +9228,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."
 
@@ -9187,7 +9275,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 "Папки"
 
@@ -9218,7 +9306,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:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr "Пароль"
 
@@ -9238,58 +9326,57 @@ 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
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Не удается подключиться к серверу IMAP %s в защищенном режиме:%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: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 "%sPlease enter the IMAP password for %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"
@@ -9300,23 +9387,24 @@ 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 "Нет такой папки %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\""
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Имя папки \"%s\" некорректно, так как содержит символ \"%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 "Неизвестная родительская папка: %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 "Эта папка не может содержать подпапки"
 
@@ -9394,8 +9482,8 @@ msgstr ""
 "папок в стиле Elm, Pine или Mutt."
 
 #: 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"
@@ -9407,36 +9495,36 @@ msgstr "Хранилище %s не является каталогом"
 
 #: 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 "Локальное хранилище не имеет папки Входящие"
 
-#: 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"
 
-#: 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
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Не удается переименовать \"%s\": %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"
@@ -9446,7 +9534,7 @@ msgstr "Не удается удалить индексный файл папк�
 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 "Не удается добавить сообщение к краткой информации: причина неизвестна"
 
@@ -9459,14 +9547,14 @@ msgstr "Добавление сообщения к папке почтового
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Не удается добавить сообщение к папке почтового каталога: %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"
@@ -9478,14 +9566,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"
@@ -9500,68 +9588,68 @@ msgid "`%s' is not a maildir directory."
 msgstr "\"%s\" не является почтовым каталогом."
 
 #: 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 "не является почтовым каталогом"
 
 #: 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\": %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 "Не удается открыть путь к папке почтового каталога: %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 "Сохранение папки"
 
-#: 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 "Не удается открыть почтовый ящик: %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"
@@ -9570,11 +9658,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 "Сбой при создании сообщения: почтовый ящик поврежден?"
 
@@ -9617,75 +9705,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 "Не удается открыть временный почтовый ящик: %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
 #, 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 "Ошибка записи во временный почтовый ящик: %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 "Сбой записи во временный почтовый ящик: %s: %s"
@@ -9704,67 +9792,67 @@ msgstr "Не удается добавить сообщение к папке mh
 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
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Не удается открыть спул \"%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 "Спул \"%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:176
+#: 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:193
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr "Хранилище не поддерживает INBOX"
 
-#: 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"
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Дерево папки спула %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 "Не удается синхронизировать временную папку %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 "Не удается синхронизировать папку спула: %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 ""
@@ -9780,7 +9868,8 @@ msgstr "Новости USENET"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "Это провайдер для чтения и отправки сообщений в группы новостей USENET."
+msgstr ""
+"Это провайдер для чтения и отправки сообщений в группы новостей USENET."
 
 #: camel/providers/nntp/camel-nntp-store.c:151
 #, c-format
@@ -9845,42 +9934,42 @@ 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
 msgid "User cancelled"
 msgstr "Отменено пользователем"
 
-#: 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 "Не удается получить общие данные POP: %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 "Получение сообщения %d по POP"
 
-#: 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 "Не удается получить сообщение %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
 msgid "Unknown reason"
 msgstr "Неизвестная причина"
 
@@ -9897,7 +9986,7 @@ msgstr "Сохранять сообщения на сервере"
 msgid "Delete after %s day(s)"
 msgstr "Удалять через %s дней"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr "POP"
 
@@ -9924,25 +10013,25 @@ msgstr ""
 "пароля по протоколу APOP. Это может работать не для всех пользователей даже "
 "на серверах, якобы поддерживающих его."
 
-#: 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 "
@@ -9951,28 +10040,28 @@ msgstr ""
 "Не удается подключиться к серверу POP %s: Не поддерживается затребованный "
 "механизм идентификации."
 
-#: 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 "%sPlease enter the POP password for %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
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9981,13 +10070,13 @@ msgstr ""
 "Не удается подключиться к серверу POP%s.\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:111
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9997,49 +10086,49 @@ msgid ""
 "system."
 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:103
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10049,135 +10138,137 @@ msgstr ""
 "Для доставки почты с помощью подключения к удалённому почтовому узлу по "
 "протоколу 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>"
+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 "Запрошенное действие с почтой не выполнено: почтовый ящик недоступен"
 
-#: 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 "Пользователь не локальный; установите <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 "Запрошенное действие не выполнено: недостаточно места в системном хранилище"
+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 "Начало ввода почты; окончание после <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 "Ошибка при ответе на приветствие"
 
-#: 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 "%sPlease enter the SMTP password for %s@%s"
@@ -10207,7 +10298,7 @@ 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 "Отправка сообщения"
 
@@ -10218,63 +10309,64 @@ msgstr "Не удается отправить сообщение: не опре
 #: camel/providers/smtp/camel-smtp-transport.c:713
 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
 #, 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 "Превышено время ожидания ответа на запрос 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
 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: почта не отправлена"
@@ -10282,78 +10374,78 @@ msgstr "Превышено время ожидания ответа на 'DATA':
 #. 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"
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:102
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:113
+#: 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:371 mail/mail-display.c:227
+#: 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: не обычный файл"
@@ -10371,11 +10463,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 "Щёлкните здесь, чтобы создать адресную книгу"
 
@@ -10386,45 +10482,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."
@@ -10435,24 +10531,25 @@ 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.h:26 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
 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"
@@ -10461,34 +10558,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"
@@ -10497,7 +10590,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"
@@ -10506,7 +10599,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"
@@ -10515,7 +10617,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?"
@@ -10523,7 +10625,7 @@ msgstr ""
 "Обнаружены несохранённые файлы предыдущей сессии.\n"
 "Произвести попытку восстановления?"
 
-#: composer/e-msg-composer.c:1525
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10534,27 +10636,32 @@ 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
 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."
@@ -10562,7 +10669,7 @@ msgstr ""
 "Не удается создать окно редактора:\n"
 "Не удается активировать управляющий элемент выбора адреса."
 
-#: 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"
@@ -10574,7 +10681,7 @@ msgstr ""
 "Убедитесь, что у вас установлены необходимые\n"
 "версии пакетов gtkhtml и libgtkhtml.\n"
 
-#: 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."
@@ -10582,7 +10689,7 @@ msgstr ""
 "Не удается создать окно редактора:\n"
 "Не удается активировать компонент редактора HTML."
 
-#: composer/e-msg-composer.c:3860
+#: composer/e-msg-composer.c:4005
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10590,16 +10697,6 @@ msgstr ""
 "<b>(Содержимое редактора не является простым текстом и не может "
 "корректироваться.)<b>"
 
-#: composer/evolution-composer.c:394
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr "Не удается создать окно редактора - не настроен почтовый компонент."
-
-#: composer/evolution-composer.c:413
-msgid "Cannot initialize the Evolution composer."
-msgstr "Не удается инициализировать редактор Evolution."
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Набор приложений групповой работы Evolution"
@@ -10648,11 +10745,112 @@ msgstr "Тема содержит"
 msgid "Subject does not contain"
 msgstr "Тема не содержит"
 
-#: e-util/e-component-listener.c:135
-msgid "ping_timeout_callback: could not determine if the CORBA object is nil or not"
-msgstr "ping_timeout_callback: не удается определить, пуст или нет объект CORBA"
+#: 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 "Отправка эл.почты"
 
-#: e-util/e-dialog-utils.c:241 mail/mail-callbacks.c:2563
+#: 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 ""
+"ping_timeout_callback: не удается определить, пуст или нет объект CORBA"
+
+#: e-util/e-dialog-utils.c:247
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10660,208 +10858,236 @@ 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
 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 %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:183
-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 "%d %s назад"
+
+#: filter/filter-datespec.c:69
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 неделя"
+
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d недель"
 
-#: filter/filter-datespec.c:75
-msgid "month"
+#: 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 "%d %s назад"
 
-#: 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 "%d %s назад"
 
-#: 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
 msgid "%d-%b-%Y"
 msgstr "%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 "%d %s назад"
-
-#: 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
+#, fuzzy
+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 "Файл \"%s\" не существует или не является обычным файлом."
 
-#: 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
+#, fuzzy
+msgid "You must specify a folder."
 msgstr "Необходимо указать папку.\n"
 
-#: 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"
@@ -10870,74 +11096,72 @@ msgstr ""
 "Ошибка в регулярном выражении \"%s\":\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
-#: mail/mail-config.glade.h:64
+#: 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:135
+#: 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:88
+#: 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:126
+#: 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:68
+#: 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 "исходящие"
 
@@ -10985,7 +11209,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 "Виртуальные папки"
 
@@ -10997,6 +11221,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 "только указанные папки"
@@ -11013,6 +11245,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 "со всеми активными удалёнными папками"
@@ -11025,6 +11261,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"
@@ -11150,7 +11390,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 "Надпись"
 
@@ -11178,7 +11418,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 "Прочитанное"
 
@@ -11206,12 +11446,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:1857
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "Отправитель"
 
@@ -11247,8 +11487,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 "Тема"
 
@@ -11256,68 +11497,85 @@ msgstr "Тема"
 msgid "Unset Status"
 msgstr "Снять состояние"
 
-#: 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
+#, fuzzy, 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:239 filter/rule-editor.c:335
-#, c-format
-msgid "Rule name '%s' is not unique, choose another"
-msgstr "Имя правила \"%s\" не уникально, выберите другое"
-
-#: 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
+#, 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 "Укажите имя этой виртуальной папки."
 
-#: filter/vfolder-rule.c:215
-msgid "You need to specify at least one folder as a source."
+#: filter/vfolder-rule.c:222
+#, fuzzy
+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 "Источники виртуальных папок"
+
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr "Импорт вашей почты из 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?"
@@ -11325,7 +11583,7 @@ msgstr ""
 "Обнаружены почтовые файлы Elm.\n"
 "Хотите импортировать их в Evolution?"
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -11337,12 +11595,12 @@ msgstr ""
 "Обнаружены файлы GnomeCard.\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"
@@ -11368,7 +11626,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"
@@ -11379,7 +11637,7 @@ msgstr ""
 "используют возможности \"Игнорировать связи\" или \"Соблюдать связи\",\n"
 "не поддерживаемые в Evolution. Эти фильтры будут сброшены."
 
-#: 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"
@@ -11392,37 +11650,39 @@ msgstr ""
 "что не поддерживается в Evolution. Эти фильтры будут изменены\n"
 "на проверку наличия (отсутствия) заданной строки в теле письма."
 
-#: 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"
 
 #. 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
 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?"
@@ -11430,11 +11690,11 @@ msgstr ""
 "Найдены почтовые файлы 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 "Импорт информации из 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?"
@@ -11442,125 +11702,123 @@ msgstr ""
 "Обнаружены почтовые файлы 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
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Фабрика для управляющего элемента шрифтов экрана Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Фабрика для управляющего элемента учетных записей почты Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Фабрика для управляющего элемента почты Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Фабрика для управляющего элемента редактора почты Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Configure mail preferences, including security and message display, here"
+#: 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 "Тут настраиваются шрифты, используемые 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 "Компонент 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 "Компонент Executive Summary программы 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.oaf.in.h:13
-msgid "Evolution mail folder display component."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail folder viewer"
 msgstr "Компонент отображения почтовой папки программы Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Evolution Mail font configuration control"
 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 Summary программы Evolution."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Компонент Executive Summary программы Evolution."
 
-#: 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:71
+#: 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:811
+#: mail/component-factory.c:818
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11568,239 +11826,223 @@ msgstr ""
 "Некоторые ваши почтовые настройки выглядят испорченными, пожалуйста, "
 "проверьте, что всё в порядке."
 
-#: mail/component-factory.c:976
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "Вы не установили метод транспортировки почты"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Имеются неотправленные сообщения! Вы хотите завершить работу?"
 
-#: mail/component-factory.c:1004
-msgid "Warning: Unsent Messages"
-msgstr "Внимание: Неотправленные сообщения"
-
-#: mail/component-factory.c:1046
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Новое почтовое сообщение"
 
-#: mail/component-factory.c:1046
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "Почтовое сообщение..."
 
-#: mail/component-factory.c:1047
+#: mail/component-factory.c:1061
 msgid "Compose a new mail message"
 msgstr "Создать новое сообщение"
 
-#: mail/component-factory.c:1055
+#: mail/component-factory.c:1069
 msgid "New Message Post"
 msgstr "Отправка нового сообщения"
 
-#: mail/component-factory.c:1055
+#: mail/component-factory.c:1069
 msgid "_Post Message"
 msgstr "Отправить сообщение"
 
-#: mail/component-factory.c:1056
+#: mail/component-factory.c:1070
 msgid "Post a new mail message"
 msgstr "Отправить новое почтовое сообщение"
 
-#: mail/component-factory.c:1084
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Не удается инициализировать почтовый компонент Evolution."
-
-#: mail/component-factory.c:1093
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Не удается инициализировать компонент настройки почты Evolution."
-
-#: mail/component-factory.c:1099
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Не удается инициализировать компонент информации о папке Evolution."
-
-#: mail/component-factory.c:1344 mail/component-factory.c:1374
+#: mail/component-factory.c:1353
 msgid "Connecting..."
 msgstr "Устанавливается соединение..."
 
-#: mail/component-factory.c:1385
+#: 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\""
 
-#: mail/folder-browser-ui.c:473
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Свойства"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:381 mail/mail-display.c:893
+#: 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 "%d видимо"
 
-#: 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
 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 "Фильтр по списку рассылки (%s)"
 
-#: mail/folder-browser.c:2039
+#: mail/folder-browser.c:2067
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Виртуальная папка по списку рассылки (%s)"
@@ -11809,25 +12051,41 @@ msgstr "Виртуальная папка по списку рассылки (%s
 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.server.in.in.h:1
+#, fuzzy
+msgid "Evolution mbox 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: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,101 +12121,96 @@ 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:159
+#: 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:129
+#: 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:166
+#: 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:467
+#. translators: default account indicator
+#: mail/mail-accounts.c:433
 msgid "[Default]"
 msgstr "[По умолчанию]"
 
-#: mail/mail-accounts.c:538 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 "Включено"
 
-#: mail/mail-accounts.c:539 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:540 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 "Почта к %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 "Почта от %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 "Следующие правила фильтра(ов):\n"
 
-#: mail/mail-autofilter.c:382
+#: mail/mail-autofilter.c:378
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11968,7 +12221,12 @@ msgstr ""
 "    '%s'\n"
 "И были обновлены."
 
-#: 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"
@@ -11980,7 +12238,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."
@@ -11988,7 +12255,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."
@@ -11997,7 +12264,7 @@ 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"
@@ -12005,11 +12272,11 @@ msgstr ""
 "Вы посылаете сообщение в формате HTML, но следующие получатели\n"
 "не хотят получать почту в формате 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?"
@@ -12017,7 +12284,7 @@ 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."
@@ -12025,11 +12292,11 @@ 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"
@@ -12039,11 +12306,11 @@ msgstr ""
 "добавления Apparently-To заголовка.\n"
 "Всё равно отправить?"
 
-#: 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?"
@@ -12051,28 +12318,28 @@ msgstr ""
 "Не удается открыть папку черновиков для этой учетной записи.\n"
 "Хотите использовать папку черновиков по умолчанию?"
 
-#: mail/mail-callbacks.c:1233
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "неизвестный отправитель"
 
-#: mail/mail-callbacks.c:1237
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "В %a, %d.%m.%Y, в %H:%M, %%s пишет:"
 
-#: mail/mail-callbacks.c:1738 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:1740 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:2407
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Вы действительно хотите править все %d сообщений?"
 
-#: mail/mail-callbacks.c:2432
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12080,7 +12347,7 @@ msgstr ""
 "Вы можете править только сообщения,\n"
 "сохраненные в папке \"Черновики\"."
 
-#: mail/mail-callbacks.c:2471
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12088,43 +12355,46 @@ msgstr ""
 "Вы можете переотправить сообщения\n"
 "только из папки \"Отправленные\"."
 
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Вы действительно хотите переотправить все %d сообщений?"
 
-#: mail/mail-callbacks.c:2511
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "Нет выбранных сообщений"
 
-#: mail/mail-callbacks.c:2556 mail/mail-display.c:189
-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:2610
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Файл %s уже существует.\n"
+"Перезаписать его?"
+
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "Сохранить сообщение как..."
 
-#: mail/mail-callbacks.c:2612
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "Сохранить сообщения как..."
 
-#: mail/mail-callbacks.c:2681
-msgid "Go to next folder with unread messages?"
-msgstr "Перейти в следующую папку с непрочитанными сообщениями?"
-
-#: mail/mail-callbacks.c:2688
-msgid ""
-"There are no more new messages in this folder.\n"
-"Would you like to go to the next folder?"
-msgstr ""
-"В этой папке больше нет непрочитанных сообщений.\n"
-"Перейти в другую папку?"
-
-#: mail/mail-callbacks.c:2931
+#: 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 ""
@@ -12133,7 +12403,7 @@ msgstr ""
 "\n"
 "Уничтожить эти сообщения?"
 
-#: mail/mail-callbacks.c:3044
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12142,62 +12412,62 @@ msgstr ""
 "Ошибка при загрузке информации фильтра:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3056
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Настройки фильтров"
 
-#: mail/mail-callbacks.c:3100
+#: mail/mail-callbacks.c:2831
 #, c-format
 msgid "Page %d of %d"
 msgstr "Страница %d из %d"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "Напечатать сообщение"
 
-#: mail/mail-callbacks.c:3182
-msgid "US-Letter"
-msgstr "US-Letter"
-
-#: mail/mail-callbacks.c:3223
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "Сбой печати сообщения"
 
-#: mail/mail-callbacks.c:3413
+#: 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 Advanced section of signature settings."
-msgstr ""
-"Пожалуйста, укажите имя файла подписи в разделе\n"
-"\"Дополнительное\" в настройках подписи."
-
-#: 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:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
+msgid "Unnamed"
+msgstr "Без названия"
 
-#: mail/mail-composer-prefs.c:309
-msgid "Please specify a valid script name"
+#: mail/mail-composer-prefs.c:335
+#, fuzzy
+msgid "You must specify a valid script name."
 msgstr "Пожалуйста, укажите корректное название скрипта"
 
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
-msgid "Unnamed"
-msgstr "Без названия"
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
+#, fuzzy
+msgid "[script]"
+msgstr " [скрипт]"
+
+#: mail/mail-composer-prefs.c:864
+#, fuzzy
+msgid "Language(s)"
+msgstr "Язык"
 
-#: mail/mail-composer-prefs.c:880
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr "Добавить подпись скрипта"
 
-#: mail/mail-composer-prefs.c:881
-msgid "Add Signature"
-msgstr "Добавить подпись"
+#: mail/mail-composer-prefs.c:926
+#, fuzzy
+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 "
@@ -12207,7 +12477,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
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -12216,11 +12491,16 @@ 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 "Отправка почты"
+
+#: 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."
@@ -12228,7 +12508,11 @@ 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 "
@@ -12236,27 +12520,17 @@ msgid ""
 "name for this account in the space below. This name will be used for display "
 "purposes only."
 msgstr ""
-"Вы почти закончили процесс настройки почты. Наименование, сервер "
-"входящей почты и метод передачи исходящей почты, указанные вами, будут "
-"объединены для создания почтовой учётной записи Evolution. Пожалуйста, "
-"введите имя для этой учётной записи в строке ниже. Это имя будет "
-"использовано только для отображения."
+"Вы почти закончили процесс настройки почты. Наименование, сервер входящей "
+"почты и метод передачи исходящей почты, указанные вами, будут объединены для "
+"создания почтовой учётной записи Evolution. Пожалуйста, введите имя для этой "
+"учётной записи в строке ниже. Это имя будет использовано только для "
+"отображения."
 
-#. set window title
-#: mail/mail-config-druid.c:638
-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 "Подключение к серверу..."
 
@@ -12272,14 +12546,10 @@ msgstr "(В этой сборке Evolution SSL не поддерживаетс�
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(В этой сборке Evolution SSL не поддерживается)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Всегда шифровать моим ключом, когда посылается шифрованная почта"
 
-#: mail/mail-config.glade.h:7
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-
 #: mail/mail-config.glade.h:8
 msgid "Account Editor"
 msgstr "Редактор учётных записей"
@@ -12288,10 +12558,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 "Добавить _скрипт"
@@ -12374,13 +12640,14 @@ msgid "Configuration"
 msgstr "Настройка"
 
 #: 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"
@@ -12417,7 +12684,7 @@ msgstr "Не цитировать исходное сообщение"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Не подписывать приглашения (для совместимости с 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 "Готово"
 
@@ -12445,6 +12712,10 @@ msgstr "_Электронная почта:"
 msgid "Empty _trash folders on exit"
 msgstr "_Очищать корзину при выходе"
 
+#: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr "Помощник по учётным записям Evolution"
+
 #: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Выполнить команду..."
@@ -12473,10 +12744,6 @@ msgstr "Выделять _цитирование:"
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr "Подлинность"
-
 #: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Встроенное"
@@ -12510,6 +12777,11 @@ msgid "Message Display"
 msgstr "Отображение сообщений"
 
 #: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Сообщение содержит"
+
+#: mail/mail-config.glade.h:76
 msgid "Microsoft"
 msgstr "Microsoft"
 
@@ -12526,148 +12798,140 @@ msgstr ""
 "серверу"
 
 #: mail/mail-config.glade.h:81
-msgid "On Screen fonts"
-msgstr "Шрифты для экрана"
-
-#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Дополнительная информация"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:83
 msgid "Or_ganization:"
 msgstr "О_рганизация:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr "Идентификатор ключа PGP/GPG:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Выбрать цвет"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:89
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Пр_едупреждать при отправке сообщений, в которых определены только "
 "получатели скрытой копии."
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:90
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:91
 msgid "Printed Fonts"
 msgstr "Шрифты для печати"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr "Почтовый каталог Qmail "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:93
 msgid "Quote original message"
 msgstr "Цитировать исходное сообщение"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr "Процитировано"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr "Запомнить этот пароль"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:96
 msgid "Re_ply-To:"
 msgstr "_Обратный адрес:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr "Получение почты"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:98
 msgid "Receiving _Options"
 msgstr "Получение опций"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:99
 msgid "Remember this _password"
 msgstr "Запомнить этот _пароль"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "Необходимая информация"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:101
 msgid "Restore Defaults"
 msgstr "Восстановить значения по умолчанию"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:103
 msgid "S_ecurity"
 msgstr "Безопасность"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "Безопасный MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr "Выберите шрифт HTML фиксированной ширины"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr "Выберите шрифт HTML фиксированной ширины для печати"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr "Выберите шрифт HTML переменной ширины"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr "Выберите шрифт HTML переменной ширины для печати"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
 msgstr "Отправка эл.почты"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "Папка отправленных сообщений:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "Отправленные сообщения и черновики"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr "Т_ребуется проверка подлинности"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Настройка сервера"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "Тип сервера:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:116
 msgid "Shortcuts _type:"
 msgstr "Типы ярлыков:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:117
 msgid "Specify _filename:"
 msgstr "Имя _файла:"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell Checking Language"
-msgstr "Язык проверки орфографии"
-
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr "Проверка _орфографии"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Стандартный файл Unix mbox"
 
-#: mail/mail-config.glade.h:122
+#: 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"
@@ -12677,7 +12941,7 @@ msgstr ""
 "в качестве вашей подписи. Имя, указанное вами,\n"
 "будет использоваться только для отображения. "
 
-#: mail/mail-config.glade.h:125
+#: 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 "
@@ -12687,7 +12951,7 @@ msgstr ""
 "орфографии. В списке языков отображены те, для которых у вас установлены "
 "словари."
 
-#: mail/mail-config.glade.h:127
+#: 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\""
@@ -12695,178 +12959,185 @@ msgstr ""
 "Укажите имя, используемое для дальнейших обращений к этой \n"
 "учетной записи. Например, \"Служебная\" или \"Личная\""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "_Переменной ширины:"
 
-#: mail/mail-config.glade.h:131
+#: 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:136
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "Добавить подпись"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Всегда загружать изображения"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Всегда подписывать сообщения, когда используется эта учётная запись"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Тип проверки подлинности: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Тип проверки подлинности: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "Автоматически проверять новую почту"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Автоматически вставлять изображение эмоций"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Звуковой сигнал при приходе новой почты"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "ID _сертификата:"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr "_Запрашивать подтверждение очистки папки от удаленных сообщений"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Default signature:"
 msgstr "Подпись по _умолчанию:"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Defaults"
 msgstr "По _умолчанию"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Не уведомлять о приходе новой почты"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Enable"
 msgstr "_Включить"
 
-#: mail/mail-config.glade.h:154
-msgid "_Fixed-width:"
-msgstr "_Фиксированной ширины:"
-
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Forward style:"
 msgstr "Стиль _пересылки:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "_Полное имя:"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr "Почта _HTML"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr "_Идентификация"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "Загружать изображения, если отправитель есть в адресной книге"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "_Сделать основной учётной записью"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "По_мечать сообщения как \"Прочитанные\" через:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "Имя:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "Никогда не загружать изображения"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr "_Воспроизводить звуковой файл при приходе новой почты"
 
-#: mail/mail-config.glade.h:168
+#: 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:169
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Предупреждать при отправке сообщений с пустой темой"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr "_Получение почты"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "Стиль _ответа:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr "Восстановить настройки по умолчанию"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Скрипт:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "Отправка почты"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Показывать анимированные изображения "
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Подписи"
 
-#: mail/mail-config.glade.h:177
+#: 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:178
-msgid "_Variable-width:"
-msgstr "П_еременной ширины:"
+#: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:178
 msgid "_every"
 msgstr "каждые"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr "цвет"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "описание"
 
@@ -12890,7 +13161,7 @@ msgstr "Не удается создать контекст оболочки S/M
 msgid "Could not create a S/MIME decode context."
 msgstr "Не удается создать контекст декодирования S/MIME"
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:193
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -12899,180 +13170,178 @@ msgstr ""
 "Файл %s уже существует.\n"
 "Перезаписать его?"
 
-#: mail/mail-display.c:326
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Сохранить вложение"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:406
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Не удается создать временный файл '%s': %s"
 
-#: mail/mail-display.c:437
+#: mail/mail-display.c:454
 msgid "Save Attachment..."
 msgstr "Сохранить вложение..."
 
-#: mail/mail-display.c:438
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr "Встроенный просмотр"
 
-#: mail/mail-display.c:439
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "Открыть в %s..."
 
-#: mail/mail-display.c:499
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Встроенный просмотр (через %s)"
 
-#: mail/mail-display.c:503
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "Скрыть"
 
-#: mail/mail-display.c:524
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "Внешняя программа просмотра"
 
-#: mail/mail-display.c:1320
+#: mail/mail-display.c:1365
 msgid "Downloading images"
 msgstr "Загрузка изображений"
 
-#: mail/mail-display.c:1497
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "Загрузка содержимого сообщения"
 
-#: mail/mail-display.c:1784
+#: mail/mail-display.c:1879
 msgid "Overdue:"
 msgstr "Просрочено:"
 
-#: mail/mail-display.c:1788
+#: mail/mail-display.c:1883
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "до %B %d, %Y, %l:%M %P"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Открыть ссылку в браузере"
 
-#: mail/mail-display.c:2116
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Скопировать ссылку"
 
-#: mail/mail-display.c:2118
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Сохранить ссылку как"
 
-#: mail/mail-display.c:2120
+#: 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 "Ping на %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 "Копия"
 
-#: 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
-msgid "This message is digitally signed. Click the lock icon for more information."
+#: 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
 msgid "Could not create a PGP verfication context"
 msgstr "Не удается создать контекст проверки PGP"
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Это сообщение подписано цифровой подписью и его аутентичность подтверждена."
+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 "Указатель на 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\")"
 
-#: mail/mail-format.c:2218
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr "Часть external-body неверно сформирована"
 
-#: mail/mail-local.c:539 mail/mail-local.c:541
+#: mail/mail-local.c:537 mail/mail-local.c:539
 #, c-format
 msgid "Local folders/%s"
 msgstr "Локальные папки/%s"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr "Перенастройка папки"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:748
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13081,12 +13350,12 @@ msgstr ""
 "Не удается сохранить метаданные папки; возможно, вы обнаружите,\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: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Не удается удалить метаданные папки %s: %s"
@@ -13096,7 +13365,7 @@ msgstr "Не удается удалить метаданные папки %s: %
 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."
@@ -13104,12 +13373,12 @@ msgstr ""
 "Если вы не можете больше открыть этот ящик,\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 "Вы не можете изменить формат нелокальной папки."
 
@@ -13131,108 +13400,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"
@@ -13241,7 +13510,7 @@ msgstr ""
 "Не удается создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13250,11 +13519,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"
@@ -13263,54 +13532,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 "Совпадения:"
 
@@ -13318,68 +13587,64 @@ 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
-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
+msgid "_Remember this password for the remainder of this session"
+msgstr "_Запомнить этот пароль до завершения этого сеанса"
+
+#: mail/mail-signature-editor.c:80
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Не удается сохранить файл подписи: %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"
@@ -13389,42 +13654,50 @@ 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
 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 "Пересланное сообщение - %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 "Настройка виртуальной папки: %s"
 
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Обновление виртуальных папок для uri: %s"
 
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13437,97 +13710,97 @@ msgstr ""
 "    '%s'\n"
 "и была обновлена."
 
-#: 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 "vFolders"
 
-#: 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 "Попытка редактирования несуществующей виртуальной папки \"%s\"."
 
-#: 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 "%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 "Сегодня %I:%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 "Создание списка сообщений"
 
@@ -13559,43 +13832,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 "Пометить к исполнению"
 
@@ -13623,88 +13896,96 @@ 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
 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:3
-msgid "All folders"
-msgstr "Все папки"
-
-#: mail/subscribe-dialog.glade.h:4 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 ui/evolution-message-composer.h:15
+#: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Закрыть"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "Display Options"
-msgstr "Параметры отображения"
-
-#: mail/subscribe-dialog.glade.h:6
-msgid "Folders whose names begin with:"
-msgstr "Папки, имена которых начинаются с:"
-
-#: mail/subscribe-dialog.glade.h:7
+#: mail/subscribe-dialog.glade.h:4
 msgid "Manage Subscriptions"
 msgstr "Управление подписками"
 
-#: mail/subscribe-dialog.glade.h:8 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:9
-msgid "Refresh folder listing"
-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
+#, fuzzy
+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
+#, fuzzy
+msgid "Evolution Summary component"
+msgstr "Компонент редактора писем Evolution."
+
+#: 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
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Настройка почты"
+
 #: my-evolution/Locations.h:1
 msgid "Aarhus"
 msgstr "Aarhus"
@@ -17102,7 +17383,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 "Град"
 
@@ -18795,5996 +19076,5987 @@ msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
 #: my-evolution/Locations.h:1325
-msgid "Marquette"
-msgstr "Marquette"
-
-#: 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 "Marte"
 
-#: 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 "Marysville-Beale AFB"
 
-#: 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 "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 "Массачусетс"
 
-#: 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 "Матаморос"
 
-#: 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 "Mayport"
 
-#: 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 "Mazu"
 
-#: 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 "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 "Мак-Кук"
 
-#: 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 "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 "Медфорт"
 
-#: 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 "Mehamn"
 
-#: 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 "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 "Мемфис"
 
-#: 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 "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 "Мерса-Матрух"
 
-#: 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 "Майами"
 
-#: 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 "Middleton Island"
 
-#: 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 "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 "Майлс-Сити"
 
-#: 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 "Minamitorishima"
 
-#: 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 "Minchumina"
 
-#: 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 "Minocqua"
 
-#: 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 "Miyakejima Airport"
 
-#: 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 "Mobile Downtown"
 
-#: 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 "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 "Молде"
 
-#: 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 "Moline-Quad Cities"
 
-#: 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 "Monchengladbach"
 
-#: 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 "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 "Монро"
 
-#: 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 "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 "Монтего-Бей"
 
-#: 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 "Монтерей"
 
-#: 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 "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 "Монтевидео/Карраско"
 
-#: 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 "Монтроз (2)"
 
-#: 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 "Moses Lake"
 
-#: 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 "Mosjoen"
 
-#: 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 "Mount Shasta"
 
-#: 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 "Mount Wilson"
 
-#: 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 "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 "Муллен"
 
-#: 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 "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 "Маскигон"
 
-#: 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 "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 "Накодочес"
 
-#: 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 "Nagpur Sonegaon"
 
-#: 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 "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 "Нантакет"
 
-#: 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 "Napoli"
 
-#: 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 "NASA Шаттл"
 
-#: 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 "Neuquen"
 
-#: 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 "Новый Орлеан - Lakefront"
 
-#: 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 "New Port Richey"
 
-#: 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 "Нью-Йорк - аэропорт JFK"
 
-#: 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 "Nice-Cote d'Azur"
 
-#: 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 "Nimes-Garons"
 
-#: 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 "Nis"
 
-#: 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 "N Myrtle Beach"
 
-#: 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 "Норфолк 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 "Норт-Адамс"
 
-#: 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 "Северная Каролина"
 
-#: 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 "North Kingstown"
 
-#: 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 "Northway"
 
-#: 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 "Norwich"
 
-#: 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 "Notodden"
 
-#: 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 "Nueva Ocotepeque"
 
-#: 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 "Nyutabaru Ab"
 
-#: 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 "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 "Обихиро, аэропорт"
 
-#: 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 "Oelwen"
 
-#: 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 "Ojika Island"
 
-#: 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 "Оклахома Сити-Midwest City"
 
-#: 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 "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 "Олимпия"
 
-#: 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 "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 "Омск"
 
-#: 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 "Oran/Es Senia"
 
-#: 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 "Ord-Sharp"
 
-#: 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 "Orland"
 
-#: 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 "Orsta-Volda"
 
-#: 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 "Osan Ab"
 
-#: 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 "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 "Ошкош"
 
-#: 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 "Острава"
 
-#: 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 "Owyhee"
 
-#: 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 "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 "Палермо"
 
-#: 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 "Palmdale"
 
-#: 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 "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 "Патна"
 
-#: 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 "Patuxent River"
 
-#: 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 "Payson"
 
-#: 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 "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 "Перри-Фолейе"
 
-#: 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 "Philip"
 
-#: 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 "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 "Пьяченца"
 
-#: 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 "Педрас-Неграс"
 
-#: 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 "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 "Пирасунунга"
 
-#: 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 "Pittsburgh-West Mifflin"
 
-#: 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 "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 "Помпано-Бич"
 
-#: 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 "Понсе"
 
-#: 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 "Pope AFB"
 
-#: 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 "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 "Порт-Анджелес"
 
-#: 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 "Port Hardy"
 
-#: 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 "Port Heiden"
 
-#: 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 "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 "Порто-Санто"
 
-#: 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 "Порт-Саид"
 
-#: 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 "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 "Познань"
 
-#: 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 "Pratica di Mare"
 
-#: 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 "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 "Претория"
 
-#: 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 "Pristina"
 
-#: 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 "Pudahuel"
 
-#: 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 "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 "Пуэрто-Мальдонадо"
 
-#: 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 "Пуэрто-Плата"
 
-#: 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 "Punta Cana"
 
-#: 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 "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 "Пхеньян"
 
-#: 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 "Квебек"
 
-#: 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 "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 "Рабат"
 
-#: 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 "Raleigh-Durham"
 
-#: 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 "Rapid City-Ellsworth AFB"
 
-#: 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 "Rawlins"
 
-#: 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 "Redig"
 
-#: 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 "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 "Реджо-ди-Калабрия"
 
-#: 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 "Rennes"
 
-#: 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 "Rhinelander"
 
-#: 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 "Rickenbacker"
 
-#: 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 "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 "Римини"
 
-#: 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 "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 "Ривера"
 
-#: 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 "Rivolto"
 
-#: 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 "Roatan"
 
-#: 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 "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 "Рим - Расселл"
 
-#: 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 "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 "Росарио"
 
-#: 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 "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 "Ростов-на-Дону"
 
-#: 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 "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 "Рурренабаке"
 
-#: 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 "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 "Саарбрюккен"
 
-#: 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 "Сакраменто"
 
-#: 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 "Safford-Municipal Airport"
 
-#: 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 "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 "Сент-Мэрис"
 
-#: 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 "Сент-Пол"
 
-#: 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 "Салала"
 
-#: 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 "Салина"
 
-#: 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 "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 "Солт-Лейк-Сити"
 
-#: 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 "Сальвадор"
 
-#: 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 "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 "Сан-Анджело"
 
-#: 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 "San Antonio-Stinson"
 
-#: 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 "Sandnessjoen/Stokka"
 
-#: 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 "San Ignacio De Velasco"
 
-#: 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 "San Jose De Chiquitos"
 
-#: 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 "Sanliurfa"
 
-#: 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 "Santa Marta/Simon Bolivar"
 
-#: 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 "Santa Rosa de Copan"
 
-#: 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 "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 "Саппоро Аб"
 
-#: 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 "Sarzana"
 
-#: 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 "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 "Саванна"
 
-#: 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 "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 "Скенектади"
 
-#: 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 "Скотсблафф"
 
-#: 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 "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 "Сендай, аэропорт"
 
-#: 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 "Сеул/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 "Севилья"
 
-#: 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 "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 "Шенандоа"
 
-#: 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 "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 "Шираз"
 
-#: 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 "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 "Шривпорт центр"
 
-#: 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 "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 "Силвер-Сити"
 
-#: 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 "Ситка"
 
-#: 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 "Skagway"
 
-#: 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 "Skien/Geiteryggen"
 
-#: 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 "Skwentna"
 
-#: 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 "Smithers"
 
-#: 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 "Snowshoe Lake"
 
-#: 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 "Soda Springs"
 
-#: 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 "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 "Сомерсет"
 
-#: 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 "Саутгемптон"
 
-#: 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 "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 "Спенсер"
 
-#: 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 "Сплит"
 
-#: 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 "Spokane-Parkwater"
 
-#: 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 "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 "Стоутон"
 
-#: 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 "Staverton"
 
-#: 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 "Stephenville"
 
-#: 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 "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 "Сент-Пол"
 
-#: 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 "St Petersburg / Clearwater"
 
-#: 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 "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 "Штутгард"
 
-#: 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 "Самтер (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 "Сянган/Тайбэй"
 
-#: 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 "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 "Сидней"
 
-#: 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 "Szombathely"
 
-#: 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 "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 "Такома"
 
-#: 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 "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 "Тайнань"
 
-#: 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 "Такамацу, аэропорт"
 
-#: 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 "Tamanrasset/Aguenna"
 
-#: 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 "Tampa-Macdill AFB"
 
-#: 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 "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 "Тарвизио"
 
-#: 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 "Татеяма"
 
-#: 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 "Tees-Side"
 
-#: 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 "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 "Тихуана"
 
-#: 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 "Tin City"
 
-#: 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 "Tirgu Mures"
 
-#: 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 "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 "Токумен"
 
-#: 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 "Tokachi GSDF"
 
-#: 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 "Topeka-Forbes Field"
 
-#: 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 "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 "Таунсвилл"
 
-#: 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 "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 "Трутдейл"
 
-#: 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 "Траки"
 
-#: 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 "Tsuiki Ab"
 
-#: 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 "Tulcea"
 
-#: 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 "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 "Тайлер"
 
-#: 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 "Тюмень"
 
-#: 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 "Ukiah"
 
-#: 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 "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 "Уналаклит"
 
-#: 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 "Upington"
 
-#: 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 "Utrecht/Soesterberg"
 
-#: 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 "Vaerlose"
 
-#: 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 "Вальдоста-Муди AFB"
 
-#: 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 "Вальпараисо-Eglin AFB"
 
-#: 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 "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 "Варадеро"
 
-#: 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 "Варна"
 
-#: 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 "Венеция"
 
-#: 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 "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 "Виши-Ролла"
 
-#: 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 "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 "Виллафранка"
 
-#: 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 "Вилла-Рейнольдс"
 
-#: 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 "Visalia"
 
-#: 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 "Vojens/Skrydstrup"
 
-#: 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 "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 "Воронеж"
 
-#: 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 "Уэйко"
 
-#: 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 "Уэйкфилд"
 
-#: 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 "Warroad"
 
-#: 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 "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 "Оуэнсборо"
 
-#: 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 "Wejh"
 
-#: 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 "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 "Западная Атланта"
 
-#: 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 "Westhampton"
 
-#: 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 "Уэст-Йеллоустоун (2)"
 
-#: 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 "Whidbey Island"
 
-#: 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 "White Sulphur"
 
-#: 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 "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 "Уик"
 
-#: 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 "Уильямспорт"
 
-#: 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 "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 "Уиннемакка"
 
-#: 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 "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 "Вулф-Пойнт"
 
-#: 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 "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 "Врангель"
 
-#: 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 "Вайоминг"
 
-#: 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 "Якуиба"
 
-#: 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 "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 "Йеовилтон"
 
-#: 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 "Yongsan/H-208 Hp"
 
-#: 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 "Cарагоса"
 
-#: 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 "Зуни-Пуэбло"
 
-#: 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 Summary"
 
-#: 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 "UUEE:UKCC"
-
-#: 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
 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 "UUEE:UKCC"
+
+#: 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 "Компонент Executive summary: не удалось инициализировать Bonobo.\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 "узл (1.87 км/ч)"
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "kph"
 msgstr "kПа"
 
-#: 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
 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 "Пыльные вихри"
 
@@ -24880,33 +25152,34 @@ msgstr "Расписание"
 msgid "_Weather"
 msgstr "Погода"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-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 "Оболочка 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/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "The Evolution shell."
-msgstr "Оболочка 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"
@@ -24915,54 +25188,37 @@ 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
 #, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "\"%s\" в \"%s\""
 
-#: 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:1051
+#: 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 "Установка Evolution"
-
-#: shell/e-setup.c:130
-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: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"
@@ -24973,7 +25229,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"
@@ -24982,41 +25238,7 @@ msgstr ""
 "При копировании файлов в \"%s\"\n"
 "возникла ошибка."
 
-#: 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"
-"доступным для чтения и выполнения и\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"
@@ -25027,21 +25249,7 @@ msgstr ""
 "Пожалуйста, переместите его, чтобы позволить\n"
 "установить файлы пользователя 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 ""
-"Evolution обнаружила старый\n"
-"Executive-Summary каталог.\n"
-"Он должен быть удалён, до того\n"
-"как Evolution будет запущена.\n"
-"Вы хотите удалить этот каталог?"
-
-#: shell/e-setup.c:368
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25056,23 +25264,23 @@ 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
 msgid "Offline Folders"
 msgstr "Папки автономной работы"
 
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 msgid "Autocompletion Folders"
 msgstr "Папки автозаполнения"
 
@@ -25081,42 +25289,42 @@ msgstr "Папки автозаполнения"
 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: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"
@@ -25125,17 +25333,17 @@ 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
 #, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "Действительно удалить папку \"%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"
@@ -25144,26 +25352,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
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25172,7 +25380,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"
@@ -25181,23 +25389,19 @@ msgstr ""
 "Не удается создать указанную папку:\n"
 "%s"
 
-#: 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:637 shell/e-shell-folder-title-bar.c:638
+#: 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"
@@ -25211,11 +25415,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"
@@ -25224,21 +25428,21 @@ msgstr ""
 "Импорт %s\n"
 "Импорт элемента %d."
 
-#: 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 "Файл \"%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"
@@ -25247,11 +25451,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"
@@ -25260,17 +25464,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"
@@ -25279,31 +25483,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"
@@ -25311,32 +25515,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
 #, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
@@ -25345,35 +25549,43 @@ msgstr ""
 "Ошибка синхронизации \"%s\":\n"
 "%s"
 
-#: shell/e-shell-offline-sync.c:239
+#: shell/e-shell-offline-sync.c:232
 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 "Синхронизация \"%s\" (%d из %d) ..."
 
-#: shell/e-shell-settings-dialog.c:327
+#: shell/e-shell-settings-dialog.c:345
 msgid "Evolution Settings"
 msgstr "Параметры Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:362
+#. 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:369
+#: 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:374
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, c-format
 msgid "in \"%s\" ..."
 msgstr "в \"%s\" ..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:460
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Не удается открыть общую папку: %s."
@@ -25382,115 +25594,111 @@ msgstr "Не удается открыть общую папку: %s."
 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 ""
-"Не удается запустить интерфейс почтового помощника Evolution\n"
-"(%s)"
-
-#: shell/e-shell-startup-wizard.c:169
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "Не удается запустить интерфейс почтового помощника Evolution\n"
-
-#: shell/e-shell-user-creatable-items-handler.c:583
-#: shell/e-shell-user-creatable-items-handler.c:637
-#: ui/evolution-addressbook.h:14 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."
-msgstr "Имя папки не может содержать косую черту."
+#: shell/e-shell-utils.c:129
+#, 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: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 "Похоже, утилита 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 не найден."
+#: 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 "О программе Ximian 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
 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 "%s (%d)"
 
-#: shell/e-shell-view.c:1863
+#: shell/e-shell-view.c:2047
 msgid "(None)"
 msgstr "(нет)"
 
-#: shell/e-shell-view.c:1910
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
+#: 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:1917
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution в процессе перехода в режим работы вне сети."
 
-#: shell/e-shell-view.c:1923
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
+#: shell/e-shell-view.c:2104
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution сейчас в автономном режиме работы. Нажмите на эту кнопку "
 "для перехода в режим работы в сети."
@@ -25506,12 +25714,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"
@@ -25522,148 +25730,142 @@ msgstr ""
 "неожиданно завершил работу. Вам необходимо перезагрузить Evolution\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
 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:637
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr "Ошибка сохранения ярлыков."
 
-#: shell/e-shortcuts.c:1076
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr "Ярлыки"
 
@@ -25671,73 +25873,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 "<щёлкните здесь, чтобы выбрать папку>"
 
@@ -25778,83 +25980,80 @@ 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
 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 для закрытия соединения и перехода на работу вне сети"
 
-#: 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 "В настоящий момент активны следующие соединения:"
 
@@ -25874,15 +26073,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 "Указать где создать папку:"
 
@@ -25902,29 +26101,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"
 "программе подсоединиться к вашим почтовым учётным записям и\n"
@@ -25932,12 +26132,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"
@@ -25979,60 +26180,97 @@ 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:98
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:104
+#: shell/main.c:118
 msgid "Evolution is now exiting ..."
 msgstr "Выход из Evolution..."
 
-#: shell/main.c:330
+#. 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 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 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"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:290
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
+
+#: shell/main.c:298
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Не задавать больше этот вопрос"
+
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Нет доступа к оболочке Ximian Evolution."
 
-#: shell/main.c:339
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Не удается инициализировать оболочку Evolution: %s"
 
-#: shell/main.c:421
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Отключить заставку"
 
-#: shell/main.c:423
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "Запуск в автономном режиме"
 
-#: shell/main.c:425
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "Запуск в режиме подключения к интернет"
 
-#: shell/main.c:427
+#: 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:429
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr "Принудительное обновление файлов настроек Evolution 1.0.x"
 
-#: shell/main.c:447
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26041,108 +26279,57 @@ msgstr ""
 "%s: --online и --offline не могут использоваться одновременно.\n"
 "Используйте %s --help для получения более подробной информации.\n"
 
-#: shell/main.c:478
-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:322
+#: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
 msgstr "Вложение, которое будет добавлено."
 
-#: tools/evolution-launch-composer.c:323
+#: tools/evolution-launch-composer.c:325
 msgid "Content type of the attachment."
 msgstr "Тип вложения (content-type)."
 
-#: tools/evolution-launch-composer.c:324
+#: tools/evolution-launch-composer.c:326
 msgid "The filename to display in the mail."
 msgstr "Имя файла, которое будет отображаться в письме."
 
-#: tools/evolution-launch-composer.c:325
+#: tools/evolution-launch-composer.c:327
 msgid "Description of the attachment."
 msgstr "Описание вложения."
 
-#: tools/evolution-launch-composer.c:326
+#: tools/evolution-launch-composer.c:328
 msgid "Mark attachment to be shown inline by default."
-msgstr "Пометить вложение, чтобы оно отображалось в теле сообщения по умолчанию."
+msgstr ""
+"Пометить вложение, чтобы оно отображалось в теле сообщения по умолчанию."
 
-#: tools/evolution-launch-composer.c:327
+#: 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.
 #.
-#. *  This file is autogenerated from evolution-addressbook.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-addressbook.h:9
-msgid "_Print Contacts..."
-msgstr "_Распечатать контакты..."
-
-#: ui/evolution-addressbook.h:10
-msgid "As _Table"
-msgstr "Как _таблицу"
-
-#: ui/evolution-addressbook.h:11
-msgid "_New Contact"
-msgstr "Создать контакт"
-
-#: ui/evolution-addressbook.h:12 ui/evolution-mail-message.xml.h:113
-#: ui/evolution.xml.h:65
-msgid "_Tools"
-msgstr "С_ервис"
-
-#: ui/evolution-addressbook.h:13
-msgid "_Search for contacts"
-msgstr "Поиск контактов"
-
-#: ui/evolution-addressbook.h:17
-msgid "Find a contact"
-msgstr "Найти контакт"
-
-#: ui/evolution-addressbook.h:19
-msgid "Print contacts"
-msgstr "Напечатать контакты"
-
-#: ui/evolution-addressbook.h:21
-msgid "Delete a contact"
-msgstr "Удалить контакт"
-
-#: ui/evolution-addressbook.h:22
-msgid "View All"
-msgstr "Просмотреть все"
-
-#: ui/evolution-addressbook.h:23
-msgid "View all contacts"
-msgstr "Просмотреть все контакты"
-
-#: ui/evolution-addressbook.h:24 ui/evolution-addressbook.xml.h:26
-msgid "Stop"
-msgstr "Стоп"
+#: tools/killev.c:63
+#, fuzzy, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "Не удается переименовать \"%s\": %s"
 
-#: ui/evolution-addressbook.h:25 ui/evolution-addressbook.xml.h:27
-msgid "Stop Loading"
-msgstr "Остановить загрузку"
+#: 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..."
@@ -26214,6 +26401,14 @@ msgstr "Отправить сообщение к контакту"
 msgid "Send selected contacts to another person."
 msgstr "Переслать выбранные контакты другому лицу"
 
+#: ui/evolution-addressbook.xml.h:26
+msgid "Stop"
+msgstr "Стоп"
+
+#: ui/evolution-addressbook.xml.h:27
+msgid "Stop Loading"
+msgstr "Остановить загрузку"
+
 #: ui/evolution-addressbook.xml.h:28
 msgid "View the current contact"
 msgstr "Просмотреть текущий контакт"
@@ -26224,7 +26419,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 "_Действия"
 
@@ -26341,9 +26536,8 @@ msgstr "Посмотреть на вид элемента на печати"
 msgid "Print this item"
 msgstr "Напечатать этот элемент"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.h:11
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save"
 msgstr "Сохранить"
 
@@ -26367,10 +26561,10 @@ msgstr "Сохранить этот элемент на диске"
 
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
-#: ui/evolution-mail-messagedisplay.xml.h:7 ui/evolution-message-composer.h:31
+#: 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 "_Файл"
 
@@ -26379,7 +26573,7 @@ msgid "Print En_velope..."
 msgstr "Напечатать конверт..."
 
 #: ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5 ui/evolution-message-composer.h:34
+#: ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Сохранить как..."
@@ -26394,7 +26588,7 @@ msgstr "Отправить сообщение к контакту..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.h:33 ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:47
 #: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "Сохранить"
@@ -26552,7 +26746,8 @@ msgid "Hide _Read Messages"
 msgstr "Скрыть прочитанные сообщения"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr "Скрывать сообщения, помеченные как удалённые, вместо их перечёркивания"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -26615,7 +26810,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 "_Папка"
 
@@ -27019,6 +27214,10 @@ msgstr "Как _цитирование"
 msgid "_Resend..."
 msgstr "_Переслать..."
 
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
+msgid "_Tools"
+msgstr "С_ервис"
+
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "Восстановить"
@@ -27027,153 +27226,29 @@ msgstr "Восстановить"
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
-#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution-message-composer.h:39
+#: 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.h:42
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
 msgid "_View"
 msgstr "_Вид"
 
-#.
-#. *  This file is autogenerated from evolution-message-composer.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-message-composer.h:9 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Открыть"
-
-#: ui/evolution-message-composer.h:10 ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "Открыть файл"
-
-#: ui/evolution-message-composer.h:12 ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:7
-msgid "Save the current file"
-msgstr "Сохранить текущий файл"
-
-#: ui/evolution-message-composer.h:13 ui/evolution-message-composer.xml.h:17
-msgid "Save As"
-msgstr "Сохранить как"
-
-#: ui/evolution-message-composer.h:14 ui/evolution-message-composer.xml.h:22
-msgid "Save the current file with a different name"
-msgstr "Сохранить текущий файл под другим именем"
-
-#: ui/evolution-message-composer.h:16 ui/evolution-message-composer.xml.h:4
-#: ui/evolution-signature-editor.xml.h:2
-msgid "Close the current file"
-msgstr "Закрыть текущий файл"
-
-#: ui/evolution-message-composer.h:17 ui/evolution-message-composer.xml.h:20
-msgid "Save in folder..."
-msgstr "Сохранить в папке..."
-
-#: ui/evolution-message-composer.h:18 ui/evolution-message-composer.xml.h:23
-msgid "Save the message in a specified folder"
-msgstr "Сохранить сообщение в указанной папке"
-
-#: ui/evolution-message-composer.h:19
-msgid "Insert text file..."
-msgstr "Вложить текстовый файл..."
-
-#: ui/evolution-message-composer.h:20
-msgid "Insert a file as text into the message"
-msgstr "Вставить файл как текст в сообщение"
-
-#: ui/evolution-message-composer.h:21 ui/evolution-message-composer.h:37
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Отправить"
-
-#: ui/evolution-message-composer.h:22
-msgid "Send the message now"
-msgstr "Отправить это сообщение сейчас"
-
-#: ui/evolution-message-composer.h:23
-msgid "Send _later"
-msgstr "Отправить _позже"
-
-#: ui/evolution-message-composer.h:24
-msgid "Send the message later"
-msgstr "Отправить сообщение позже"
-
-#: ui/evolution-message-composer.h:25 ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Вложить"
 
-#: ui/evolution-message-composer.h:27
-msgid "HTML"
-msgstr "HTML"
-
-#: ui/evolution-message-composer.h:28 ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:9
-msgid "Send the mail in HTML format"
-msgstr "Отправить почту в формате HTML"
-
-#: ui/evolution-message-composer.h:29 ui/evolution-message-composer.xml.h:29
-msgid "Show attachments"
-msgstr "Показать вложения"
-
-#: ui/evolution-message-composer.h:30 ui/evolution-message-composer.xml.h:27
-msgid "Show / hide attachments"
-msgstr "Показать/Скрыть вложения"
-
-#: ui/evolution-message-composer.h:32 ui/evolution-message-composer.xml.h:45
-msgid "_Open..."
-msgstr "_Открыть..."
-
-#: ui/evolution-message-composer.h:35
-msgid "Save in _folder... (FIXME)"
-msgstr "Сохранить в _папке..."
-
-#: ui/evolution-message-composer.h:36
-msgid "_Insert text file... (FIXME)"
-msgstr "_Вложить текстовый файл..."
-
-#: ui/evolution-message-composer.h:38
-msgid "Send _Later"
-msgstr "Отправить _позже"
-
-#: ui/evolution-message-composer.h:41
-msgid "F_ormat"
-msgstr "Ф_ормат"
-
-#: ui/evolution-message-composer.h:43 ui/evolution-message-composer.xml.h:28
-msgid "Show _attachments"
-msgstr "Показать _вложения"
-
-#: ui/evolution-message-composer.h:44 ui/evolution-signature-editor.xml.h:13
-#: ui/evolution.xml.h:54
-msgid "_Help"
-msgstr "_Справка"
-
-#: ui/evolution-message-composer.h:45
-msgid "_About..."
-msgstr "_О программе..."
-
-#: ui/evolution-message-composer.h:46
-msgid "_Debug"
-msgstr "_Отладка"
-
-#: ui/evolution-message-composer.h:47
-msgid "Send this message now"
-msgstr "Отправить это сообщение сейчас"
-
-#: ui/evolution-message-composer.h:48
-msgid "Bold"
-msgstr "Жирный"
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Вложить файл"
 
-#: ui/evolution-message-composer.h:49
-msgid "Sets something as bold"
-msgstr "Выделить жирным шрифтом"
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
+msgid "Close the current file"
+msgstr "Закрыть текущий файл"
 
 #: ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
@@ -27195,6 +27270,14 @@ msgstr "Фор_мат"
 msgid "HT_ML"
 msgstr "HTML"
 
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Открыть"
+
+#: ui/evolution-message-composer.xml.h:11
+msgid "Open a file"
+msgstr "Открыть файл"
+
 #: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Зашифровать с помощью PGP"
@@ -27211,14 +27294,56 @@ msgstr "Зашифровать с помощью S/MIME"
 msgid "S/MIME Sign"
 msgstr "Подписать с помощью S/MIME"
 
+#: ui/evolution-message-composer.xml.h:17
+msgid "Save As"
+msgstr "Сохранить как"
+
 #: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Сохранить _черновик"
 
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save in folder..."
+msgstr "Сохранить в папке..."
+
+#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-signature-editor.xml.h:7
+msgid "Save the current file"
+msgstr "Сохранить текущий файл"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save the current file with a different name"
+msgstr "Сохранить текущий файл под другим именем"
+
+#: ui/evolution-message-composer.xml.h:23
+msgid "Save the message in a specified folder"
+msgstr "Сохранить сообщение в указанной папке"
+
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Отправить"
+
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
+msgid "Send the mail in HTML format"
+msgstr "Отправить почту в формате HTML"
+
 #: ui/evolution-message-composer.xml.h:26
 msgid "Send this message"
 msgstr "Отправить это сообщение"
 
+#: ui/evolution-message-composer.xml.h:27
+msgid "Show / hide attachments"
+msgstr "Показать/Скрыть вложения"
+
+#: ui/evolution-message-composer.xml.h:28
+msgid "Show _attachments"
+msgstr "Показать _вложения"
+
+#: ui/evolution-message-composer.xml.h:29
+msgid "Show attachments"
+msgstr "Показать вложения"
+
 #: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Подписать это сообщение вашим PGP-ключом"
@@ -27268,6 +27393,10 @@ msgstr "Поле \"От\""
 msgid "_Insert"
 msgstr "_Вставить"
 
+#: ui/evolution-message-composer.xml.h:45
+msgid "_Open..."
+msgstr "_Открыть..."
+
 #: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "Поле \"Об_ратный адрес\""
@@ -27284,6 +27413,10 @@ msgstr "_HTML"
 msgid "Save the current file and close the window"
 msgstr "Сохранить текущий файл и закрыть окно"
 
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:52
+msgid "_Help"
+msgstr "_Справка"
+
 #: ui/evolution-signature-editor.xml.h:16
 msgid "_Signature editor"
 msgstr "_Редактор подписи"
@@ -27457,122 +27590,115 @@ msgid "Pi_lot Settings..."
 msgstr "Настройка _Pilot..."
 
 #: ui/evolution.xml.h:27
-msgid "Pilot Con_duit Settings..."
-msgstr "Н_астройка подключений Pilot..."
-
-#: ui/evolution.xml.h:28
 msgid "Remove a folder added with \"Open Other User's Folder\""
-msgstr "Удаление папки, добавленной с помощью \"Открыть папку другого пользователя\""
+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 "Настройка подключения Pilot"
-
-#: 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 "_Ярлык..."
 
@@ -27648,9 +27774,8 @@ msgstr "C _категорией:"
 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"
 
@@ -27676,20 +27801,20 @@ 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
 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 "Определить окна просмотра"
 
@@ -27700,19 +27825,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 "%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"
@@ -27721,80 +27846,80 @@ 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
 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 "Кодировка символов"
 
@@ -27802,11 +27927,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 "Сохранить результаты поиска"
 
@@ -27822,64 +27948,719 @@ 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
 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
+#, 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 "Компонент 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 "Компонент Executive Summary календаря программы 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 Addressbook Minicard control"
+#~ msgstr "Фабрика для управляющего элемента миникарточки адресной книги."
+
+#~ msgid "Factory for the Addressbook's address displayer"
+#~ msgstr "Фабрика для отображателя адреса из адресной книги"
+
+#~ msgid ""
+#~ "Factory for the configuration controls for the Evolution Addressbook."
+#~ msgstr ""
+#~ "Фабрика для элемента управления настройками адресной книги Evolution"
+
+#~ msgid "Factory for the sample Addressbook control"
+#~ msgstr "Фабрика для примера управляющего элемента адресной книги"
+
+#~ 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 "Associated LDAP Attribute"
+#~ msgstr "Соответствующий атрибут LDAP"
+
+#~ msgid "Attribute"
+#~ msgstr "Атрибут"
+
+#~ msgid "Corresponding Evolution Attribute"
+#~ msgstr "Соответствующий атрибут Evolution"
+
+#~ msgid "DN Customization"
+#~ msgstr "Настройка DN"
+
+#~ msgid "Evolution Attribute"
+#~ msgstr "Атрибут Evolution"
+
+#~ msgid "LDAP Attribute"
+#~ msgstr "Атрибут LDAP"
+
+#~ msgid "Mappings"
+#~ msgstr "Переназначение полей"
+
+#~ msgid "Objectclasses"
+#~ msgstr "Классы объектов"
+
+#~ msgid "Objectclasses Used in Evolution:"
+#~ msgstr "Классы объектов, используемые в Evolution:"
+
+#~ msgid "Objectclasses Used on Server:"
+#~ msgstr "Классы объектов, используемые на сервере:"
+
+#~ 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 "Select"
+#~ 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"
+#~ "требуемыми значениями для всех новых контактов, добавляемых\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:"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "Персональный календарный сервер; фабрика календаря"
+#~ msgid "_LDAP attributes:"
+#~ msgstr "Атрибуты _LDAP:"
 
-#: wombat/wombat.c:199
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): Не удается инициализировать GNOME-VFS"
+#~ msgid "_More Options >>"
+#~ msgstr "_Больше параметров >>"
 
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): Не удается инициализировать GNOME"
+#~ msgid "_Restore Defaults"
+#~ msgstr "_Восстановить исходные параметры"
 
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): Не удается инициализировать Bonobo"
+#~ msgid "account-druid"
+#~ msgstr "мастер учетных записей"
+
+#~ msgid "account-editor"
+#~ msgstr "редактор учетных записей"
+
+#~ msgid "dn-customization-tab"
+#~ msgstr "вкладка определения DN"
+
+#~ msgid "edit_server_window_simple"
+#~ msgstr "edit_server_window_simple"
+
+#~ msgid "mappings-tab"
+#~ msgstr "вкладка отображения"
+
+#~ msgid "objectclasses-tab"
+#~ 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 "Удалить контакт?"
+
+#~ msgid "Confirm Overwrite"
+#~ msgstr "Подтвердите перезапись"
+
+#~ msgid "Don't bother translating this string.  It's not used."
+#~ msgstr "Don't bother translating this string.  It's not used."
+
+#~ msgid "Display Cards?"
+#~ msgstr "Показать карточки?"
+
+#~ 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, отображающего календарь."
+
+#~ 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 calendar iTip view control"
+#~ msgstr "Фабрика для управляющего элемента просмотра iTip календаря"
+
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr "Фабрика для примера управляющего элемента календаря"
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr "Фабрика для централизации диалогов компонента редактора календаря"
+
+#~ msgid "Factory to create a component editor factory"
+#~ msgstr "Фабрика для создания фабрики редактора компонентов"
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Сервис уведомления о сигнале"
+
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "Не удается инициализировать GNOME"
+
+#~ 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 "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 ""
+#~ "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 "Warning!"
+#~ msgstr "Предупреждение!"
+
+#~ msgid ""
+#~ "Could not create composer window, because you have not yet\n"
+#~ "configured any identities in the mail component."
+#~ msgstr "Не удается создать окно редактора - не настроен почтовый компонент."
+
+#~ 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 "Добавить критерий"
+
+#~ 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 "Фабрика для компонента Mail Summary программы Evolution."
+
+#~ msgid "Warning: Unsent Messages"
+#~ 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 "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 "Действительно удалить учётную запись?"
+
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "Перейти в следующую папку с непрочитанными сообщениями?"
+
+#~ msgid ""
+#~ "There are no more new messages in this folder.\n"
+#~ "Would you like to go to the next folder?"
+#~ msgstr ""
+#~ "В этой папке больше нет непрочитанных сообщений.\n"
+#~ "Перейти в другую папку?"
+
+#~ msgid "US-Letter"
+#~ msgstr "US-Letter"
+
+#~ msgid ""
+#~ "Please specify signature filename\n"
+#~ "in Advanced section of signature settings."
+#~ msgstr ""
+#~ "Пожалуйста, укажите имя файла подписи в разделе\n"
+#~ "\"Дополнительное\" в настройках подписи."
+
+#~ msgid "Add Signature"
+#~ msgstr "Добавить подпись"
+
+#~ msgid "Account %d"
+#~ msgstr "Учётная запись %d"
+
+#~ msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+#~ msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+
+#~ msgid "On Screen fonts"
+#~ msgstr "Шрифты для экрана"
+
+#~ msgid "Spell Checking Language"
+#~ msgstr "Язык проверки орфографии"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "_Фиксированной ширины:"
+
+#~ msgid "_Variable-width:"
+#~ msgstr "П_еременной ширины:"
+
+#~ msgid "All folders"
+#~ msgstr "Все папки"
+
+#~ msgid "Display Options"
+#~ msgstr "Параметры отображения"
+
+#~ msgid "Folders whose names begin with:"
+#~ msgstr "Папки, имена которых начинаются с:"
+
+#~ msgid "Refresh folder listing"
+#~ msgstr "Обновить список папок"
+
+#~ msgid "Marquette"
+#~ msgstr "Marquette"
+
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "Компонент Executive summary: не удалось инициализировать Bonobo.\n"
+
+#~ 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 ""
+#~ "Для успешной работы Evolution необходимо установить дополнительные файлы\n"
+#~ "в ваш личный каталог Evolution"
+
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr ""
+#~ "Пожалуйста, нажмите \"Ок\", чтобы установить файлы или \"Отмена\" для "
+#~ "выхода."
+
+#~ 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"
+#~ "доступным для чтения и выполнения и\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 ""
+#~ "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"
+#~ "Executive-Summary каталог.\n"
+#~ "Он должен быть удалён, до того\n"
+#~ "как Evolution будет запущена.\n"
+#~ "Вы хотите удалить этот каталог?"
+
+#~ msgid "New..."
+#~ msgstr "Новая..."
+
+#~ 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 не найден."
+
+#~ 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 "Файл вывода"
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "_Распечатать контакты..."
+
+#~ msgid "As _Table"
+#~ msgstr "Как _таблицу"
+
+#~ msgid "_New Contact"
+#~ msgstr "Создать контакт"
+
+#~ msgid "_Search for contacts"
+#~ msgstr "Поиск контактов"
+
+#~ msgid "Find a contact"
+#~ msgstr "Найти контакт"
+
+#~ msgid "Print contacts"
+#~ msgstr "Напечатать контакты"
+
+#~ msgid "Delete a contact"
+#~ msgstr "Удалить контакт"
+
+#~ msgid "View All"
+#~ msgstr "Просмотреть все"
+
+#~ msgid "View all contacts"
+#~ msgstr "Просмотреть все контакты"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Вложить текстовый файл..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Вставить файл как текст в сообщение"
+
+#~ msgid "Send the message now"
+#~ msgstr "Отправить это сообщение сейчас"
+
+#~ msgid "Send _later"
+#~ msgstr "Отправить _позже"
+
+#~ msgid "Send the message later"
+#~ msgstr "Отправить сообщение позже"
+
+#~ msgid "HTML"
+#~ msgstr "HTML"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Сохранить в _папке..."
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Вложить текстовый файл..."
+
+#~ msgid "Send _Later"
+#~ msgstr "Отправить _позже"
+
+#~ msgid "F_ormat"
+#~ msgstr "Ф_ормат"
+
+#~ msgid "_About..."
+#~ msgstr "_О программе..."
+
+#~ msgid "_Debug"
+#~ msgstr "_Отладка"
+
+#~ msgid "Send this message now"
+#~ msgstr "Отправить это сообщение сейчас"
+
+#~ msgid "Bold"
+#~ msgstr "Жирный"
+
+#~ msgid "Sets something as bold"
+#~ msgstr "Выделить жирным шрифтом"
+
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "Н_астройка подключений Pilot..."
+
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "Настройка подключения Pilot"
+
+#~ 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"
 
 #~ msgid ""
 #~ "Please select and Evolution attribute and an\n"
@@ -28151,9 +28932,6 @@ msgstr "init_bonobo(): Не удается инициализировать Bono
 #~ msgid "New Contact _List"
 #~ msgstr "Новый список контактов"
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "Правка адресной книги"
-
 #~ msgid "A_uthenticate with server using:"
 #~ msgstr "Аутентификация на сервере при помощи:"
 
@@ -28250,9 +29028,6 @@ msgstr "init_bonobo(): Не удается инициализировать Bono
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Республика Молдова"
 
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr "Компонент Executive Summary календаря программы Evolution."
-
 #~ msgid "Factory for the Calendar Summary component."
 #~ msgstr "Фабрика для компонента Сводка Календаря."
 
@@ -28557,9 +29332,6 @@ msgstr "init_bonobo(): Не удается инициализировать Bono
 #~ msgid "Mailbox Format"
 #~ msgstr "Формат почтового ящика"
 
-#~ msgid "Evolution News Editor"
-#~ msgstr "Редактор новостей Evolution"
-
 #~ msgid " (default)"
 #~ msgstr " (основная)"
 
@@ -28612,9 +29384,6 @@ msgstr "init_bonobo(): Не удается инициализировать Bono
 #~ msgid "Select PGP binary"
 #~ msgstr "Выбрать программу PGP"
 
-#~ msgid "Source"
-#~ msgstr "Источник"
-
 #~ msgid "Sources"
 #~ msgstr "Источники"
 
@@ -28685,9 +29454,6 @@ msgstr "init_bonobo(): Не удается инициализировать Bono
 #~ msgid "Regions"
 #~ msgstr "Регионы"
 
-#~ msgid "Al_l stations:"
-#~ msgstr "Все станции:"
-
 #~ msgid "All _folders:"
 #~ msgstr "Все папки:"
 
@@ -28734,12 +29500,6 @@ msgstr "init_bonobo(): Не удается инициализировать Bono
 #~ msgid "(No name)"
 #~ msgstr "(Без имени)"
 
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Помощник по импорту Evolution"
-
-#~ msgid "New List"
-#~ msgstr "Создать список"
-
 #~ msgid "Configure the calendar's settings"
 #~ msgstr "Настроить календарь"
 
@@ -28805,4 +29565,3 @@ msgstr "init_bonobo(): Не удается инициализировать Bono
 
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr "Не удается идентифицировать вас в списке участников!\n"
-
diff --git a/po/sk.po b/po/sk.po
index 139ef268ef..4a1888c7ef 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.sk\n"
-"POT-Creation-Date: 2003-03-11 11:44+0100\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-03-12 22:08+0100\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@kde.org>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
@@ -18,29 +18,37 @@ msgstr ""
 "X-Generator: KBabel 1.2beta2\n"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr "Vytváracie rozhranie pre import súborov LDIF do Evolution."
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Poštový komponent Evolution."
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "Importuje súbory LDIF do 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 "Vytváracie rozhranie pre import súborov VCard do Evolution."
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Poštový komponent Evolution."
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importuje súbory VCard do Evolution."
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Poštový komponent 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:1310
+#: addressbook/backend/ebook/e-card.c:1301
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Uložiť ako"
 
 #: 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
 #: my-evolution/e-summary-table.c:59
@@ -48,13 +56,13 @@ msgid "Name"
 msgstr "Meno"
 
 #: 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:1764
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "Primárny"
 
@@ -64,8 +72,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:1749
+#: 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 "Asistent"
@@ -73,8 +81,8 @@ msgstr "Asistent"
 #: 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:1750
-#: addressbook/gui/contact-editor/e-contact-editor.c:1821
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr "Zamestnanie"
 
@@ -84,12 +92,12 @@ msgid "Bus"
 msgstr "Zam"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr "Spätné volanie"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "Firma"
 
@@ -100,13 +108,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:1756
-#: addressbook/gui/contact-editor/e-contact-editor.c:1822
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr "Domov"
 
 #: 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 "Organizácia"
@@ -117,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:1760
+#: 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:1754
+#: 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:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Pracovný fax"
@@ -138,13 +146,13 @@ msgid "Bus Fax"
 msgstr "Prac. fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Domáci fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "Zamestnanie 2"
 
@@ -153,43 +161,43 @@ msgid "Bus 2"
 msgstr "Zam 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "Domov 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: 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:1761
-#: addressbook/gui/contact-editor/e-contact-editor.c:1823
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "Iné"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1762
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Ďalší fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1763
+#: 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:1765
+#: 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:1766
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
@@ -200,15 +208,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:1794
+#: 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:1795
+#: 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"
@@ -232,7 +240,7 @@ msgid "Dep"
 msgstr "Odd"
 
 #: 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 "Pracovisko"
@@ -242,7 +250,7 @@ msgid "Off"
 msgstr "Prac."
 
 #: 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 "Titul"
@@ -257,7 +265,7 @@ msgid "Prof"
 msgstr "Pov."
 
 #: 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 "Vedúci"
@@ -271,7 +279,7 @@ msgid "Ass"
 msgstr "Asist."
 
 #: 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 "Prezývka"
@@ -281,19 +289,19 @@ msgid "Nick"
 msgstr "Prez."
 
 #: 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 "Manžel(ka)"
 
 #: 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 "Poznámka"
 
 #: 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 "URI kalendár"
 
@@ -319,7 +327,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 "Výročie"
 
@@ -332,7 +340,7 @@ msgid "Birth Date"
 msgstr "Dátum narodenia"
 
 #: 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 "Kategórie"
@@ -345,104 +353,104 @@ msgstr "Priezvisko"
 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 "Zoznam bez mena"
 
-#: 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 "Celé meno"
 
-#: 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 "Adresa"
 
-#: addressbook/backend/ebook/e-card.c:1337
+#: addressbook/backend/ebook/e-card.c:1328
 msgid "Address Label"
 msgstr "Značka adresy"
 
-#: addressbook/backend/ebook/e-card.c:1344
+#: addressbook/backend/ebook/e-card.c:1335
 msgid "Phone"
 msgstr "Telefón"
 
-#: addressbook/backend/ebook/e-card.c:1358
+#: addressbook/backend/ebook/e-card.c:1349
 msgid "Birth date"
 msgstr "Dátum narodenia"
 
-#: 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 "Organizáčná jednotka"
 
-#: 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 "Rola"
 
-#: addressbook/backend/ebook/e-card.c:1440 mail/mail-format.c:930
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
 msgid "Mailer"
 msgstr "Poštový klient"
 
-#: addressbook/backend/ebook/e-card.c:1454
+#: addressbook/backend/ebook/e-card.c:1445
 msgid "Free/Busy URL"
 msgstr "Voľno/zaneprázdnený URL"
 
-#: addressbook/backend/ebook/e-card.c:1461
+#: addressbook/backend/ebook/e-card.c:1452
 msgid "ICS Calendar"
 msgstr "Kalendár ICS"
 
-#: addressbook/backend/ebook/e-card.c:1475
+#: addressbook/backend/ebook/e-card.c:1466
 msgid "Related Contacts"
 msgstr "Súvisiace kontakty"
 
-#: addressbook/backend/ebook/e-card.c:1489
+#: addressbook/backend/ebook/e-card.c:1480
 msgid "Category List"
 msgstr "Zoznam kategórií"
 
-#: addressbook/backend/ebook/e-card.c:1496
+#: addressbook/backend/ebook/e-card.c:1487
 msgid "Wants HTML"
 msgstr "Chce HTML"
 
-#: addressbook/backend/ebook/e-card.c:1503
+#: addressbook/backend/ebook/e-card.c:1494
 msgid "Wants HTML set"
 msgstr "Nastavené, že chce HTML"
 
-#: addressbook/backend/ebook/e-card.c:1510
+#: addressbook/backend/ebook/e-card.c:1501
 msgid "List"
 msgstr "Zoznam"
 
-#: addressbook/backend/ebook/e-card.c:1517
+#: addressbook/backend/ebook/e-card.c:1508
 #, fuzzy
 msgid "List Show Addresses"
 msgstr "Iná adresa"
 
-#: addressbook/backend/ebook/e-card.c:1524
+#: addressbook/backend/ebook/e-card.c:1515
 msgid "Arbitrary"
 msgstr "Iné"
 
-#: addressbook/backend/ebook/e-card.c:1531
+#: addressbook/backend/ebook/e-card.c:1522
 msgid "ID"
 msgstr "ID"
 
-#: addressbook/backend/ebook/e-card.c:1538
+#: addressbook/backend/ebook/e-card.c:1529
 msgid "Last Use"
 msgstr "Posledné použitie"
 
-#: addressbook/backend/ebook/e-card.c:1549
+#: addressbook/backend/ebook/e-card.c:1540
 msgid "Use Score"
 msgstr "Použiť skóre"
 
@@ -494,80 +502,83 @@ msgstr "Prijímam výsledky hľadania LDAP..."
 msgid "Error performing search"
 msgstr "Chyba počas hľadania"
 
-#: addressbook/conduit/address-conduit.c:292
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Štandardná adresa pre synchronizáciu:"
 
-#: addressbook/conduit/address-conduit.c:535
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Kurzor nie je možné načítať\n"
 
-#: addressbook/conduit/address-conduit.c:548
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EBook nenačítaný\n"
 
-#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1272
-#: calendar/conduits/todo/todo-conduit.c:882
+#: 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 "Nie je možné spustiť server wombat"
 
-#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1273
-#: calendar/conduits/todo/todo-conduit.c:883
+#: 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 "Nie je možné spustiť 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 "Nie je možné prečítať blok aplikácie Adresa z pilota"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Ovládací prvok Bonobo pre adresy."
+msgid "Configure access to LDAP directory servers here"
+msgstr "Nastavenie prístupu k adresárovým serverom LDAP"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Ovládací prvok Bonobo, ktorý zobrazuje adresy."
+msgid "Directory Servers"
+msgstr "Adresárové servery"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Ukážkový ovládací prvok Bonobo, ktorý zobrazuje adresár."
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Prehliadač minikariet adresára Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr "Ovládací prvok nastavenia pre adresáre Evolution."
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Rozhranie pre výber mena adresára Evolution."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure access to LDAP directory servers here"
-msgstr "Nastavenie prístupu k adresárovým serverom LDAP"
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Prehliadač minikariet adresára Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Ovládací prvok pre zobrazenie minikariet adresára Evolution."
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Prehliadač minikariet adresára Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Directory Servers"
-msgstr "Adresárové servery"
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Prehliadač minikariet adresára Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Prehliadač minikariet adresára Evolution"
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Testovací komponent Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Komponent Evolution pre prácu s kontaktami."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Factory for the controls exported by the Evolution Addressbook"
-msgstr "Vytváracie rozhranie pre prvky adresára Evolution"
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Prehliadač minikariet adresára 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:1863
+#: 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 "Kontakty"
@@ -632,27 +643,27 @@ msgstr "Nepodarilo sa vykonať dotaz na koreňovom DSE"
 msgid "The server responded with no supported search bases"
 msgstr "Server odpovedal nepodporovanými databázami hľadania"
 
-#: addressbook/gui/component/addressbook-config.c:1191
+#: addressbook/gui/component/addressbook-config.c:1193
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Tento server nepodporuje informácie schém LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1213
+#: addressbook/gui/component/addressbook-config.c:1215
 msgid "Error retrieving schema information"
 msgstr "Chyba pri načítavaní informácie zo schémy"
 
-#: addressbook/gui/component/addressbook-config.c:1221
+#: addressbook/gui/component/addressbook-config.c:1223
 msgid "Server did not respond with valid schema information"
 msgstr "Server neodpovedal platnou informáciou o schéme"
 
-#: addressbook/gui/component/addressbook-config.c:1647
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr "Meno účtu"
 
-#: addressbook/gui/component/addressbook-config.c:1649
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr "Meno serveru"
 
-#: 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 nie je v tejto verzii Evolution povolený"
 
@@ -775,7 +786,7 @@ msgstr "Tento dotaz nebol dokončený úspešne."
 
 #. 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 "Ľubovoľná kategória"
 
@@ -788,47 +799,46 @@ msgstr "URI, ktoré zobrazí prehliadač priečinku"
 #. * 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 "(nič)"
 
-#: 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:1793
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr "Primárny e-mail"
 
-#: addressbook/gui/component/e-address-popup.c:608
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Vyberte akciu"
 
-#: 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 "Vytvoriť nový kontakt \"%s\""
 
-#: 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 "Pridať adresu do existujúceho kontaktu \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:911
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Otázka pre adresár..."
 
-#: 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 "Upraviť kontakt"
 
-#: 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 "Pridať do kontaktov"
 
-#: addressbook/gui/component/e-address-popup.c:1068
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Zliať e-mailovú adresu"
 
@@ -855,75 +865,56 @@ msgstr "Zobraziť _podporované základy"
 #: 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
-#: mail/subscribe-dialog.glade.h:3
 #: 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 "<- _Odstrániť"
-
-#: addressbook/gui/component/ldap-config.glade.h:15
-msgid "<< Fewer Options"
-msgstr "<< Menej možností"
-
-#: addressbook/gui/component/ldap-config.glade.h:16
-msgid "Add (or Edit) Attribute Mappings"
-msgstr "Pridať (alebo upraviť) mapovanie atribútov"
+#: 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 "Zdroje adresára"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:62
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
 #: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Vždy"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Anonymously"
 msgstr "Anonymne"
 
-#: 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"
@@ -936,57 +927,55 @@ msgstr ""
 "\n"
 "Prosím, stlačte \"Dokončiť\", aby sa nastavenie uložilo."
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
 msgstr "Pripojenie"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
-msgid "DN Customization"
-msgstr "Upravenie DN"
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "O_dstrániť"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "_Známe meno:"
 
-#: 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-mailová adresa:"
 
-#: 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 použije tento DN pre prihlásenie na váš server"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
-msgid "Evolution will use this email address to authenticate you with the server"
+#: addressbook/gui/component/ldap-config.glade.h:25
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution použije túto e-mailovú adresu pre prihlásenie na váš server"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Finished"
 msgstr "Dokončené"
 
-#: 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 "Všeobecné"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "LDAP Configuration Assistant"
 msgstr "Asistent nastavenia LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "Mappings"
-msgstr "Mapovanie"
-
-#: addressbook/gui/component/ldap-config.glade.h:35 mail/mail-account-gui.c:64
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr "Nikdy"
 
-#: 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 +989,26 @@ msgstr ""
 "(Transport Layer Security) pre šifrované zabezpečenie spojenia.\n"
 "To, ktorý z nich používa váš server LDAP, zistíte od jeho administrátora."
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Objectclasses"
-msgstr "Objektové triedy"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
-msgid "Objectclasses Used in Evolution:"
-msgstr "Objektové triedy použité v Evolution:"
-
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid "Objectclasses Used on Server:"
-msgstr "Objektové triedy použité na serveri:"
-
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Jeden"
 
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"Please select an Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-"Prosím, vyberte atribút Evolution a atribút\n"
-"LDAP, ktorý s nim chcete asociovať."
-
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid "R_estore Defaults"
-msgstr "Š_tandardné"
-
-#: addressbook/gui/component/ldap-config.glade.h:46
-msgid "Re_store Defaults"
-msgstr "Š_tandardné"
-
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "_Rozsah hľadania:"
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:48
-#: calendar/gui/calendar-model.c:1975 calendar/gui/e-day-view.c:1670
-#: calendar/gui/e-week-view.c:1223
+#: 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 "Hľadám"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Vybrané:"
 
-#: 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 +1017,7 @@ msgstr ""
 "Výber tejto voľby znamená, že Evolution bude váš server LDAP\n"
 "používať iba ak sever podporuje SSL alebo 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"
@@ -1071,7 +1032,7 @@ msgstr ""
 "server LDAP za firewallom, Evolution nemusí tieto protokoly používať,\n"
 "pretože vaše spojenie už zabezpečené je."
 
-#: 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"
@@ -1082,7 +1043,7 @@ msgstr ""
 "Táto voľba znamená, že váš server nepodporuje ani SSL ani TLS.\n"
 "Preto bude vaše spojenie nezabezpečené proti útokom."
 
-#: 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"
@@ -1091,37 +1052,38 @@ msgstr ""
 "Táto voľba umožňuje zmeniť štandardné nastavenie Evolution\n"
 "pre hľadanie pomocou LDAP a pre vytváranie a úpravu kontaktov."
 
-#: 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 "Zadanie mena displeja je rýchly požadovaný krok v nastavení serveru LDAP."
+msgstr ""
+"Zadanie mena displeja je rýchly požadovaný krok v nastavení serveru LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 1: Server Information"
 msgstr "Krok 1. Informácie o serveri"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Step 2: Connecting to Server"
 msgstr "Krok 2. Pripojenie k serveru"
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr "Krok 3. Hľadanie v adresári"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr "Krok 4. Meno displeja"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr "Pod"
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Supported Search Bases"
 msgstr "Podporované databáze hľadania"
 
-#: 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"
@@ -1132,7 +1094,7 @@ msgstr ""
 "a informácií pre prihlásenie. Ak ich nepoznáte, kontaktujte vášho\n"
 "systémového administrátora."
 
-#: 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"
@@ -1144,7 +1106,7 @@ msgstr ""
 "vašich hľadaní a ako dlho môže hľadanie trvať. Váš administrátor\n"
 "by vám mal povedať, či potrebujete tieto hodnoty zmeniť."
 
-#: 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"
@@ -1155,7 +1117,7 @@ msgstr ""
 "položky, kde hľadanie začne. Ak ho necháte prázdne, bude sa\n"
 "hľadať v celom adresárovom strome."
 
-#: 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"
@@ -1170,7 +1132,7 @@ msgstr ""
 "Rozsah hľadania \"jedna\" zahrnie iba položky, ktoré sú jednu úroveň\n"
 "pod vašim základnom hľadania.\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"
@@ -1185,13 +1147,13 @@ msgstr ""
 "Pridanie nového serveru vyžaduje niektoré špeciálne informácie,\n"
 "ktoré by vám mal poskytnúť administrátor vášho systému."
 
-#: 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 "Toto je plné meno vášho serveru LDAP. Napríklad \"ldap.mojafirma.sk\"."
 
-#: 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"
@@ -1200,7 +1162,7 @@ msgstr ""
 "Toto je maximálny počet sťahovaných kariet. Ak nastavíte príliš veľké číslo, "
 "tento adresár bude pomalý."
 
-#: 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 "
@@ -1209,7 +1171,7 @@ msgstr ""
 "Toto je metóda, ktorú Evolution použije pre prihlásenie. Uvedmte si, že "
 "použitie voľby \"E-mailová adresa\" vyžaduje anonymný prístup k serveru LDAP."
 
-#: 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"
@@ -1219,7 +1181,7 @@ msgstr ""
 "Evolution.\n"
 "Používa sa iba na zobrazovanie."
 
-#: 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"
@@ -1230,85 +1192,44 @@ msgstr ""
 "Zoznam štandardných portov je predvyplnený. Číslo portu by vám\n"
 "mal poskytnúť váš administrátor."
 
-#: 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 "Táto voľba učuje, ako dlho môže hľadanie prebiehať."
 
-#: 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 ""
-"Atribút do DN pridáte tak, že ho vyberiete v zozname a stlačíte\n"
-"\"Pridať atribút\".\n"
-"Každá hodnota, ktorú pridáte, sa bude požadovať pre každý nový\n"
-"kontakt, ktorý pridáte do adresára na serveri LDAP."
-
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr "Použiť _SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr "Použiť známe meno (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using email address"
 msgstr "Použiť e-mailovú adresu"
 
-#: addressbook/gui/component/ldap-config.glade.h:101
-#: mail/mail-account-gui.c:63 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 "Ak je to možné"
 
-#: 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
+#: 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 "_Pridať"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
-msgid "_Add ->"
-msgstr "_Pridať ->"
-
-#: addressbook/gui/component/ldap-config.glade.h:104
-msgid "_Add Mapping"
-msgstr "_Pridať mapovanie"
-
-#: addressbook/gui/component/ldap-config.glade.h:105
-msgid "_Add to DN"
-msgstr "_Pridať do DN"
-
-#: addressbook/gui/component/ldap-config.glade.h:106
-msgid "_Always"
-msgstr "_Vždy"
-
-#: addressbook/gui/component/ldap-config.glade.h:107
-msgid "_Delete Mapping"
-msgstr "_Odstrániť mapovanie"
-
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Display name:"
 msgstr "Meno pre zo_brazenie:"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-msgid "_Distinguished Name (DN):"
-msgstr "_Známe meno (DN):"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-msgid "_Don't use SSL/TLS"
-msgstr "_Nepoužívať SSL/TLS"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr "Obmedzenie _sťahovania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:112 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
@@ -1318,145 +1239,88 @@ msgstr "Obmedzenie _sťahovania:"
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
-msgid "_Edit Mapping"
-msgstr "_Upraviť mapovanie"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
-msgid "_Evolution attribute:"
-msgstr "Atribút _Evolution:"
-
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_If necessary "
-msgstr "_Ak potrebné"
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_LDAP attribute:"
-msgstr "Atribút _LDAP:"
-
-#: addressbook/gui/component/ldap-config.glade.h:117
-msgid "_LDAP attributes:"
-msgstr "Atribúty _LDAP:"
-
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr "Spôsob _prihlásenia:"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-msgid "_More Options >>"
-msgstr "_Viac možností >>"
-
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Port number:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_Restore Defaults"
-msgstr "Š_tandardné"
-
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Search base:"
 msgstr "_Oblasť hľadania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "_Meno serveru:"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Timeout (minutes):"
 msgstr "Ča_kanie (minúty):"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
-msgid "account-druid"
-msgstr "account-druid"
-
-#: addressbook/gui/component/ldap-config.glade.h:126
-msgid "account-editor"
-msgstr "account-editor"
-
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "cards"
 msgstr "karty"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
-msgid "dn-customization-tab"
-msgstr "dn-customization-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:130
-msgid "edit_server_window_simple"
-msgstr "edit_server_window_simple"
-
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
-msgid "mappings-tab"
-msgstr "mappings-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:133
-msgid "objectclasses-tab"
-msgstr "objectclasses-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:98
 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 "Rozhranie pre výber mena adresára Evolution."
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Vytváracie rozhranie pre rozhranie pre výber mena adresára."
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Odstrániť všetky"
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:162
-#: addressbook/gui/component/select-names/e-select-names.c:690
-#: composer/e-msg-composer-attachment-bar.c:507
+#: 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 "Odstrániť"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:177
-msgid "Remove All"
-msgstr "Odstrániť všetky"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+msgstr "Nový zoznam kontaktov"
 
-#: 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 "Upraviť kontakt"
+
+#: 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 "Poslať poštu HTML?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:399
-msgid "Edit Contact List"
-msgstr "Upraviť zoznam kontaktov"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:417
-msgid "Unnamed Contact List"
-msgstr "Zoznam kontaktov bez mena"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:434
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d nezobrazených)"
-
-#: 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 "Kontakt bez mena"
 
-#: 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 "Zdroj"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr "Vyberte kontakty z adresára"
 
-#: addressbook/gui/component/select-names/e-select-names.c:557
+#: addressbook/gui/component/select-names/e-select-names.c:648
 msgid "Find contact in"
 msgstr "Nájsť kontakt v"
 
@@ -1520,7 +1384,7 @@ msgstr "Spolupráca"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1343
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr "Editor kontaktov"
 
@@ -1584,13 +1448,13 @@ msgstr "Chce prijímať poštu ako _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:656 calendar/gui/e-calendar-table.c:969
-#: calendar/gui/e-day-view.c:3720 calendar/gui/e-week-view.c:3559
-#: filter/filter.glade.h:15 mail/folder-browser.c:1768
+#: 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 "_Odstrániť"
 
@@ -1620,14 +1484,14 @@ msgstr "Adresa _WWW stránky:"
 
 #: 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:187
+#: 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: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 "Upraviteľný"
 
@@ -2652,48 +2516,48 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:159
+#: 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:104
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:459
 msgid "Book"
 msgstr "Kniha"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:166
+#: 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 "Karta"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:173
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
 msgid "Is New Card"
 msgstr "Je nová karta"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
 msgid "Writable Fields"
 msgstr "Zapisovateľné polia"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
 msgid "Changed"
 msgstr "Zmenené"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:836
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr "Editor kategórií nie je k dispozícii."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:844
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "This contact belongs to these categories:"
 msgstr "Tento kontakt patrí do týchto kategórií:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1018
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr "Uložiť kontakt ako VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1064
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2701,17 +2565,17 @@ msgstr ""
 "Naozaj chcete odstrániť\n"
 "tieto kontakty?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1067
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr "Naozaj chcete odstrániť tento kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1767
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2371
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nie je možné nájsť prvok pre pole: `%s'"
@@ -2855,28 +2719,28 @@ msgstr "_Prípona:"
 msgid "_Title:"
 msgstr "_Titul:"
 
-#: 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 "Meno _zoznamu:"
 
-#: 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 "Členovia"
 
-#: 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 "Zadajte e-mailovú adresu, alo do zoznamu pretiahnite kontakt myšou:"
 
-#: 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 "_Skryť adresy pri posielaní e-mailu do tohto zoznamu"
 
-#: 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 "_Odstrániť"
 
-#: 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 "editor-zoznamu-kontaktov"
 
@@ -2942,8 +2806,9 @@ msgstr ""
 "Zmenený e-mail alebo meno pre tento kontakt už v tomto\n"
 "priečinku existuje. Chcete ho aj tak pridať?"
 
+#. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:117
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Pokročilé hľadanie"
 
@@ -2963,7 +2828,7 @@ msgstr "%d kariet"
 #: 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 "Dotaz"
@@ -2978,20 +2843,21 @@ msgstr "Model"
 
 #: 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 "Chyba pri zmene karty"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1160
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr "Úspech"
 
 #: 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:2104
-#: shell/e-storage.c:606 shell/evolution-shell-component.c:1199
+#: 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 "Neznáma chyba"
 
@@ -2999,8 +2865,8 @@ msgstr "Neznáma chyba"
 msgid "Repository offline"
 msgstr "Sklad off-line"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:592
-#: shell/evolution-shell-component.c:1190
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr "Prístup zamietnutý"
 
@@ -3017,11 +2883,11 @@ msgid "Protocol not supported"
 msgstr "Protokol nepodporovaný"
 
 #: 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
-#: camel/camel-service.c:847 camel/camel-service.c:890
+#: 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"
@@ -3048,7 +2914,7 @@ msgid "Other error"
 msgstr "Iná chyba"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:75
-#: calendar/gui/dialogs/save-comp.c:49
+#: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Chcete uložiť zmeny?"
 
@@ -3121,7 +2987,7 @@ msgstr "Typ"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-#: mail/importers/pine-importer.c:591
+#: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Adresár"
 
@@ -3204,15 +3070,15 @@ msgstr "Kopírovať"
 msgid "Paste"
 msgstr "Vložiť"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:10
-#: mail/mail-accounts.c:225 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 "Odstrániť"
 
 #: 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 "Aktuálny pohľad"
 
@@ -3316,38 +3182,38 @@ msgstr "a jedna iná karta."
 msgid "Save in addressbook"
 msgstr "Uložiť do adresára"
 
-#: 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 "Šírka"
 
-#: 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 "Výška"
 
-#: 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 "Je aktívny"
 
-#: addressbook/gui/widgets/e-minicard-label.c:123
+#: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Pole"
 
-#: addressbook/gui/widgets/e-minicard-label.c:130
+#: addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Meno poľa"
 
-#: addressbook/gui/widgets/e-minicard-label.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Model textu"
 
-#: addressbook/gui/widgets/e-minicard-label.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Maximálna dĺžka mena poľa"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:125
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
 msgstr "Šírka stĺpca"
 
@@ -3379,11 +3245,11 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adaptér"
 
-#: addressbook/gui/widgets/e-minicard.c:165
+#: addressbook/gui/widgets/e-minicard.c:169
 msgid "Selected"
 msgstr "Výbrané"
 
-#: addressbook/gui/widgets/e-minicard.c:172
+#: addressbook/gui/widgets/e-minicard.c:176
 msgid "Has Cursor"
 msgstr "Má kurzor"
 
@@ -3706,97 +3572,100 @@ msgstr "30."
 msgid "31st"
 msgstr "31."
 
-#: calendar/cal-util/cal-util.c:523 calendar/cal-util/cal-util.c:545
+#: 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 "Vysoká"
 
-#: calendar/cal-util/cal-util.c:525 calendar/cal-util/cal-util.c:547
-#: calendar/gui/calendar-model.c:1701
+#: 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 "Normálny"
 
-#: calendar/cal-util/cal-util.c:527 calendar/cal-util/cal-util.c:549
+#: 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 "Nízka"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:543
+#: 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 "Nedefinovaná"
 
-#: calendar/conduits/calendar/calendar-conduit.c:204
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr "Rozdeliť viacdňové udalosti:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1219
-#: calendar/conduits/todo/todo-conduit.c:828
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Chyba pri komunikácii s kalendárovým serverom"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1370
-#: calendar/conduits/calendar/calendar-conduit.c:1373
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nie je možné prečítať blok aplikácie Calendar pilota"
 
-#: calendar/conduits/todo/todo-conduit.c:204
+#: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
 msgstr "Štandardná priorita:"
 
-#: calendar/conduits/todo/todo-conduit.c:952
-#: calendar/conduits/todo/todo-conduit.c:955
+#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nie je možné prečítať blok aplikácie ToDo pilota"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "Ovládací prvok Bonobo pre zobrazenie zoznamu úloh."
+msgid "Calendar and Tasks"
+msgstr "Kalendár a úlohy"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Ukážkový ovládací prvok Bonobo pre zobrazenie kalendára."
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Nastavenie časovej zóny, kalendára a zoznamu úloh"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
 msgstr "Kalendár a úlohy"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Nastavenie pre kalendár Evolution."
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Komponent zobrazenia poštového priečinku Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Nastavenie časovej zóny, kalendára a zoznamu úloh"
+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 "Prehliadač iTip/mTip kalendára Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Komponent Evolution pre prácu s kalendárom."
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Prehliadač iTip/mTip kalendára Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Factory for the Evolution Calendar objects"
-msgstr "Vytváracie rozhranie pre objekty Kalendár Evolution"
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Prehliadač iTip/mTip kalendára Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Vytváracie rozhranie pre centralizáciu komponent Kalendár Evolution."
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Alarm Evolution"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Alarm notification service"
-msgstr "Služba upozorňovania na poplachy"
-
-#: 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 "Vytváracie rozhranie pre službu na upozornenie na poplach"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
@@ -3837,17 +3706,17 @@ msgstr "Čas opakovania (minúty)"
 msgid "_Edit appointment"
 msgstr "_Upraviť schôdzku"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:760
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "Popis nie je k dispozícii."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:831
-#: calendar/gui/alarm-notify/alarm-queue.c:855
-#: calendar/gui/tasks-control.c:457 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 "Varovanie"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:835
+#: 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"
@@ -3858,7 +3727,7 @@ msgstr ""
 "pomocou e-mailu, ale toto upozornenie tak bolo nastavené.\n"
 "Evolution preto zobrazí normálny dialóg."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:861
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3875,7 +3744,7 @@ msgstr ""
 "\n"
 "Chcete tento program spustiť?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:889
 msgid "Do not ask me about this program again."
 msgstr "Pre tento program túto správu už nezobrazovať."
 
@@ -3899,7 +3768,7 @@ msgstr "Popis obsahuje"
 msgid "Comment contains"
 msgstr "Komentár obsahuje"
 
-#: 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 "Nenájdené"
 
@@ -3909,8 +3778,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"
 
@@ -3928,110 +3797,111 @@ 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"
 
 #: calendar/gui/calendar-commands.c:799
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nie je možné vytvoriť kalendárový pohľad. Prosím, overte nastavenie ORBit a "
 "OAF."
 
-#: calendar/gui/calendar-component.c:71 calendar/gui/gnome-cal.c:1341
-#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1862
+#: 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 "Kalendár"
 
-#: calendar/gui/calendar-component.c:72
+#: calendar/gui/calendar-component.c:71
 msgid "Folder containing appointments and events"
 msgstr "Priečinok obsahujúci schôdzky a udalosti"
 
-#: calendar/gui/calendar-component.c:76
+#: calendar/gui/calendar-component.c:75
 msgid "Public Calendar"
 msgstr "Verejný kalendár"
 
-#: calendar/gui/calendar-component.c:77
+#: calendar/gui/calendar-component.c:76
 msgid "Public folder containing appointments and events"
 msgstr "Verejný priečinok obsahujúci schôdzky a udalosti"
 
-#: calendar/gui/calendar-component.c:81 calendar/gui/e-tasks.c:735
-#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:511
-#: calendar/importers/icalendar-importer.c:708
-#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1864
-#: my-evolution/e-summary-tasks.c:326 my-evolution/e-summary-tasks.c:344
+#: 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 "Úlohy"
 
-#: calendar/gui/calendar-component.c:82
+#: calendar/gui/calendar-component.c:81
 msgid "Folder containing to-do items"
 msgstr "Priečinok obsahujúci úlohy to-do"
 
-#: calendar/gui/calendar-component.c:86
+#: calendar/gui/calendar-component.c:85
 msgid "Public Tasks"
 msgstr "Verejné úlohy"
 
-#: calendar/gui/calendar-component.c:87
+#: calendar/gui/calendar-component.c:86
 msgid "Public folder containing to-do items"
 msgstr "Verejný priečinok obsahujúci úlohy to-do"
 
-#: calendar/gui/calendar-component.c:739
+#: calendar/gui/calendar-component.c:730
 msgid "New appointment"
 msgstr "Nová schôdzka"
 
-#: calendar/gui/calendar-component.c:739
+#: calendar/gui/calendar-component.c:730
 msgid "_Appointment"
 msgstr "S_chôdzka"
 
-#: calendar/gui/calendar-component.c:740
+#: calendar/gui/calendar-component.c:731
 msgid "Create a new appointment"
 msgstr "Vytvoriť novú schôdzku"
 
-#: calendar/gui/calendar-component.c:744
+#: calendar/gui/calendar-component.c:735
 msgid "New meeting"
 msgstr "Nové stretnutie"
 
-#: calendar/gui/calendar-component.c:744
+#: calendar/gui/calendar-component.c:735
 msgid "_Meeting"
 msgstr "_Stretnutie"
 
-#: calendar/gui/calendar-component.c:745
+#: calendar/gui/calendar-component.c:736
 msgid "Create a new meeting request"
 msgstr "Vytvorí novú požiadavku na stretnutie"
 
-#: calendar/gui/calendar-component.c:749
+#: calendar/gui/calendar-component.c:740
 msgid "New task"
 msgstr "Nová úloha"
 
-#: calendar/gui/calendar-component.c:749
+#: calendar/gui/calendar-component.c:740
 msgid "_Task"
 msgstr "Ú_loha"
 
-#: calendar/gui/calendar-component.c:750
+#: calendar/gui/calendar-component.c:741
 msgid "Create a new task"
 msgstr "Vytvorí novú úlohu"
 
-#: calendar/gui/calendar-component.c:754
+#: calendar/gui/calendar-component.c:745
 msgid "New All Day Appointment"
 msgstr "Nová celodenná schôdzka"
 
-#: calendar/gui/calendar-component.c:754
+#: calendar/gui/calendar-component.c:745
 msgid "All _Day Appointment"
 msgstr "_Celodenná Schôdzka"
 
-#: calendar/gui/calendar-component.c:755
+#: calendar/gui/calendar-component.c:746
 msgid "Create a new all-day appointment"
 msgstr "Vytvoriť novú celodennú schôdzku"
 
-#: 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 "Súkromný"
 
-#: 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 "Tajný"
@@ -4056,37 +3926,37 @@ 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 "Voľný"
 
 #: 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:1184
+#: calendar/gui/e-meeting-time-sel.c:407
+#: shell/evolution-shell-component.c:1202
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
-#: 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čal"
 
-#: 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 "Prebieha"
 
-#: 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čený"
 
-#: calendar/gui/calendar-model.c:1028
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4097,33 +3967,33 @@ 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:286
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1982
-#: mail/folder-browser.c:1730 mail/mail-account-gui.c:1254
-#: mail/mail-account-gui.c:1686 mail/mail-accounts.c:433
-#: mail/mail-config.glade.h:78
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:196
+#: 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 "Žiadna"
 
-#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Opakovanie"
 
-#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Priradené"
 
-#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:276
-#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:541
-#: calendar/gui/e-meeting-model.c:835
+#: 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 "Áno"
 
-#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:836
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "Nie"
 
@@ -4160,31 +4030,31 @@ msgstr "Prístup zamietnutý pri otváraní kalendára"
 msgid "Could not open the folder in '%s'"
 msgstr "Nie je možné otvoriť priečinok v '%s'"
 
-#: calendar/gui/control-factory.c:163
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "URI, ktoré bude kalendár zobrazovať"
 
-#: calendar/gui/control-factory.c:170
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr "Typ pohľadu, ktorý sa má zobraziť"
 
-#: calendar/gui/dialogs/alarm-options.c:473
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Zvukové alarmy"
 
-#: calendar/gui/dialogs/alarm-options.c:482
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Alarmy správami"
 
-#: calendar/gui/dialogs/alarm-options.c:491
+#: calendar/gui/dialogs/alarm-options.c:438
 msgid "Email Alarm Options"
 msgstr "Možnosti e-mailového alarmu"
 
-#: calendar/gui/dialogs/alarm-options.c:500
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Programové alarmy"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Neznáme alarmy"
 
@@ -4220,22 +4090,24 @@ msgstr "Adresát:"
 msgid "With these arguments:"
 msgstr "S týmito argumentami:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 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 "dní"
 
 #: 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 "extra oprakovanie každých"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12 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 "hodín"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 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 "minút"
 
@@ -4300,7 +4172,7 @@ msgstr "koniec schôdzky"
 msgid "hour(s)"
 msgstr "hodí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 "minút"
 
@@ -4480,7 +4352,7 @@ msgid "_Fri"
 msgstr "P_ia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "_Všeobecné"
 
@@ -4525,8 +4397,7 @@ msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
-"Odstraňovaná udalosť je schôdzka. Chcete poslať oznámenie "
-"o jej zrušení?"
+"Odstraňovaná udalosť je schôdzka. Chcete poslať oznámenie o jej zrušení?"
 
 #: calendar/gui/dialogs/cancel-comp.c:61
 msgid "Are you sure you want to cancel and delete this meeting?"
@@ -4537,8 +4408,7 @@ msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
-"Odstraňovaná úloha je priradená. Chcete poslať oznámenie "
-"o jej zrušení?"
+"Odstraňovaná úloha je priradená. Chcete poslať oznámenie o jej zrušení?"
 
 #: calendar/gui/dialogs/cancel-comp.c:70
 msgid "Are you sure you want to cancel and delete this task?"
@@ -4549,8 +4419,8 @@ msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
-"Odstraňovaný záznam žurnálu je publikovaný. Chcete poslať "
-"oznámenie o jeho zrušení?"
+"Odstraňovaný záznam žurnálu je publikovaný. Chcete poslať oznámenie o jeho "
+"zrušení?"
 
 #: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
@@ -4625,58 +4495,58 @@ msgstr " (Termín do "
 msgid "Due "
 msgstr "Termín do "
 
-#: calendar/gui/dialogs/comp-editor.c:329
+#: calendar/gui/dialogs/comp-editor.c:328
 msgid "Could not update invalid object"
 msgstr "Nepodarilo sa aktualizovať neplatný objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:332
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr "Objekt nenájdený, preto neaktualizovaný"
 
-#: calendar/gui/dialogs/comp-editor.c:335
+#: calendar/gui/dialogs/comp-editor.c:334
 msgid "You don't have permissions to update this object"
 msgstr "Nemáte práva pre aktualizáciu tohto objektu"
 
-#: calendar/gui/dialogs/comp-editor.c:338
+#: calendar/gui/dialogs/comp-editor.c:337
 msgid "Could not update object"
 msgstr "Nepodarilo sa aktualizovať objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:788
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Upraviť schôdzku"
 
-#: calendar/gui/dialogs/comp-editor.c:793
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "Schôdzka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:796
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "Úloha - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:799
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Položka denníka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:810
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "Žiadny súhrn"
 
-#: calendar/gui/dialogs/comp-editor.c:1231
-#: 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/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 "Uložiť ako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1332
-#: calendar/gui/dialogs/comp-editor.c:1356
-#: calendar/gui/dialogs/comp-editor.c:1380
+#: 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 "Zmeny tejto položky môžu byť zahodné v prípade, že príde aktualizácia"
 
-#: calendar/gui/dialogs/comp-editor.c:1407
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr "Nepodarilo sa získať aktuálnu verziu!"
 
@@ -4748,29 +4618,29 @@ msgstr "Opakovanie"
 
 #: calendar/gui/dialogs/event-editor.c:220
 #: calendar/gui/dialogs/event-editor.c:292
-#: calendar/gui/dialogs/event-editor.c:432
+#: calendar/gui/dialogs/event-editor.c:434
 msgid "Scheduling"
 msgstr "Plánovanie"
 
 #: calendar/gui/dialogs/event-editor.c:227
 #: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:435 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:437 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Stretnutie"
 
-#: 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 "Dátum začiatku je neplatný"
 
-#: calendar/gui/dialogs/event-page.c:664
+#: calendar/gui/dialogs/event-page.c:610
 msgid "End date is wrong"
 msgstr "Dátum konca je neplatný"
 
-#: calendar/gui/dialogs/event-page.c:687
+#: calendar/gui/dialogs/event-page.c:633
 msgid "Start time is wrong"
 msgstr "Čas začiatku je neplatný"
 
-#: calendar/gui/dialogs/event-page.c:694
+#: calendar/gui/dialogs/event-page.c:640
 msgid "End time is wrong"
 msgstr "Čas konca je neplatný"
 
@@ -4827,31 +4697,30 @@ msgid "Su_mmary:"
 msgstr "_Súhrn:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Kontakty..."
-
-#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_End time:"
 msgstr "Čas _konca:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "Čas _začiatku:"
 
-#: calendar/gui/dialogs/meeting-page.c:400
+#: 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 "Organizátor je vyžadovaný."
 
-#: calendar/gui/dialogs/meeting-page.c:424
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr "Nutný je aspoň jeden účastník."
 
-#: calendar/gui/dialogs/meeting-page.c:579
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr "Táto osoba sa už zúčastňuje!"
 
-#: calendar/gui/dialogs/meeting-page.c:652
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr "_Delegovať na..."
 
@@ -4891,14 +4760,14 @@ msgid "Member"
 msgstr "Člen"
 
 #: 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"
 
 #: 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 "Stav"
@@ -4913,10 +4782,37 @@ msgid "_Change Organizer"
 msgstr "_Zmeniť organizátora"
 
 #: 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 "_Pozvať ostatných..."
 
+#: 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 And Futuna Islands"
+
+#: 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 "Táto schôdzka obsahuje opakovanie, ktoré Evolution nedokáže upraviť."
@@ -4933,7 +4829,7 @@ msgstr "zapnutá"
 msgid "first"
 msgstr "prvý"
 
-#: calendar/gui/dialogs/recurrence-page.c:978 filter/filter-datespec.c:65
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr "sekundy"
 
@@ -4953,7 +4849,7 @@ msgstr "posledný"
 msgid "Other Date"
 msgstr "Iný dátum"
 
-#: calendar/gui/dialogs/recurrence-page.c:1032 filter/filter-datespec.c:68
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "deň"
 
@@ -5060,7 +4956,7 @@ msgid "Progress"
 msgstr "Priebeh"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:630
+#: my-evolution/e-summary-preferences.c:633
 msgid "URL:"
 msgstr "URL:"
 
@@ -5086,7 +4982,7 @@ msgstr "Priradenie"
 msgid "Due date is wrong"
 msgstr "Termín je neplatný"
 
-#: 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:"
@@ -5096,6 +4992,10 @@ msgstr "Popis:"
 msgid "Sta_rt Date:"
 msgstr "_Počiatočný dátum:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Kontakty..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Termín:"
@@ -5194,56 +5094,67 @@ msgid "%s for an unknown trigger type"
 msgstr "%s pre neznámy typ spustenia"
 
 #: 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 "Odstráňujem vybrané objekty"
 
-#: 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: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 "_Otvoriť"
@@ -5252,30 +5163,30 @@ msgstr "_Otvoriť"
 msgid "_Save as..."
 msgstr "Uložiť _ako..."
 
-#: 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 "_Tlačiť..."
 
-#: 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 "Vystri_hnúť"
 
-#: 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 "_Kopírovať"
 
-#: 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"
@@ -5301,12 +5212,12 @@ msgstr "_Označiť úlohy ako dokončené"
 msgid "_Delete Selected Tasks"
 msgstr "O_dstrániť vybrané úlohy"
 
-#: calendar/gui/e-calendar-table.c:1243 calendar/gui/e-day-view.c:7640
-#: calendar/gui/e-week-view.c:4248
+#: 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 "Aktualizujem objekty"
 
-#: calendar/gui/e-calendar-table.c:1326
+#: calendar/gui/e-calendar-table.c:1327
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kliknutím pridáte úlohu"
@@ -5345,7 +5256,7 @@ msgid "Start Date"
 msgstr "Dátum štartu"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:56 shell/e-shell.c:767
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Súhrn"
@@ -5377,22 +5288,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 rozdelení minúty"
 
 #. 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"
 
@@ -5408,67 +5319,67 @@ msgstr "dopoludnia"
 msgid "pm"
 msgstr "popoludní"
 
-#: calendar/gui/e-day-view.c:3659
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "Nová _schôdzka"
 
-#: 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 "Nová celodenná _udalosť"
 
-#: 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 "Nové stretnutie"
 
-#: 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 "Nová úloha"
 
-#: 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 "Tlačiť..."
 
-#: 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 "Prejsť na d_nešný dátum"
 
-#: 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 "_Prejsť na dátum..."
 
-#: 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 "_Publikovať informácie o voľnom čase"
 
-#: calendar/gui/e-day-view.c:3694 calendar/gui/e-week-view.c:3535
-#: 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 "Nas_tavenie..."
 
-#: calendar/gui/e-day-view.c:3703 calendar/gui/e-week-view.c:3542
-#: 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 "Uložiť _ako..."
 
-#: 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 "Naplánovať _stretnutie..."
 
-#: 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 "Poslať ďalej ako i_Calendar..."
 
-#: 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 "Nastaviť tento výskyt ako _presunuteľný"
 
-#: 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 "Odstrániť tento vý_skyt"
 
-#: 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 "Odstrániť _všetky výskyty"
 
@@ -5579,338 +5490,341 @@ msgstr "Neznáma osoba"
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
-msgstr "<br> Prosím, skontrolujte tieto informácie a potom vyberte z menu akciu."
+msgstr ""
+"<br> Prosím, skontrolujte tieto informácie a potom vyberte z menu akciu."
 
 #: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Žiadna</i>"
 
-#: calendar/gui/e-itip-control.c:1058
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "Umiestnenie:"
 
-#: calendar/gui/e-itip-control.c:1072
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr "Stav:"
 
-#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-meeting-model.c:296
-#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:849
-#: calendar/gui/itip-utils.c:404
+#: 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 "Akceptované"
 
-#: calendar/gui/e-itip-control.c:1081 calendar/gui/itip-utils.c:407
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Predbežne akceptové"
 
-#: calendar/gui/e-itip-control.c:1085 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:850
-#: calendar/gui/itip-utils.c:410 calendar/gui/itip-utils.c:436
+#: 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 "Odmietnuté"
 
-#: 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:807
-#: calendar/gui/e-meeting-model.c:823 camel/camel-gpg-context.c:1531
-#: camel/camel-gpg-context.c:1581 camel/camel-tcp-stream-openssl.c:634
-#: 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:931 widgets/misc/e-charset-picker.c:60
+#: 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 "Neznámy"
 
-#: 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 "Vyberte akciu:"
 
-#: calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Aktualizovať"
 
-#: 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:2094 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 "Akceptovať"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Predbežne akceptovať"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Odmietnuť"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Poslať informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Aktualizovať stav respondenta"
 
-#: calendar/gui/e-itip-control.c:1225
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Poslať najnovšie informácie"
 
-#: calendar/gui/e-itip-control.c:1238 calendar/gui/itip-utils.c:424
-#: shell/evolution-shell-component.c:1162 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 "Zrušiť"
 
-#: 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> poslal informácie o stretnutí."
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Informácie o stretnutí"
 
-#: 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> požaduje účasť %s na stretnutí."
 
-#: 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> požaduje vašu účasť na stretnutí."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Návrh na stretnutie"
 
-#: 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> si praje byť pridaný na existujúce stretnutie."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Aktualizácia stretnutia"
 
-#: 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> si praje dostať najnovšie informácie o stretnutí."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "Požiadavka na aktualizáciu stretnutia"
 
-#: 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> odpovedal na požiadavku o stretnutí."
 
-#: calendar/gui/e-itip-control.c:1346
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Odpoveď pre stretnutie"
 
-#: 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> zrušil stretnutie."
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Zrušenie stretnutia"
 
-#: 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> poslal nerozpoznateľnú správu."
 
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Neplatná správa o stretnutí"
 
-#: 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> poslal informácie o úlohe."
 
-#: calendar/gui/e-itip-control.c:1387
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Informácia o úlohe"
 
-#: 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> požaduje, aby %s vykonal úlohu."
 
-#: 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> požaduje, aby ste vykonali úlohu."
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Návrh úlohy"
 
-#: 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> si praje byť pridaný do existujúcej úlohy."
 
-#: calendar/gui/e-itip-control.c:1400
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Aktualizácia úlohy"
 
-#: 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> si praje získať najnovšie informácie o úlohe."
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Požiadavka na aktualizáciu úlohy"
 
-#: 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> odpovedal na priradenie úlohy."
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Odpoveď pre úlohu"
 
-#: 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> zrušil úlohu."
 
-#: calendar/gui/e-itip-control.c:1421
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Zrušenie úlohy"
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Neplatná správa úlohy"
 
-#: 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> publikoval informácie o voľnom čase."
 
-#: calendar/gui/e-itip-control.c:1449
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Informácie o voľnom čase"
 
-#: 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> požaduje informáciu o vašom voľnom čase."
 
-#: calendar/gui/e-itip-control.c:1454
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Požiadavka na informácie o voľnom čase"
 
-#: 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> odpovedal na požiadavku na informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1459
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Odpoveď s informácio o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1464
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Neplatná správa o voľnom čase"
 
-#: 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 "Správa asi nie je správne formátovaná"
 
-#: calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "Táto správa obsahuje iba nepodporované požiadavky."
 
-#: 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 "Príloha neobsahuje platnú správu kalendára"
 
-#: calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "Príloha nemá žiadne zobraziteľné položky kalendára"
 
-#: 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 nie je platný a nie je možné ho aktualizovať\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 "Nastala chyba v systéme 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 "Objekt sa nepodarilo nájsť\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 "Nemáte práva pre aktualizáciu kalendára\n"
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Aktualizácia dokončená\n"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "Súbor kalendára nie je aktualizovať!\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 "Stav účastníka nie je možné aktualizovať, pretože položka už neexistuje"
+msgstr ""
+"Stav účastníka nie je možné aktualizovať, pretože položka už neexistuje"
 
-#: 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 "Táto odpoveď nie je od účastníka. Chcete ho ako účastníka pridať?"
 
-#: 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 "Stav účastníka nie je možné aktualizovať, pretože jeho stav nie je platný!\n"
+msgstr ""
+"Stav účastníka nie je možné aktualizovať, pretože jeho stav nie je platný!\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 "Nemáte práva pre aktualizáciu kalendára\n"
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Stav účastníka bol aktualizovaný\n"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "Stav účastníka nie je možné aktualizovať!\n"
 
-#: calendar/gui/e-itip-control.c:2048
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Odstránenie dokončené"
 
-#: 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 "Položka poslaná!\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 "Položku nie je možné poslať!\n"
 
-#: calendar/gui/e-itip-control.c:2205
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr "Vyberte priečinok kalendára"
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr "Vyberte priečinok úloh"
 
@@ -5955,7 +5869,7 @@ msgstr "dátum začiatku"
 msgid "Chair Persons"
 msgstr "Predsedovia"
 
-#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1692
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
 msgid "Required Participants"
 msgstr "Vyžadovaní účastníci"
 
@@ -5968,57 +5882,57 @@ msgid "Resources"
 msgstr "Zdroje"
 
 #: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
-#: calendar/gui/e-meeting-model.c:537 calendar/gui/e-meeting-model.c:803
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:806
 msgid "Individual"
 msgstr "Individuálne"
 
 #: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
-#: calendar/gui/e-meeting-model.c:804
+#: calendar/gui/e-meeting-model.c:807
 msgid "Group"
 msgstr "Skupina"
 
 #: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
-#: calendar/gui/e-meeting-model.c:805
+#: calendar/gui/e-meeting-model.c:808
 msgid "Resource"
 msgstr "Zdroj"
 
 #: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
-#: calendar/gui/e-meeting-model.c:806
+#: calendar/gui/e-meeting-model.c:809
 msgid "Room"
 msgstr "Miestnosť"
 
 #: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:822
 msgid "Chair"
 msgstr "Predseda"
 
 #: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:539 calendar/gui/e-meeting-model.c:820
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
 msgid "Required Participant"
 msgstr "Vyžadovaný účastník"
 
 #: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:263
-#: calendar/gui/e-meeting-model.c:821
+#: calendar/gui/e-meeting-model.c:824
 msgid "Optional Participant"
 msgstr "Nepovinný účastník"
 
 #: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:265
-#: calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:825
 msgid "Non-Participant"
 msgstr "Bez účasti"
 
 #: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
-#: calendar/gui/e-meeting-model.c:547 calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:550 calendar/gui/e-meeting-model.c:851
 msgid "Needs Action"
 msgstr "Potrebné úkony"
 
 #: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
-#: calendar/gui/e-meeting-model.c:851 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 "Predbežný"
 
 #: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
-#: calendar/gui/e-meeting-model.c:852
+#: calendar/gui/e-meeting-model.c:855
 msgid "Delegated"
 msgstr "Delegované"
 
@@ -6029,14 +5943,14 @@ msgstr "Prebieha"
 #. 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, %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: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"
@@ -6048,63 +5962,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 "Mimo kancelárie"
 
-#: calendar/gui/e-meeting-time-sel.c:410
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Žiadna informácia"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Nastavenie"
 
-#: calendar/gui/e-meeting-time-sel.c:468
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Zobraziť _iba pracovné hodiny"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Ukázať z_menšené"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "_Obnoviť voľno/zaneprázdnený"
 
-#: 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 "_Autovýber"
 
-#: 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 "_Všetky osoby a zdroje"
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Všetky _osoby a jeden zdroj"
 
-#: calendar/gui/e-meeting-time-sel.c:594
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "_Vyžadované osoby"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Vyžadované osoby a _jeden zdroj"
 
-#: calendar/gui/e-meeting-time-sel.c:630
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "_Začiatok stretnutia:"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "_Koniec stretnutia:"
 
@@ -6150,7 +6064,7 @@ msgstr "Odstráňujem vybrané objekty..."
 msgid "Expunging"
 msgstr "Čistím"
 
-#: calendar/gui/e-week-view.c:3509
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Nová _schôdzka..."
 
@@ -6256,56 +6170,57 @@ msgstr "Október"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:262 calendar/gui/itip-utils.c:333
+#: 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 "Organizátor musí byť nastavený."
 
-#: calendar/gui/itip-utils.c:297
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "Nutný je aspoň jeden účastník"
 
-#: calendar/gui/itip-utils.c:376 calendar/gui/itip-utils.c:485
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 msgid "Event information"
 msgstr "informácie o udalosti"
 
-#: calendar/gui/itip-utils.c:378 calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 msgid "Task information"
 msgstr "Informácie o úlohe"
 
-#: calendar/gui/itip-utils.c:380 calendar/gui/itip-utils.c:489
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Journal information"
 msgstr "Informácie o denníku"
 
-#: calendar/gui/itip-utils.c:382 calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 msgid "Free/Busy information"
 msgstr "Informácie o voľnom čase"
 
-#: calendar/gui/itip-utils.c:384
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Informácie o kalendári"
 
-#: calendar/gui/itip-utils.c:420
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr "Aktualizované"
 
-#: calendar/gui/itip-utils.c:428
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr "Aktualizovať"
 
-#: calendar/gui/itip-utils.c:432
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr "Protinávrh"
 
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informácie o voľnom čase (%s do %s)"
 
-#: calendar/gui/itip-utils.c:512
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "Informácie iCalendar"
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Musíte byť účastníkom stretnutia."
 
@@ -6404,8 +6319,8 @@ msgid "Contacts: "
 msgstr "Kontakty: "
 
 #: calendar/gui/print.c:2533 calendar/gui/print.c:2619
-#: calendar/gui/tasks-control.c:579 mail/mail-callbacks.c:2939
-#: my-evolution/e-summary.c:618
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:616
 msgid "Print Preview"
 msgstr "Ukážka pred tlačou"
 
@@ -6421,7 +6336,7 @@ msgstr "Nastavenie tlačiarne"
 msgid "The URI of the tasks folder to display"
 msgstr "URI, ktoré bude zobrazovať priečinok úloh"
 
-#: calendar/gui/tasks-control.c:465
+#: 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"
@@ -6433,86 +6348,51 @@ msgstr ""
 "\n"
 "Naozaj odstrániť tieto úlohy?"
 
-#: calendar/gui/tasks-control.c:472
+#: calendar/gui/tasks-control.c:479
 msgid "Do not ask me again."
 msgstr "Túto správu už nezobrazovať."
 
-#: calendar/gui/tasks-control.c:608
+#: calendar/gui/tasks-control.c:615
 msgid "Print Tasks"
 msgstr "Tlačiť úlohy"
 
-#: 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 automaticky previedol úlohy z priečinku kalendára do nového "
-"priečinku úloh."
-
-#: 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 sa pokúsil automaticky previesť úlohy z priečinku kalendára do "
-"nového priečinku úloh.\n"
-"Niektoré úlohy nebolo možné preniesť, takže je možné sa o to pokúsiť neskô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 ""
-"Nie je možné otvoriť `%s'; žiadne údaje z priečinku kalendára nebudú "
-"prevedené do priečinku úloh."
-
-#: 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 ""
-"Metóda pre načítanie `%s' nie je podporovaná, žiadne položky z priečinku "
-"kalendára nebudú prenesené do priečinku úloh."
-
-#: 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 "NPUSŠPS"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "Vytváracie rozhranie pre import súborov iCalendar do Evolution"
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Prehliadač iTip/mTip kalendára Evolution"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "Importuje súbory iCalendar do Evolution"
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Prehliadač iTip/mTip kalendára Evolution"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "Importuje súbory vCalendar do Evolution"
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Prehliadač iTip/mTip kalendára Evolution"
 
-#: calendar/importers/icalendar-importer.c:172
-#, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr "Nie je možné získať zoznam skladov z registra: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Správa kalendára"
 
-#: calendar/importers/icalendar-importer.c:184
-#, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "Nie je možné zavolať getFolderAtPath pre sklad: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
+msgstr ""
 
-#: calendar/importers/icalendar-importer.c:487
+#: calendar/importers/icalendar-importer.c:404
 msgid "Reminder!!"
 msgstr "Pripomenutie!"
 
-#: calendar/importers/icalendar-importer.c:701
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "Udalosti kalendára"
 
-#: calendar/importers/icalendar-importer.c:726
+#: calendar/importers/icalendar-importer.c:663
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6520,11 +6400,11 @@ msgstr ""
 "Evolution našiel súbory kalendára GNOME.\n"
 "Chcete ich naimportovať do Evolution?"
 
-#: calendar/importers/icalendar-importer.c:733
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr "Kalendár GNOME"
 
-#: calendar/pcs/cal-backend-file.c:310
+#: calendar/pcs/cal-backend-file.c:311
 msgid "Can't save calendar data: Malformed URI."
 msgstr "Nepodarilo sa uložiť dáta kalendára. Neplatné URI."
 
@@ -8193,11 +8073,11 @@ msgstr "Touto šifrou nemôžete importovať kľúče"
 msgid "You may not export keys with this cipher"
 msgstr "Touto šifrou nemôžete exportovať kľúče"
 
-#: camel/camel-data-cache.c:137
+#: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
 msgstr "Nepodarilo sa vytvoriť cestu pre vyrovnávaciu pamäť"
 
-#: camel/camel-data-cache.c:375
+#: camel/camel-data-cache.c:370
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nie je možné odstrániť položku vyrovnávacej pamäti: %s: %s"
@@ -8238,11 +8118,13 @@ msgid "You must be working online to complete this operation"
 msgstr "Pre dokončenie tejto operácie musíte pracovať on-line"
 
 #: 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 "Nepodarilo sa vytvoriť rúru do '%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 "Nepodarilo sa vytvoriť proces potomka '%s': %s"
@@ -8397,9 +8279,9 @@ msgstr ""
 "Musíte zadať heslo pre odomkntie kľúča\n"
 "pre používateľa: \"%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 "Zrušené."
 
@@ -8420,7 +8302,7 @@ msgstr "Nezadané žiadne dáta"
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nie je možné zašiftovať správu: nezadaní žiadni platní adresáti."
 
-#: camel/camel-gpg-context.c:1122
+#: camel/camel-gpg-context.c:1125
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8431,24 +8313,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 "Nepodarilo sa použiť 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 "Nepodarilo sa spustiť 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 "Nepodarilo sa spustiť 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 "Nie je možné overiť správu: nie je možné vytvoriť dočasný súbor: %s"
@@ -8657,7 +8539,8 @@ msgstr "Správa challenge pre server neplatná\n"
 
 #: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "Správa challenge pre server obsahovala neplatný prvok \"Kvalita ochrany\"\n"
+msgstr ""
+"Správa challenge pre server obsahovala neplatný prvok \"Kvalita ochrany\"\n"
 
 #: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
@@ -8671,76 +8554,81 @@ msgstr "Odpoveď serveru obsahovala neúplné údaje o overení\n"
 msgid "Server response does not match\n"
 msgstr "Odpoveď serveru neodpovedá\n"
 
-#: camel/camel-sasl-gssapi.c:40
+#: camel/camel-sasl-gssapi.c:48
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: 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 "Táto voľba vás pripojí na server pomocou overenia Kerberos 5."
 
-#: 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 ""
-"Zadaný mechanizmus nie je podporovaný poskytnutým poverením "
-"alebo ho implementácia nepodporuje."
+"Zadaný mechanizmus nie je podporovaný poskytnutým poverením alebo ho "
+"implementácia nepodporuje."
 
-#: camel/camel-sasl-gssapi.c:138
+#: camel/camel-sasl-gssapi.c:153
 msgid "The provided target_name parameter was ill-formed."
 msgstr "Zadaný parameter target_name nie je platný."
 
-#: 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 ""
-"Zadaný parameter target_name obsahuje neplatný alebo nepodporovaný "
-"typ mena."
+"Zadaný parameter target_name obsahuje neplatný alebo nepodporovaný typ mena."
 
-#: 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
+#, fuzzy
+msgid "The consistency checks performed on the input_token failed."
 msgstr "Označuje, že vykonané kontroly konzistencie pre input_token zlyhali."
 
-#: camel/camel-sasl-gssapi.c:167
+#: camel/camel-sasl-gssapi.c:180
 msgid "The consistency checks performed on the credential failed."
 msgstr "Zlyhali kontroly konzistencie poverenia."
 
-#: camel/camel-sasl-gssapi.c:170
+#: camel/camel-sasl-gssapi.c:183
 msgid "The referenced credentials have expired."
 msgstr "Poverenie, na ktoré sa odkazujete, vypršalo."
 
-#: 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-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 "Neplatná odpoveď na overenie od serveru."
 
-#: camel/camel-sasl-gssapi.c:281
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "Nepodarilo sa vytvoriť rúru do '%s': %s"
+
+#: camel/camel-sasl-gssapi.c:299
 msgid "Unsupported security layer."
 msgstr "Nepodporovaná vrstva zabezpečenia."
 
@@ -8767,7 +8655,8 @@ msgstr "Prihlásenie"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
-msgstr "Táto voľba pripojí na server pomocou hesiel prenášaných ako čistý text."
+msgstr ""
+"Táto voľba pripojí na server pomocou hesiel prenášaných ako čistý text."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
@@ -8781,7 +8670,8 @@ msgstr "NTLM / SPA"
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
-msgstr "Táto voľba vás pripojí na server Windows pomocou overenie NTLM / Secure."
+msgstr ""
+"Táto voľba vás pripojí na server Windows pomocou overenie NTLM / Secure."
 
 #: camel/camel-sasl-plain.c:32
 msgid "PLAIN"
@@ -8832,30 +8722,30 @@ msgstr "URL '%s' vyžaduje komponentu cesty"
 msgid "Resolving: %s"
 msgstr "Zisťujem adresu: %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 "Zlyhalo hľadanie mena: %s"
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Zlyhalo hľadanie hostiteľa: %s: hostiteľ nenájdený"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Zlyhalo hľadanie hostiteľa: %s: neznámy dôvod"
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 msgid "Resolving address"
 msgstr "Zisťujem adresu"
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 msgid "Host lookup failed: host not found"
 msgstr "Zlyhalo hľadanie hostiteľa: hostiteľ nenájdený"
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 msgid "Host lookup failed: unknown reason"
 msgstr "Zlyhalo hľadanie hostiteľa: neznámy dôvod"
 
@@ -9044,7 +8934,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:811
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9057,11 +8947,11 @@ msgstr ""
 "Fingerprint:       %s\n"
 "Podpis:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:817
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr "DOBRE"
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:817
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr "ZLE"
 
@@ -9083,7 +8973,7 @@ msgstr ""
 "Chcete ho aj tak akceptovať?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:821
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9098,7 +8988,7 @@ msgstr ""
 "\n"
 "Chcete ho akceptovať?"
 
-#: camel/camel-tcp-stream-ssl.c:865
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9107,7 +8997,7 @@ msgstr ""
 "Problém certifikátu: %s\n"
 "Vydal: %s"
 
-#: camel/camel-tcp-stream-ssl.c:917
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9116,7 +9006,7 @@ msgstr ""
 "Neplatná doména certifikátu: %s\n"
 "Vydal: %s"
 
-#: camel/camel-tcp-stream-ssl.c:935
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9125,7 +9015,7 @@ msgstr ""
 "Platnosť certifikátu vypršala: %s\n"
 "Vydal: %s"
 
-#: camel/camel-tcp-stream-ssl.c:952
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9134,7 +9024,7 @@ msgstr ""
 "Vypršala platnosť zoznamu zrušených certifikátov: %s\n"
 "Vydal: %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nie je možné spracovať URL `%s'"
@@ -9151,31 +9041,32 @@ msgstr "Taká správa neexistuje %s v %s"
 
 #: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "Nepodarilo sa skopírovať alebo presunúť správu do virtuálneho priečinku"
+msgstr ""
+"Nepodarilo sa skopírovať alebo presunúť správu do virtuálneho priečinku"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nie je možné odstrániť priečinok: %s: Neplatná operácia"
 
-#: camel/camel-vee-store.c:281
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nie je možné odstrániť priečinok: %s: Priečinok neexistuje"
 
-#: camel/camel-vee-store.c:294
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nie je možné premenovať priečinok: %s: Neplatná operácia"
 
-#: camel/camel-vee-store.c:302
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nie je možné premenovať priečinok: %s: Priečinok neexistuje"
 
 #: 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-command.c:453
 #: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr "Operácia zrušená"
@@ -9204,16 +9095,16 @@ msgstr "Neočakávaná odpoveď od IMAP serveru: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP príkaz zlyhal: %s"
 
-#: camel/providers/imap/camel-imap-command.c:462
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr "Odpoveď serveru skončila príliš skoro."
 
-#: 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 "Odpoveď IMAP serveru neobsahovala informáciu %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 "Neočakávaná odpoveď OK od IMAP serveru: %s"
@@ -9305,7 +9196,7 @@ msgstr "Kontrolujem novú poštu"
 msgid "Check for new messages in all folders"
 msgstr "Kontrolujem novú poštu vo všetkých priečinkoch"
 
-#: 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 "Priečinky"
 
@@ -9323,7 +9214,8 @@ msgstr "Priestor mien"
 
 #: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
-msgstr "Aplikovať filtre na nové správy v priečinku novej pošty na tomto serveri"
+msgstr ""
+"Aplikovať filtre na nové správy v priečinku novej pošty na tomto serveri"
 
 #: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
@@ -9341,7 +9233,8 @@ msgstr "Heslo"
 
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Táto voľba pripojí na IMAP server pomocou hesiel prenášaných ako čistý text."
+msgstr ""
+"Táto voľba pripojí na IMAP server pomocou hesiel prenášaných ako čistý text."
 
 #: camel/providers/imap/camel-imap-store.c:457
 #, c-format
@@ -9362,7 +9255,7 @@ msgstr "Spojenie zrušené"
 
 #: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:275
+#: camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nie je možné spojenie s %s (port %d): %s"
@@ -9393,7 +9286,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Požadovaný spôsob overenia %s nie je podporovaný IMAP serverom %s"
 
 #: camel/providers/imap/camel-imap-store.c:1085
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/smtp/camel-smtp-transport.c:484
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Overenie typu %s nie je podporované."
@@ -9426,7 +9319,8 @@ msgstr "Priečinok %s neexistuje"
 
 #: camel/providers/imap/camel-imap-store.c:1839
 #, fuzzy, c-format
-msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Meno priečinku nesmie obsahovať znak Enter."
 
 #: camel/providers/imap/camel-imap-store.c:1851
@@ -9584,7 +9478,7 @@ msgstr "Neplatný obsah správy"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9596,14 +9490,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:168
+#: camel/providers/local/camel-spool-store.c:167
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Priečinok `%s' neexistuje."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:173
+#: camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9629,8 +9523,8 @@ msgid "not a maildir directory"
 msgstr "nie je priečinok maildir"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:287
-#: camel/providers/local/camel-spool-store.c:317
+#: 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 "Nie je možné prehľadať priečinok `%s': %s"
@@ -9653,8 +9547,8 @@ msgstr "Hľadám nové správy"
 
 #: camel/providers/local/camel-maildir-summary.c:733
 #: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:580
-#: camel/providers/local/camel-mbox-summary.c:671
+#: 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 "Ukladám priečinok"
@@ -9752,60 +9646,60 @@ msgstr "Kritická chyba spracovania správy na pozícii %ld v priečinku %s"
 msgid "Cannot check folder: %s: %s"
 msgstr "Nie je možné skontrolovať priečinok: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:585
-#: camel/providers/local/camel-mbox-summary.c:676
+#: 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 "Nie je možné otvoriť súbor %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:597
+#: 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 "Nie je možné otvoriť dočasnú poštovú schránku: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:610
-#: camel/providers/local/camel-mbox-summary.c:772
+#: 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 "Nie je možné zatvoriť zdrojový priečinok: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:619
+#: camel/providers/local/camel-mbox-summary.c:549
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nie je možné zatvoriť dočasný priečinok: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:560
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nie je možné premenovať priečinok: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:714
-#: camel/providers/local/camel-mbox-summary.c:722
-#: 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 "Súhrn a priečinok si neodpovedajú, ani po synchronizácii"
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:777
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznáma chyba: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:812
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Nie je možné premenovať priečinok: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:976
-#: camel/providers/local/camel-mbox-summary.c:1002
+#: 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 "Chyba pri zápise do dočasnej schránky: %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 "Zápis do dočasnej schránky zlyhal: %s: %s"
@@ -9839,35 +9733,35 @@ msgstr "Lokálne priečinky nie je možné premenovať"
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "Koreň ukladania %s nie je normálny priečinok"
 
-#: camel/providers/local/camel-spool-store.c:154
+#: camel/providers/local/camel-spool-store.c:153
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Priečinok `%s/%s' neexistuje."
 
-#: camel/providers/local/camel-spool-store.c:181
+#: camel/providers/local/camel-spool-store.c:180
 #, fuzzy, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "`%s' nie je normálny súbor."
 
-#: camel/providers/local/camel-spool-store.c:198
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Lokálny poštový súbor %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
 msgstr "Lokálne priečinky nie je možné premenovať"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr "Lokálne priečinky nie je možné premenovať"
 
-#: camel/providers/local/camel-spool-store.c:226
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr "Lokálne priečinky nie je možné odstrániť"
 
@@ -10105,7 +9999,7 @@ msgstr ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Chyba pri posielaní hesla: %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 "Priečinok `%s' neexistuje."
@@ -10171,145 +10065,146 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Pre doručenie pošty spojením sa so vzdialeným serverom pomocou SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaktická chyba, príkaz neznámy"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaktická chyba v parametroch alebo argumentoch"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr "Príkaz neimplementovaný"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr "Parameter príkazu neimplementovaný"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr "Stav systému alebo odpoveď na pomoc"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr "Správa pomocníka"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr "Služba pripravená"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr "Služba zatvára prenosový kanál"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr "Služba nie je k dispozícii, zatváram prenosový kanál"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr "Požadovaná poštová akcia v poriadku, dokončená"
 
-#: 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 "Používateľ nie je lokálny, bude predaná podľa <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 "Požadovaná poštová akcia nevykonaná, poštová schránka nie je k dispozícii"
+msgstr ""
+"Požadovaná poštová akcia nevykonaná, poštová schránka nie je k dispozícii"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Požadovaná akcia nevykonaná, poštová schránka nie je k dispozícii"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr "Požadovaná akcia zrušená: chyba pri spracovaní"
 
-#: 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 "Používateľ nie je lokálny, skúste <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 "Požadovaná akcia nevykonaná: nedostatok miesta v systéme"
 
-#: 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 "Požadovaná poštová akcia prerušená: presiahnutá alokácia miesta"
 
-#: 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 "Požadovaná akcia nevykonaná: meno poštovej schránky nepovolené"
 
-#: 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 "Spustiť vstup pošty, končí <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr "Prenos zlyhal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr "Vyžadované heslo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr "Mechanizmus overenia je príliš slabý"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Požadované šifrovanie pre požadovaný spôsob overenia"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr "Dočasné zlyhanie overenia."
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "Autentifikácia vyžadovaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:298
+#: camel/providers/smtp/camel-smtp-transport.c:297
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Chyba odpovede QUIT"
 
-#: camel/providers/smtp/camel-smtp-transport.c:342
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: 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 ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Chyba pri posielaní hesla: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:342
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Správa nevyzerá ako platná."
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:356
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Vypršal čas požiadavky AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:372
+#: camel/providers/smtp/camel-smtp-transport.c:371
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Chyba odpovede DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:475
+#: camel/providers/smtp/camel-smtp-transport.c:474
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Požadovaný spôsob overenia %s nie je podporovaný SMTP serverom %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:513
+#: camel/providers/smtp/camel-smtp-transport.c:512
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sProsím, zadajte SMTP heslo pre %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:532
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10320,88 +10215,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:667
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Doručenie pošty SMTP pomocou %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "Cannot send message: sender address not valid."
 msgstr "Nie je možné poslať správu: adresa odosielateľa nie je platná."
 
-#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:613
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Posielam správu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:705
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr "Nie je možné poslať správu: adresáti nie sú definovaní."
 
-#: camel/providers/smtp/camel-smtp-transport.c:714
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nie je možné poslať správu: adresáti nie sú platní"
 
-#: camel/providers/smtp/camel-smtp-transport.c:882
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr "Pozdrav SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:928
+#: camel/providers/smtp/camel-smtp-transport.c:924
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "Vypršal čas odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:950
+#: camel/providers/smtp/camel-smtp-transport.c:946
 #, fuzzy
 msgid "HELO response error"
 msgstr "Chyba odpovede RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1016
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr "Prihlásenie SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr "Chyba pri vytváraní overovacieho objektu SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
-#: camel/providers/smtp/camel-smtp-transport.c:1051
+#: 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 "Vypršal čas požiadavky AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr "Požiadavka AUTH zlyhala."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr "Neplatná odpoveď na overenie od serveru.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1146
+#: camel/providers/smtp/camel-smtp-transport.c:1142
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Vypršal čas odpovede MAIL FROM: %s: pošta neodoslaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1166
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 msgid "MAIL FROM response error"
 msgstr "Chyba odpovede MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1190
+#: camel/providers/smtp/camel-smtp-transport.c:1186
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Vypršal čas odpovede RCPT TO: %s: pošta neodoslaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1212
+#: camel/providers/smtp/camel-smtp-transport.c:1208
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> zlyhal"
 
-#: 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 "Vypršal čas posielania DATA: %s: pošta neodoslaná"
@@ -10409,67 +10304,67 @@ msgstr "Vypršal čas posielania DATA: %s: pošta neodoslaná"
 #. 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 "Chyba odpovede DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1314
-#: camel/providers/smtp/camel-smtp-transport.c:1337
+#: 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 "Vypršal čas posielania DATA: koniec správy: %s: pošta neodoslaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1357
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 msgid "DATA termination response error"
 msgstr "Chyba odpovede ukončenia DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1380
+#: camel/providers/smtp/camel-smtp-transport.c:1374
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Vypršal čas odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1400
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 msgid "RSET response error"
 msgstr "Chyba odpovede RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1423
+#: camel/providers/smtp/camel-smtp-transport.c:1417
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Vypršal čas požiadavky AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1443
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 msgid "QUIT response error"
 msgstr "Chyba odpovede QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:102
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: 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:367 mail/mail-display.c:223
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr "príloha"
 
-#: composer/e-msg-composer-attachment-bar.c:508
+#: composer/e-msg-composer-attachment-bar.c:503
 msgid "Remove selected items from the attachment list"
 msgstr "Odstráni vybrané položky zo zoznamu príloh"
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Pridať prílohu..."
 
-#: composer/e-msg-composer-attachment-bar.c:539
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "Priloží súbor k správe"
 
@@ -10516,45 +10411,45 @@ msgstr "Kliknutím zobrazíte adresár"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:511
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:522
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:528
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Komu:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Zadajte adresátov správy"
 
-#: composer/e-msg-composer-hdrs.c:546
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:547
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Zadajte adresy, ktoré dostanú kópiu správy"
 
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:551
+#: 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,12 +10460,12 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:558
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:560
+#: composer/e-msg-composer-hdrs.c:549
 #, fuzzy
 msgid "Posting destination"
 msgstr "Bez popisu"
@@ -10581,12 +10476,12 @@ msgstr "Bez popisu"
 msgid "Attach file(s)"
 msgstr "Priložiť súbor"
 
-#: composer/e-msg-composer.c:530
+#: composer/e-msg-composer.c:533
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Nepodarilo sa vytvoriť kontext podpisu PGP."
 
-#: composer/e-msg-composer.c:809
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10595,30 +10490,30 @@ msgstr ""
 "Chyba pri čítaní súboru %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Súbor existuje, prepísať ho?"
 
-#: composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba pri ukladaní súboru: %s"
 
-#: composer/e-msg-composer.c:1213
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba pri načítavaní súboru: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Chyba pri prístupe k súboru: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Nie je možné získať správu z editora"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10627,7 +10522,7 @@ msgstr ""
 "Nepodarilo sa hľadať v súbore: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1270
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10636,7 +10531,7 @@ msgstr ""
 "Nepodarilo sa skrátiť súbor: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1279
+#: composer/e-msg-composer.c:1285
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10645,7 +10540,7 @@ msgstr ""
 "Nepodarilo sa hľadať v súbore: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10654,7 +10549,7 @@ msgstr ""
 "Chyba pri automatickom ukladaní správ: %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?"
@@ -10662,7 +10557,7 @@ msgstr ""
 "Ximian Evolution našiel neuložené súbory z predchádzajúceho sedenia.\n"
 "Chcete sa pokúsiť o ich záchranu?"
 
-#: composer/e-msg-composer.c:1544
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10673,31 +10568,32 @@ msgstr ""
 "\n"
 "Chcete uložiť zmeny?"
 
-#: composer/e-msg-composer.c:1549
+#: composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: composer/e-msg-composer.c:1553
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Varovanie: Zmenená správa"
 
-#: composer/e-msg-composer.c:1585
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Otvoriť súbor"
 
-#: composer/e-msg-composer.c:1943
+#: composer/e-msg-composer.c:2015
 msgid "Signature:"
 msgstr "Podpis:"
 
-#: composer/e-msg-composer.c:1983 mail/mail-account-gui.c:1255
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2162 composer/e-msg-composer.c:2761
+#: composer/e-msg-composer.c:2234 composer/e-msg-composer.c:2873
+#: composer/e-msg-composer.c:2874
 msgid "Compose a message"
 msgstr "Napísať správu"
 
-#: composer/e-msg-composer.c:2792
+#: composer/e-msg-composer.c:2905
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10705,7 +10601,7 @@ msgstr ""
 "Nepodarilo sa vytvoriť okno pre písanie správ:\n"
 "Nepodarilo sa aktivovať ovládací prvok pre výber adresy."
 
-#: composer/e-msg-composer.c:2818
+#: composer/e-msg-composer.c:2931
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10716,7 +10612,7 @@ msgstr ""
 "Nepodarilo sa vytvoriť okno pre písanie správ:\n"
 "Nepodarilo sa aktivovať komponent HTML editor."
 
-#: composer/e-msg-composer.c:2878
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10724,7 +10620,7 @@ msgstr ""
 "Nepodarilo sa vytvoriť okno pre písanie správ:\n"
 "Nepodarilo sa aktivovať komponent HTML editor."
 
-#: composer/e-msg-composer.c:3894
+#: composer/e-msg-composer.c:4005
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10878,10 +10774,11 @@ msgid ""
 msgstr ""
 
 #: e-util/e-component-listener.c:128
-msgid "ping_timeout_callback: could not determine if the CORBA object is nil or not"
+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?"
@@ -10889,11 +10786,15 @@ msgstr ""
 "Súbor s týmto menom už existuje\n"
 "Prepísať ho?"
 
-#: e-util/e-passwords.c:345
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "Prepísať súbor?"
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Uložiť toto heslo"
 
-#: e-util/e-passwords.c:347
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Zapamätať si heslo pre zvyšok tohto sedenia"
 
@@ -10991,42 +10892,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 "sekúnd"
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr "1 sekunda"
+
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr "%d sekúnd"
 
 #: filter/filter-datespec.c:66
-msgid "minute"
-msgstr "minúty"
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 minúta"
+
+#: filter/filter-datespec.c:66
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "%d minút"
 
 #: filter/filter-datespec.c:67
-msgid "hour"
-msgstr "hodiny"
+#, fuzzy
+msgid "1 hour ago"
+msgstr "1 hodina"
+
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d hodín"
+
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "1 day ago"
+msgstr "1 deň"
+
+#: filter/filter-datespec.c:68
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr " naspäť"
 
 #: filter/filter-datespec.c:69
-msgid "week"
-msgstr "týždňa"
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 týždeň"
 
-#: filter/filter-datespec.c:69 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "týždňov"
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d týždňov"
 
 #: filter/filter-datespec.c:70
-msgid "month"
+#, fuzzy
+msgid "1 month ago"
 msgstr "mesiaca"
 
-#: filter/filter-datespec.c:70 filter/filter.glade.h:23
-msgid "months"
-msgstr "mesiacov"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr " naspäť"
 
 #: filter/filter-datespec.c:71
-msgid "year"
-msgstr "roku"
+msgid "1 year ago"
+msgstr ""
 
-#: filter/filter-datespec.c:71 filter/filter.glade.h:33
-msgid "years"
-msgstr "rokov"
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr " naspäť"
 
 #: filter/filter-datespec.c:176
 #, fuzzy
@@ -11047,13 +10980,7 @@ msgstr "teraz"
 msgid "%d-%b-%Y"
 msgstr "%a %d %b %Y"
 
-#. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:298 filter/filter-datespec.c:301
-#, fuzzy, c-format
-msgid "%d %s ago"
-msgstr " naspäť"
-
-#: filter/filter-datespec.c:417
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Vyberte čas, s ktorým sa má porovnávať"
 
@@ -11071,7 +10998,7 @@ msgstr "Zadajte meno súboru:"
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Fronta `%s' neexistuje alebo nie je normálny súbor."
 
-#: filter/filter-file.c:293
+#: filter/filter-file.c:298
 #, fuzzy
 msgid "Choose a file"
 msgstr "Vyberte akciu:"
@@ -11087,7 +11014,7 @@ msgid "You must specify a folder."
 msgstr "Zadajte meno súboru:"
 
 #: filter/filter-folder.c:243 filter/vfolder-rule.c:408
-#: mail/mail-account-gui.c:1504 mail/mail-account-gui.c:1518
+#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
 msgid "Select Folder"
 msgstr "Vybrať priečinok"
 
@@ -11100,33 +11027,35 @@ msgstr ""
 "Chyba v regulárnom výraze '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:68
-#: mail/mail-config.glade.h:64
+#: 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 "Dôležité"
 
 #. red
 #: filter/filter-label.c:122 mail/mail-config.c:69
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1280
 #, fuzzy
 msgid "Work"
 msgstr "Zamestnanie"
 
 #. orange
 #: 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 "Osobný"
 
 #. forest green
 #: filter/filter-label.c:124 mail/mail-config.c:71
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1282
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
 #: 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 "po"
@@ -11232,6 +11161,14 @@ msgstr "čas relatívny k aktuálnemu času"
 msgid "ago"
 msgstr "späť"
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "mesiacov"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr "sekúnd"
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "iba špecifické priečinky"
@@ -11249,6 +11186,10 @@ msgstr "zadaný čas"
 msgid "vFolder Sources"
 msgstr "Zdroje vpriečinkov"
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "týždňov"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "pre všetky aktívne vzdialené priečinky"
@@ -11261,6 +11202,10 @@ msgstr "pre všetky lokálne a aktívne vzdialené priečinky"
 msgid "with all local folders"
 msgstr "pre všetky lokálne priečinky"
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "rokov"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -11285,234 +11230,235 @@ msgid "Beep"
 msgstr "Pípnuť"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "obsahuje"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopírovať do priečinku"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Dátum prijatia"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Dátum odoslania"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Odstránené"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "neobsahuje"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "nekončí na"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "neexistuje"
+
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "neexistuje"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "nevyzerá ako"
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "nezačína na"
+
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Neexistuje"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Návrh"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "končí na"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Existuje"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "existuje"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Výraz"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "Follow Up"
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1778
+#: filter/libfilter-i18n.h:27
+msgid "is"
+msgstr "je"
+
+#: filter/libfilter-i18n.h:28
+msgid "is after"
+msgstr "je po"
+
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr "bolo pred"
+
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
+msgstr "je označený"
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "je viac než"
+
+#: filter/libfilter-i18n.h:32
+msgid "is less than"
+msgstr "je menej než"
+
+#: filter/libfilter-i18n.h:33
+msgid "is not"
+msgstr "nie je"
+
+#: filter/libfilter-i18n.h:34
+msgid "is not Flagged"
+msgstr "nie je označený"
+
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 #, fuzzy
 msgid "Label"
 msgstr "Meno"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Konferencia"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Telo správy"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Hlavička správy"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Presunúť do priečinku"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Vykonať príkaz"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Zahrať zvuk"
 
-#: 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 "Prečítaná"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Adresáti"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Regul. výraz"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Odpovedaná"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "je viac než"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "je menej než"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Skóre"
 
-#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1823
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "Odosielateľ"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Nastaviť stav"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Vykonať príkaz"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Veľkosť (kB)"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "vyzerá ako"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Zdrojový účet"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Špecifická hlavička"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "začína na"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Zastaviť spracovanie"
 
-#: filter/libfilter-i18n.h:38 mail/mail-format.c:903
+#: 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 "Predmet"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:61
 #, fuzzy
 msgid "Unset Status"
 msgstr "Nastaviť stav"
 
-#: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "obsahuje"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "neobsahuje"
-
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr "nekončí na"
-
-#: filter/libfilter-i18n.h:43
-msgid "does not exist"
-msgstr "neexistuje"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "does not return"
-msgstr "neexistuje"
-
-#: filter/libfilter-i18n.h:45
-msgid "does not sound like"
-msgstr "nevyzerá ako"
-
-#: filter/libfilter-i18n.h:46
-msgid "does not start with"
-msgstr "nezačína na"
-
-#: filter/libfilter-i18n.h:47
-msgid "ends with"
-msgstr "končí na"
-
-#: filter/libfilter-i18n.h:48
-msgid "exists"
-msgstr "existuje"
-
-#: filter/libfilter-i18n.h:49
-msgid "is Flagged"
-msgstr "je označený"
-
-#: filter/libfilter-i18n.h:50
-msgid "is after"
-msgstr "je po"
-
-#: filter/libfilter-i18n.h:51
-msgid "is before"
-msgstr "bolo pred"
-
-#: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "je viac než"
-
-#: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "je menej než"
-
-#: filter/libfilter-i18n.h:54
-msgid "is not Flagged"
-msgstr "nie je označený"
-
-#: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "nie je"
-
-#: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "je"
-
-#: filter/libfilter-i18n.h:57
-#, fuzzy
-msgid "returns greater than"
-msgstr "je viac než"
-
-#: filter/libfilter-i18n.h:58
-#, fuzzy
-msgid "returns less than"
-msgstr "je menej než"
-
-#: filter/libfilter-i18n.h:59
-#, fuzzy
-msgid "returns"
-msgstr "Burns"
-
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr "vyzerá ako"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "začína na"
+#: 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 "Pravidlá"
 
-#: filter/rule-editor.c:241 filter/rule-editor.c:325
-#, c-format
-msgid "Rule name '%s' is not unique, choose another."
-msgstr ""
-
 #: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Pridať pravidlo"
@@ -11539,49 +11485,49 @@ msgstr "Musíte tento vpriečinok pomenovať."
 msgid "You need to to specify at least one folder as a source."
 msgstr "Musíte zadať aspoň jeden priečinok ako zdrojový."
 
-#: filter/vfolder-rule.c:492
+#: filter/vfolder-rule.c:499
 #, fuzzy
 msgid "VFolder source"
 msgstr "Zdroje vpriečinkov"
 
-#: importers/elm-importer.c:95 mail/importers/elm-importer.c:103
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuje vašu starú pošty Elm"
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101 mail/importers/elm-importer.c:104
-#: mail/importers/netscape-importer.c:1237 mail/importers/pine-importer.c:114
+#: 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 "Importujem..."
 
 #: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103 mail/importers/elm-importer.c:106
-#: mail/importers/netscape-importer.c:1239 mail/importers/pine-importer.c:116
+#: 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 "Prosím, čakajte"
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365 mail/importers/elm-importer.c:183
-#: mail/importers/netscape-importer.c:1794 mail/importers/pine-importer.c:330
+#: 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 "Importujem %s ako %s"
 
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471 mail/importers/elm-importer.c:389
-#: mail/importers/netscape-importer.c:1906 mail/importers/pine-importer.c:439
+#: 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 "Prehľadávam %s"
 
 #: 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:523
-#: mail/importers/netscape-importer.c:2104 mail/importers/pine-importer.c:586
+#: 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 "Pošta"
 
-#: importers/elm-importer.c:545 mail/importers/elm-importer.c:544
+#: 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?"
@@ -11589,7 +11535,7 @@ msgstr ""
 "Evolution našiel poštové súbory Elm.\n"
 "Chcete ich naimportovať do Evolution?"
 
-#: importers/elm-importer.c:574 mail/importers/elm-importer.c:565
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -11601,12 +11547,12 @@ msgstr ""
 "Evolution našiel súbory GnomeCard.\n"
 "Chcete ich naimportovať do Evolution?"
 
-#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:74
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Priorita: %s"
 
-#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:662
+#: 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"
@@ -11621,7 +11567,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:686
+#: 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"
@@ -11629,7 +11575,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:703
+#: 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"
@@ -11638,41 +11584,41 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1236
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuje vaše staré dáta Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1861
+#: 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 "Odpadky"
 
-#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:2014
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Lokálny poštový súbor %s"
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
-#: mail/importers/netscape-importer.c:2025 mail/importers/pine-importer.c:534
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
 msgid "Scanning directory"
 msgstr "Prehľadávam priečinok"
 
-#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2034
-#: shell/e-shell-startup-wizard.c:519
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr "Spúšťam import"
 
-#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2109
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Nastavenie"
 
-#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2114
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Upraviť filtre"
 
-#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2138
+#: 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?"
@@ -11680,11 +11626,11 @@ msgstr ""
 "Evolution našiel poštové súbory Netscape.\n"
 "Chcete ich naimportovať do Evolution?"
 
-#: importers/pine-importer.c:100 mail/importers/pine-importer.c:113
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importuje vaše staré dáta Pine"
 
-#: importers/pine-importer.c:663 mail/importers/pine-importer.c:613
+#: 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?"
@@ -11692,7 +11638,7 @@ msgstr ""
 "Evolution našiel poštové súbory Pine.\n"
 "Chcete ich naimportovať do Evolution?"
 
-#: importers/pine-importer.c:691 mail/importers/pine-importer.c:632
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 msgid "Pine"
 msgstr "Pine"
 
@@ -11701,63 +11647,68 @@ msgid "Composer Preferences"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-#, fuzzy
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Vytváracie rozhranie pre editor správ Evolution."
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:3
-#, fuzzy
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Vytváracie rozhranie pre ovládací prvok úloh Evolution."
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:4
 #, fuzzy
-msgid "Configuration control for the Evolution Mailer."
+msgid "Configure the fonts used by Evolution here"
 msgstr "Vytváracie rozhranie pre editor správ Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:5
 #, fuzzy
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Vytváracie rozhranie pre editor správ Evolution."
+msgid "Configure your email accounts here"
+msgstr "Vytvorí alebo upraví poštové účty a iné nastavenia"
 
 #: 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 "Editor účtov Evolution"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:8
 #, fuzzy
-msgid "Configure the fonts used by Evolution here"
-msgstr "Vytváracie rozhranie pre editor správ Evolution."
+msgid "Evolution Mail component"
+msgstr "Poštový komponent Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Vytvorí alebo upraví poštové účty a iné nastavenia"
+msgid "Evolution Mail composer"
+msgstr "Poštový komponent Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Komponent Evolution pre prácu s poštou."
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Poštový komponent Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution mail composer."
-msgstr "Poštový komponent Evolution."
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Rozhranie pre nastavenie pošty"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Komponent Súhrn pošty Evolution."
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Komponent zobrazenia poštového priečinku Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Komponent zobrazenia poštového priečinku Evolution."
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Rozhranie pre nastavenie pošty"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:14
 #, fuzzy
-msgid "Factory for the controls exported by the Evolution Mailer"
-msgstr "Vytváracie rozhranie pre editor správ Evolution."
+msgid "Evolution Mail preferences control"
+msgstr "Komponent Súhrn pošty Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:15
 #, fuzzy
@@ -11773,45 +11724,41 @@ msgstr "Účty"
 msgid "Mail Preferences"
 msgstr "Nastavenie pošty"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:18
-msgid "Mail configuration interface"
-msgstr "Rozhranie pre nastavenie pošty"
-
-#: mail/component-factory.c:114
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Priečinok obsahujúci poštu"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public Mail"
 msgstr "Verejný"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "Priečinok obsahujúci poštu"
 
-#: mail/component-factory.c:116
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Virtuálne odpadky"
 
-#: mail/component-factory.c:116
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Virtuálny priečinok s odpadkami"
 
-#: mail/component-factory.c:144
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Tento priečinok nemôže obsahovať správy."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Vlastnosti..."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Zmení vlastnosti tohto priečinku"
 
-#: mail/component-factory.c:822
+#: mail/component-factory.c:818
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11823,56 +11770,56 @@ msgstr ""
 msgid "You have not set a mail transport method"
 msgstr "Nemáte nastavený spôsob prenosu pošty"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Nová správa"
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "_Poslať správu"
 
-#: mail/component-factory.c:1062
+#: mail/component-factory.c:1061
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Napísať správu"
 
-#: mail/component-factory.c:1070
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "New Message Post"
 msgstr "Nasledujúca správa"
 
-#: mail/component-factory.c:1070
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "_Post Message"
 msgstr "Predchádzajúca správa"
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1070
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Nová správa"
 
-#: mail/component-factory.c:1328 mail/component-factory.c:1358
+#: mail/component-factory.c:1353
 msgid "Connecting..."
 msgstr "Pripájam sa na server..."
 
-#: mail/component-factory.c:1369
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Nie je možné zaregistrovať sklad u shellu"
 
-#: mail/folder-browser-ui.c:483
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Vlastnosti \"%s\""
 
-#: mail/folder-browser-ui.c:485
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:920
+#: 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 "Nie je možné vytvoriť dočasný priečinok: %s"
@@ -11917,141 +11864,141 @@ msgstr "%d poslaných"
 msgid "%d total"
 msgstr "celkovo %d"
 
-#: mail/folder-browser.c:1167
+#: mail/folder-browser.c:1182
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Vytvoriť _virtuálny priečinok zo správy"
 
-#: mail/folder-browser.c:1714
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "Vpriečinok na _predmet"
 
-#: mail/folder-browser.c:1715
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "Vpriečinok na _odosielateľa"
 
-#: mail/folder-browser.c:1716
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "Vpriečinok na _adresátov"
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "VPriečinok na _konferenciu"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "Filter na _predmet"
 
-#: mail/folder-browser.c:1722
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "Filter na o_dosielateľovi"
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "Filter na _adresátoch"
 
-#: 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 "Filter na _konferenciu"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "_Upraviť ako novú správu..."
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "_Tlačiť"
 
-#: 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 "_Odpovedať odosielateľovi"
 
-#: 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 "Odpovedať _zoznamu"
 
-#: 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 "Odpovedať _všetkým"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "Poslať ď_alej"
 
-#: mail/folder-browser.c:1755
+#: mail/folder-browser.c:1770
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Follow _Up..."
 
-#: mail/folder-browser.c:1756
+#: mail/folder-browser.c:1771
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Označiť ako _Dokončený"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1772
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Vymazať _značky"
 
 #. 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 "Označiť ako _prečítanú"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1777
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Označiť ako _neprečítanú"
 
-#: mail/folder-browser.c:1763
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "Označiť ako _dôležitú"
 
-#: mail/folder-browser.c:1764
+#: mail/folder-browser.c:1779
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Označiť ako nedô_ležitú"
 
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1784
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Obnoviť _zmazané"
 
-#: mail/folder-browser.c:1773
+#: mail/folder-browser.c:1788
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Presunúť do priečinka..."
 
-#: 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 "_Kopírovať do priečinku..."
 
-#: mail/folder-browser.c:1782
+#: mail/folder-browser.c:1797
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Pridať odosielateľa do _adresára"
 
-#: mail/folder-browser.c:1786
+#: mail/folder-browser.c:1801
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Použiť filtre"
 
-#: mail/folder-browser.c:1790
+#: mail/folder-browser.c:1805
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Vytvoriť pra_vidlo zo správy"
 
-#: mail/folder-browser.c:2049
+#: mail/folder-browser.c:2064
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VPriečinok na konferenciu"
 
-#: mail/folder-browser.c:2051
+#: mail/folder-browser.c:2066
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter na konferenciu (%s)"
 
-#: mail/folder-browser.c:2052
+#: mail/folder-browser.c:2067
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VPriečinok na konferenciu (%s)"
@@ -12064,21 +12011,37 @@ msgstr "Štandard"
 msgid "Getting Folder Information"
 msgstr "Získanie informácie o priečinku"
 
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Poštový komponent Evolution."
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "Vytváracie rozhranie pre import súborov mbox do Evolution"
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Poštový komponent Evolution."
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Importuje súbory mbox do 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 "Poštový komponent Evolution."
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Vytváracie rozhranie pre import súborov Outlook Express 4 do 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 "Importuje súbory Outlook Express 4 do 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 "Poštový komponent Evolution."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -12124,55 +12087,55 @@ msgstr "Nevyplnili ste všetky povinné informácie."
 msgid "Evolution Account Editor"
 msgstr "Editor účtov Evolution"
 
-#: mail/mail-account-gui.c:752 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Hostiteľ:"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "Po_užívateľ:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "_Cesta:"
 
-#: mail/mail-account-gui.c:1881
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr "Nemôžete vytvoriť dva účty s rovnakým menom."
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr "Naozaj chcete odstrániť tento účet?"
 
-#: mail/mail-accounts.c:230
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "Neodstraňovať"
 
-#: mail/mail-accounts.c:303 mail/mail-accounts.c:342 mail/mail-accounts.c:382
-#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:666
+#: 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 "Zakázať"
 
-#: mail/mail-accounts.c:303 mail/mail-accounts.c:342 mail/mail-accounts.c:384
-#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:666
+#: 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 "Povoliť"
 
 #. translators: default account indicator
-#: mail/mail-accounts.c:424
+#: mail/mail-accounts.c:433
 msgid "[Default]"
 msgstr "{Štandardný]"
 
-#: mail/mail-accounts.c:472 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:809
+#: 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 "Povolené"
 
-#: mail/mail-accounts.c:478 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Meno účtu"
 
-#: mail/mail-accounts.c:480 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -12217,11 +12180,11 @@ msgstr ""
 "A boli aktualizované."
 
 #. 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 "Túto správu už nezobrazovať."
 
-#: 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"
@@ -12233,7 +12196,7 @@ msgstr ""
 "posielať, prijímať alebo písať poštu.\n"
 "Chcete ho nastaviť teraz?"
 
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:211
 #, fuzzy
 msgid ""
 "You need to configure an account\n"
@@ -12242,7 +12205,7 @@ msgstr ""
 "Predtým, ako začnete písať správu,\n"
 "musíte nastaviť identitu."
 
-#: mail/mail-callbacks.c:227
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -12250,7 +12213,7 @@ msgstr ""
 "Predtým, ako začnete písať správu,\n"
 "musíte nastaviť identitu."
 
-#: mail/mail-callbacks.c:234
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -12259,7 +12222,7 @@ msgstr ""
 "musíte nastaviť spôsob prenosu.."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:256
+#: mail/mail-callbacks.c:254
 #, fuzzy
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
@@ -12268,11 +12231,11 @@ msgstr ""
 "Posielate správu formátovanú ako HTML, ale nasledujúci adresáti nechcú "
 "dostávať takto formátovanú poštu:\n"
 
-#: mail/mail-callbacks.c:268
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "Poslať aj tak?"
 
-#: mail/mail-callbacks.c:289
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12280,7 +12243,7 @@ msgstr ""
 "Táto správa nemá predmet.\n"
 "Naozaj ju chcete poslať?"
 
-#: mail/mail-callbacks.c:315
+#: 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."
@@ -12288,11 +12251,11 @@ msgstr ""
 "Kedže je zoznam kontaktov, ktorý posielate, nastavený tak, aby skryl adresy, "
 "táto správa bude obsahovať iba adresátov Bcc."
 
-#: mail/mail-callbacks.c:319
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr "Táto správa obsahuje iba adresátov 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"
@@ -12302,11 +12265,11 @@ msgstr ""
 "Apparently-To.\n"
 "Poslať aj tak?"
 
-#: mail/mail-callbacks.c:472
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr "Musíte zadať adresátov pre poslanie tejto správy."
 
-#: mail/mail-callbacks.c:727
+#: 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?"
@@ -12314,28 +12277,28 @@ msgstr ""
 "Nei je možné otvoriť priečinok na koncepty pre tento účet.\n"
 "Chcete použiť štandardný priečinok na koncepty?"
 
-#: mail/mail-callbacks.c:1192
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "neznámy odosielateľ"
 
-#: mail/mail-callbacks.c:1196
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Dňa %a, %Y-%m-%d at %H:%M, %%s napísal:"
 
-#: mail/mail-callbacks.c:1703 mail/message-browser.c:143
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr "Presunúť správu do"
 
-#: mail/mail-callbacks.c:1705 mail/message-browser.c:145
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr "Kopírovať správu do"
 
-#: mail/mail-callbacks.c:2349
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Naozaj chcete upraviť všetkých %d správ?"
 
-#: mail/mail-callbacks.c:2365
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12343,7 +12306,7 @@ msgstr ""
 "Upravovať môžete iba správy uložené\n"
 "v priečinku Koncepty."
 
-#: mail/mail-callbacks.c:2398
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12351,16 +12314,16 @@ msgstr ""
 "Iba správy z priečinku Odoslané je možné\n"
 "znovu poslať."
 
-#: mail/mail-callbacks.c:2408
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
 
-#: mail/mail-callbacks.c:2429
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "Žiadna vybraná správa"
 
-#: mail/mail-callbacks.c:2470
+#: mail/mail-callbacks.c:2465
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12369,7 +12332,7 @@ msgstr ""
 "Nie je možné uložiť do %s\n"
 "  %s"
 
-#: mail/mail-callbacks.c:2475
+#: mail/mail-callbacks.c:2470
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12378,15 +12341,15 @@ msgstr ""
 "'%s' už existuje.\n"
 "Prepísať ho?"
 
-#: mail/mail-callbacks.c:2516
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "Uložiť správu ako..."
 
-#: mail/mail-callbacks.c:2518
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "Uložiť správy ako..."
 
-#: mail/mail-callbacks.c:2686
+#: mail/mail-callbacks.c:2687
 #, fuzzy
 msgid ""
 "This operation will permanently erase all messages marked as\n"
@@ -12399,7 +12362,7 @@ msgstr ""
 "\n"
 "Naozaj odstrániť tieto správy?"
 
-#: mail/mail-callbacks.c:2772
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12408,50 +12371,50 @@ msgstr ""
 "Chyba pri načítavaní informácie o filtroch:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2780
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:2822
+#: mail/mail-callbacks.c:2831
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stránka %d z %d"
 
-#: mail/mail-callbacks.c:2878
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "Tlačiť správu"
 
-#: mail/mail-callbacks.c:2945
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "Tlač správy zlyhala"
 
-#: mail/mail-callbacks.c:3135
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Naozaj chcete otvoriť všetkých %d správ v samostatných oknách?"
 
-#: mail/mail-composer-prefs.c:225 mail/mail-composer-prefs.c:326
-#: mail/mail-config.c:1218
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
 msgid "Unnamed"
 msgstr "Bezmena"
 
-#: mail/mail-composer-prefs.c:311
+#: mail/mail-composer-prefs.c:335
 msgid "You must specify a valid script name."
 msgstr "Musíte zadať platné meno skriptu."
 
-#: mail/mail-composer-prefs.c:367 mail/mail-composer-prefs.c:429
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
 msgid "[script]"
 msgstr "(skript)"
 
-#: mail/mail-composer-prefs.c:813
+#: mail/mail-composer-prefs.c:864
 msgid "Language(s)"
 msgstr "Jazyky"
 
-#: mail/mail-composer-prefs.c:855
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr "Pridať skript pre podpis"
 
-#: mail/mail-composer-prefs.c:875
+#: mail/mail-composer-prefs.c:926
 msgid "Signature(s)"
 msgstr "Podpisy"
 
@@ -12521,11 +12484,11 @@ msgstr ""
 "Prosím, zadajte meno pre tento účet.\n"
 "Toto meno bude používané iba pre zobrazenie."
 
-#: mail/mail-config.c:922
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Kontrolujem službu"
 
-#: mail/mail-config.c:1000 mail/mail-config.c:1004
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 msgid "Connecting to server..."
 msgstr "Pripájam sa na server..."
 
@@ -12676,7 +12639,8 @@ msgstr "Necitovať pôvodnú správu"
 
 #: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr "Nepodpisovať požiadavky na _stretnutie (pre kompatibilitu s klientom Outlook)"
+msgstr ""
+"Nepodpisovať požiadavky na _stretnutie (pre kompatibilitu s klientom Outlook)"
 
 #: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
@@ -12771,23 +12735,24 @@ msgid "Message Display"
 msgstr "Zobrazovanie správ"
 
 #: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Sprá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 "Upozornenie na novú 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: Kým sa prvýkrát nepripojíte, nebudete musieť heslo zadávať."
 
-#: mail/mail-config.glade.h:80
-msgid "On Screen fonts"
-msgstr "Písma pre zobrazenie"
-
 #: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Nepovinné informácie"
@@ -13017,102 +12982,109 @@ msgid "_Enable"
 msgstr "_Povoliť"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr "_Pevná šírka:"
-
-#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "Štýl _preposielania:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "_Celé meno:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr "_HTML správy"
 
-#: 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čítať obrázky ak je odosielateľ v adresári"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "Použiť ako š_tandardný účet"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "_Označiť správy ako prečítané po"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Meno:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "_Nikdy nenačítať obrázky zo siete"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr "_Zahrať zvuk pri príchode novej správy"
 
-#: 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 "_Pýtať sa pri posielaní HTML správ kontaktom, ktoré nechcú tento formát"
+msgstr ""
+"_Pýtať sa pri posielaní HTML správ kontaktom, ktoré nechcú tento formát"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pýtať sa pri posielaní správ be_z predmetu"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr "_Prijem pošty"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "Š_týl odpovede:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr "Š_tandardné"
 
-#: 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 "_Posielanie pošty"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Zobraziť _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žiť _bezpečné pripojenie (SSL):"
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "Pôvodný kontakt:"
 
 #: mail/mail-config.glade.h:176
-msgid "_Variable-width:"
-msgstr "P_remenlivá šírka:"
+msgid "_Use secure connection (SSL):"
+msgstr "Použiť _bezpečné pripojenie (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 "farba"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "popis"
 
@@ -13145,10 +13117,6 @@ msgstr ""
 "Súbor '%s' už existuje\n"
 "Prepísať ho?"
 
-#: mail/mail-display.c:196
-msgid "Overwrite file?"
-msgstr "Prepísať súbor?"
-
 #: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Uložiť prílohu"
@@ -13184,35 +13152,35 @@ msgstr "Skryť"
 msgid "External Viewer"
 msgstr "Externý zobrazovač"
 
-#: mail/mail-display.c:1341
+#: mail/mail-display.c:1365
 msgid "Downloading images"
 msgstr "Sťahujem obrázky"
 
-#: mail/mail-display.c:1518
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "Načítavam obsah správy"
 
-#: mail/mail-display.c:1855
+#: mail/mail-display.c:1879
 msgid "Overdue:"
 msgstr "Po termíne:"
 
-#: mail/mail-display.c:1859
+#: mail/mail-display.c:1883
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%B %d, %Y, %l:%M %P"
 
-#: mail/mail-display.c:2210
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Otvoriť odkaz v prehliadači"
 
-#: mail/mail-display.c:2211
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Kopírovať umiestnenie odkazu"
 
-#: mail/mail-display.c:2213
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Uložiť odkaz ako"
 
-#: mail/mail-display.c:2215
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Uložiť obrázok ako..."
 
@@ -13221,89 +13189,90 @@ msgstr "Uložiť obrázok ako..."
 msgid "Pinging %s"
 msgstr "Prehľadávam %s"
 
-#: mail/mail-format.c:635
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr "%s príloha"
 
-#: mail/mail-format.c:677 mail/mail-format.c:1331 mail/mail-format.c:1400
-#: mail/mail-format.c:1520 mail/mail-format.c:1644 mail/mail-format.c:1669
+#: 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 "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
 
-#: mail/mail-format.c:754 mail/message-list.etspec.h:2
+#: mail/mail-format.c:759 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dátum"
 
-#: mail/mail-format.c:840
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr "Neplatná adresa"
 
-#: mail/mail-format.c:881 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 "Od"
 
-#: mail/mail-format.c:885
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: mail/mail-format.c:890 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Komu"
 
-#: mail/mail-format.c:895
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:900
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1443
-msgid "This message is digitally signed. Click the lock icon for more information."
+#: mail/mail-format.c:1451
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Táto správa je digitálne podpísaná. Kliknutím na ikonu zámku získate "
 "podrobnosti."
 
-#: mail/mail-format.c:1471
+#: mail/mail-format.c:1479
 msgid "Could not create a PGP verfication context"
 msgstr "Nepodarilo sa vytvoriť kontext overenia PGP"
 
-#: mail/mail-format.c:1479
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Táto správa je digitálne podpísaná a podpis je platný."
 
-#: mail/mail-format.c:1486
+#: mail/mail-format.c:1494
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Táto správa je digitálne podpísaná ale podpis nie je platný."
 
-#: mail/mail-format.c:1750
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: mail/mail-format.c:1761
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Odkaz na lokálny súbor (%s) platný na serveri \"%s\""
 
-#: mail/mail-format.c:1764
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na lokálny súbor (%s)"
 
-#: mail/mail-format.c:1791
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Odkaz na vzdialené dáta (%s)"
 
-#: mail/mail-format.c:1797
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na neznáme externé dáta (typ \"%s\")"
 
-#: mail/mail-format.c:1799
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr "Nesprávna časť externého tela."
 
@@ -13476,7 +13445,7 @@ msgstr "Získavam %d správ"
 msgid "Saving %d messsage(s)"
 msgstr "Ukladám %d správ"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13485,7 +13454,7 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13494,11 +13463,11 @@ msgstr ""
 "Chyba pri ukladaní správ do `%s':\n"
 "%s"
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "Ukladám prílohu"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13507,58 +13476,54 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
-#: mail/mail-ops.c:2213
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojujem sa od %s"
 
-#: mail/mail-ops.c:2213
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znovu sa pripojujem na %s"
 
-#: mail/mail-search-dialogue.c:121 widgets/misc/e-search-bar.c:518
-msgid "_Search"
-msgstr "_Nájsť"
-
-#: mail/mail-search.c:148
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(Správa bez mena)"
 
-#: mail/mail-search.c:230
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "Správa bez mena"
 
-#: mail/mail-search.c:232
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "Prázdna správa"
 
-#: mail/mail-search.c:280
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "Nájsť v správe"
 
-#: mail/mail-search.c:283
+#: mail/mail-search.c:285
 msgid "Search"
 msgstr "Hľadať"
 
-#: mail/mail-search.c:309
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "Rozlišovať veľkosť písmen"
 
-#: mail/mail-search.c:311
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr "Hľadať dopredu"
 
-#: mail/mail-search.c:331
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "Hľadať:"
 
-#: mail/mail-search.c:334
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "Odpovedá:"
 
@@ -13618,12 +13583,12 @@ msgstr "_Uložiť toto heslo"
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamätať si heslo pre zvyšok tohto sedenia"
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-signature-editor.c:80
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Nepodarilo sa uložiť súbor podpisu: %s"
 
-#: mail/mail-signature-editor.c:182
+#: mail/mail-signature-editor.c:226
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13633,36 +13598,36 @@ msgstr ""
 "\n"
 "Chcete uložiť zmeny?"
 
-#: mail/mail-signature-editor.c:185
+#: mail/mail-signature-editor.c:229
 msgid "_Discard changes"
 msgstr "_Zahodiť zmeny"
 
-#: mail/mail-signature-editor.c:189
+#: mail/mail-signature-editor.c:233
 msgid "Save signature"
 msgstr "Uložiť podpis"
 
-#: mail/mail-signature-editor.c:345
+#: mail/mail-signature-editor.c:389
 msgid "Edit signature"
 msgstr "Upraviť podpis"
 
-#: mail/mail-signature-editor.c:384
+#: mail/mail-signature-editor.c:429
 msgid "Enter a name for this signature."
 msgstr "Zadajte meno pre tento podpis."
 
-#: mail/mail-signature-editor.c:387 my-evolution/e-summary-preferences.c:622
+#: mail/mail-signature-editor.c:432 my-evolution/e-summary-preferences.c:625
 msgid "Name:"
 msgstr "Meno:"
 
-#: mail/mail-tools.c:267
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Predaná správa - %s"
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "Predaná správa"
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "Predaná správa"
 
@@ -13689,7 +13654,7 @@ msgstr ""
 "    '%s'\n"
 "A boli aktualizované."
 
-#: mail/mail-vfolder.c:777 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "VPriečinky"
 
@@ -13697,24 +13662,24 @@ msgstr "VPriečinky"
 msgid "vFolders"
 msgstr "vPriečinky"
 
-#: mail/mail-vfolder.c:875
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Upraviť vpriečinok"
 
-#: mail/mail-vfolder.c:893
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pokús o úpravu vpriečinku '%s', ktorý neexistuje."
 
-#: mail/mail-vfolder.c:946
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Nový vPriečinok"
 
-#: mail/message-browser.c:219
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(Bez predmetu)"
 
-#: mail/message-browser.c:221
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Správa"
@@ -13755,31 +13720,31 @@ msgstr "Vyššia"
 msgid "Highest"
 msgstr "Najvyššia"
 
-#: 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 "Dnes %l:%M %p"
 
-#: mail/message-list.c:1092
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Včera %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:2602
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "Generujem zoznam správ"
 
@@ -13875,12 +13840,12 @@ msgstr "_Termín:"
 msgid "_Flag:"
 msgstr "_Značka:"
 
-#: mail/subscribe-dialog.c:232
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Prechádzam priečinky pod %s na \"%s\""
 
-#: mail/subscribe-dialog.c:234
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Prechádzam koreňové priečinky na \"%s\""
@@ -13895,28 +13860,24 @@ msgstr "Prihlasujem si priečinok \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Odhlasujem sa z priečinku \"%s\""
 
-#: mail/subscribe-dialog.c:1272 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 "Priečinok"
 
-#: mail/subscribe-dialog.c:1429
+#: mail/subscribe-dialog.c:1389
 msgid "Scanning folders..."
 msgstr "Prehľadávam priečinky..."
 
-#: mail/subscribe-dialog.c:1551
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Nebol vybraný žiadny server"
 
-#: mail/subscribe-dialog.c:1626
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Prosím, vyberte server."
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "All folders"
-msgstr "Všetky priečinky"
-
-#: 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
@@ -13925,47 +13886,46 @@ msgstr "Všetky priečinky"
 msgid "Close"
 msgstr "Zavrieť"
 
-#: mail/subscribe-dialog.glade.h:6
-msgid "Display Options"
-msgstr "Možnosti zobrazenia"
-
-#: mail/subscribe-dialog.glade.h:7
-msgid "Folders whose names begin with:"
-msgstr "Priečinky, ktorých meno začína na:"
-
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:4
 msgid "Manage Subscriptions"
 msgstr "Správa prihlásení"
 
-#: 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 "Obnoviť zoznam"
 
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:6
 msgid "S_elect server: "
 msgstr "_Vyberte server: "
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "_Prihlásiť si"
 
-#: mail/subscribe-dialog.glade.h:12
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "O_dhlásiť"
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
-msgid "Configuration control for the Evolution Summary."
-msgstr "Konfiguračný prvok pre súhrn Evolution."
-
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Tu nastavte vzhľad súhrnu Evolution"
 
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Summary"
+msgstr "Komponent súhrnu Evolution."
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
-msgid "Evolution Summary component."
+#, fuzzy
+msgid "Evolution Summary component"
 msgstr "Komponent súhrnu Evolution."
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Komponent súhrnu Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 msgid "Summary Preferences"
 msgstr "Nastavenie súhrnu"
 
@@ -23758,32 +23718,33 @@ msgstr "Curych"
 msgid "Folder containing the Evolution Summary"
 msgstr "Priečinok obsahujúci súhrn 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 "Schôdzky"
 
-#: my-evolution/e-summary-calendar.c:378
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
 msgstr "Žiadne schôdzky"
 
-#: 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 "Bez popisu"
 
-#: my-evolution/e-summary-mail.c:156
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "Súhrn pošty"
 
-#: 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 "Lokálne priečinky"
 
@@ -23795,19 +23756,19 @@ msgstr "Dictionary.com Slovo dňa"
 msgid "Quotes of the Day"
 msgstr "Citát dňa"
 
-#: my-evolution/e-summary-preferences.c:612
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr "Pridať nový kanál správ"
 
-#: 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 "Zadajte URL nového kanálu správ, ktorý chcete pridať"
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr "Chyba načítavania RDF"
 
-#: my-evolution/e-summary-rdf.c:447
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr "Kanály správ"
 
@@ -23824,11 +23785,11 @@ msgstr "Pridať"
 msgid "Shown"
 msgstr "Zobrazený"
 
-#: my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "Žiadne úlohy"
 
-#: my-evolution/e-summary-tasks.c:371
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(žiadny popis)"
 
@@ -23836,11 +23797,11 @@ msgstr "(žiadny popis)"
 msgid "My Weather"
 msgstr "Moje počasie"
 
-#: my-evolution/e-summary-weather.c:269
+#: my-evolution/e-summary-weather.c:262
 msgid "There was an error downloading data for"
 msgstr "Nastala chyba pri sťahovaní dát pre"
 
-#: my-evolution/e-summary-weather.c:490
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr "Počasie"
 
@@ -23848,11 +23809,11 @@ msgstr "Počasie"
 #. 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:594
+#: my-evolution/e-summary-weather.c:584
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary.c:197
+#: my-evolution/e-summary.c:198
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
@@ -23860,11 +23821,11 @@ msgstr "%A, %B %e %Y"
 msgid "Please wait..."
 msgstr "Prosím čakajte..."
 
-#: my-evolution/e-summary.c:591 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Tlač súhrnu"
 
-#: my-evolution/e-summary.c:625
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Tlač súhrnu zlyhala"
 
@@ -25135,20 +25096,21 @@ msgid "_Weather"
 msgstr "_Počasie"
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configuration control for Evolution folder settings."
-msgstr "Ovládací prvok nastavenia priečinkov Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Configure special folders and offline folder behavior here"
 msgstr "Nastavenie špeciálnych priečinkov a ich off-line chovanie"
 
+#: 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
-msgid "Folder Settings"
-msgstr "Nastavenie priečinkov"
+msgid "Evolution folder settings configuration control"
+msgstr ""
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "The Evolution shell."
-msgstr "Shell Evolution."
+msgid "Folder Settings"
+msgstr "Nastavenie priečinkov"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25167,7 +25129,7 @@ msgstr ""
 "Nie je možné preniesť priečinok:\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\" v \"%s\""
@@ -25180,8 +25142,8 @@ msgstr "Pridať priečinok"
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: 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 "Doručená pošta"
 
@@ -25193,11 +25155,11 @@ msgstr "Odoslaná pošta"
 msgid "Sent"
 msgstr "Odoslané"
 
-#: shell/e-setup.c:147
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "Nepodarilo sa korektne aktualizovať súbory"
 
-#: shell/e-setup.c:168
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -25208,7 +25170,7 @@ msgstr ""
 "%s\n"
 "Chyba: %s"
 
-#: shell/e-setup.c:179
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -25220,39 +25182,6 @@ msgstr ""
 #: shell/e-setup.c:244
 #, c-format
 msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Nie je možné vytvoriť priečinok\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 ""
-"Priečinok %s\n"
-"nemá správne nastavené práva. Prosím, zmeňte ich tak,\n"
-"aby bolo možné čítanie a vykonanie a reštartujte Evolution."
-
-#: 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 ""
-"Súbor %s\n"
-"musí byť odstránený, aby Evolution správne fungoval.\n"
-"Prosím, odstráňte tento súbor a reštartujte Evolution."
-
-#: 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."
@@ -25261,7 +25190,7 @@ msgstr ""
 "Prosím, presuňte ho, aby mohli\n"
 "byť nainštalované súbory Evolution."
 
-#: shell/e-setup.c:300
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25296,47 +25225,47 @@ msgstr "Priečinky off-line"
 msgid "Autocompletion Folders"
 msgstr "Priečinky automatického dopĺňania"
 
-#: shell/e-shell-folder-commands.c:141
+#: shell/e-shell-folder-commands.c:140
 #, c-format
 msgid "Cannot copy folder: %s"
 msgstr "Nie je možné skopírovať priečinok: %s"
 
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
 #, c-format
 msgid "Cannot move folder: %s"
 msgstr "Nie je možné presunúť priečinok: %s"
 
-#: shell/e-shell-folder-commands.c:189
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr "Nie je možné presunúť priečinok do seba."
 
-#: shell/e-shell-folder-commands.c:191
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr "Nie je možné skopírovať priečinok sám do seba."
 
-#: 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 "Nie je možné presunúť priečinok do jednoho zo svojích podpriečinkov."
 
-#: 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 "Zadajte priečinok, kam chcete skopírovať priečinok \"%s\":"
 
-#: shell/e-shell-folder-commands.c:324
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr "Kopírovať priečinok"
 
-#: 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 "Zadajte priečinok, kam presunúť prečinok \"%s\":"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "Presunúť priečinok"
 
-#: shell/e-shell-folder-commands.c:392
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25345,17 +25274,17 @@ msgstr ""
 "Nie je možné odstrániť priečinok:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:406
+#: shell/e-shell-folder-commands.c:405
 #, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "Naozaj odstrániť priečinok \"%s\"?"
 
-#: shell/e-shell-folder-commands.c:413
+#: shell/e-shell-folder-commands.c:412
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Odstrániť \"%s\""
 
-#: shell/e-shell-folder-commands.c:486
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25364,26 +25293,26 @@ msgstr ""
 "Nie je možné premenovať priečinok:\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 "Premenovať priečinok \"%s\" na:"
 
-#: shell/e-shell-folder-commands.c:541
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr "Premenovať priečinok"
 
-#: 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 "Zadané meno priečinku nie je platné: %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 "Vybraný priečinok nepatrí inému používateľovi"
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:586
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25392,7 +25321,7 @@ msgstr ""
 "Nie je možné odstrániť priečinok:\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"
@@ -25401,11 +25330,11 @@ msgstr ""
 "Zadaný priečinok sa nedá vytvoriť:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:307
+#: shell/e-shell-folder-creation-dialog.c:308
 msgid "Create New Folder"
 msgstr "Vytvoriť nový priečinok"
 
-#: 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 "(Bez mena)"
 
@@ -25427,7 +25356,7 @@ msgstr ""
 "Použijte \"Automaticky\" ak typ nepoznáte a Evolution sa\n"
 "ho pokúsi určiť."
 
-#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:687
+#: 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 "Prosím, vyberte informácie, ktoré chcete importovať:"
 
@@ -25440,7 +25369,7 @@ msgstr ""
 "Importujem %s\n"
 "Importujem položku %d."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:351
 msgid "Select importer"
 msgstr "Vyberte nástroj pre import"
 
@@ -25450,7 +25379,7 @@ msgid "File %s does not exist"
 msgstr "Súbor %s neexistuje"
 
 #: 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 "Chyba Evolution"
 
@@ -25482,12 +25411,12 @@ msgstr ""
 msgid "Error starting %s"
 msgstr "Chyba pri štarte %s"
 
-#: shell/e-shell-importer.c:556
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Chyba pri načítavaní %s"
 
-#: shell/e-shell-importer.c:573
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25496,31 +25425,31 @@ msgstr ""
 "Importujem %s\n"
 "Importujem položku 1."
 
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Meno súboru:"
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Vyberte súbor"
 
-#: shell/e-shell-importer.c:690
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Typ súboru:"
 
-#: shell/e-shell-importer.c:715
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "Importovať dáta a nastavenia zo starších programov"
 
-#: shell/e-shell-importer.c:719
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "Importovať jeden súbor"
 
-#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:516
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25528,28 +25457,28 @@ msgstr ""
 "Prosím, čakajte...\n"
 "Hľadám existujúce nastavenie"
 
-#: shell/e-shell-importer.c:788
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Spúšťam inteligentné importy"
 
-#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:642
+#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: shell/e-shell-importer.c:1082
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Vybrať priečinok"
 
-#: shell/e-shell-importer.c:1083
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Vyberte cieľový priečinok pre import týchro dát"
 
-#: 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 "Import"
 
-#: shell/e-shell-offline-handler.c:588
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "Zatváram spojenia..."
 
@@ -25572,7 +25501,7 @@ msgstr "Synchronizujem priečinok"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "Synchronizujem \"%s\" (%d z %d) ..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:345
 msgid "Evolution Settings"
 msgstr "Nastavenie Evolution"
 
@@ -25669,15 +25598,15 @@ msgstr "Vytvoriť novú skratku"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vyberte priečinok, kam má skratka smerovať:"
 
-#: shell/e-shell-view-menu.c:778
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr "Pracovať _on-line"
 
-#: 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 "_Pracovať off-line"
 
-#: 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 "Pracovať off-line"
 
@@ -25685,32 +25614,34 @@ msgstr "Pracovať off-line"
 msgid "(No folder displayed)"
 msgstr "(Nezobrazený žiadny priečinok)"
 
-#: 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 "(Žiadna)"
 
-#: shell/e-shell-view.c:2100
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
+#: shell/e-shell-view.c:2091
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution je momentálne on-line. Stlačením tohto tlačidla prejdete do "
 "módu off-line."
 
-#: 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 prechádza do módu off-line."
 
-#: shell/e-shell-view.c:2113
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
+#: shell/e-shell-view.c:2104
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution je momentálne off-line. Stlačením tohto tlačidla prejdete "
 "do módu on-line."
 
-#: shell/e-shell.c:176
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25721,12 +25652,12 @@ msgstr ""
 "Chyba z aktivačného systému:\n"
 "%s"
 
-#: shell/e-shell.c:758
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nepodarilo sa vytvoriť lokálny sklad -- %s"
 
-#: shell/e-shell.c:1831
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25737,19 +25668,19 @@ msgstr ""
 "neočakávane skončil. Musíte ukončiť Evolution a znovu ju\n"
 "spustiť, aby ste získali prístup k vašim dátam."
 
-#: shell/e-shell.c:2096
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Neplatné argumenty"
 
-#: shell/e-shell.c:2098
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "Nie je možné zaregistrovať u OAF"
 
-#: shell/e-shell.c:2100
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "Konfiguračná databáza nenájdená"
 
-#: shell/e-shell.c:2102 shell/e-storage.c:576
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Všeobecná chyba"
 
@@ -25878,59 +25809,59 @@ msgstr "Skratky"
 msgid "Checkbox"
 msgstr "Zaškrtávacie tlačidlo"
 
-#: shell/e-storage.c:574
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "Žiadna chyba"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr "Priečinok s týmto menom už existuje"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr "Uvedený typ priečinku nie je platný"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "Chyba V/V"
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr "Nedostatok miesta pre vytvorenie priečinku"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr "Priečinok je prázdny"
 
-#: shell/e-storage.c:588
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr "Uvedený priečinok nebol nájdený"
 
-#: shell/e-storage.c:590
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr "Funkcia nie je v tomto sklade implementovaná"
 
-#: shell/e-storage.c:594
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr "Operácia nepodporovaná"
 
-#: shell/e-storage.c:596
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr "Uvedený typ nie je podporovaný týmto skladom"
 
-#: shell/e-storage.c:598
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr "Uvedený priečinok nie je možné zmeniť alebo odstrániť"
 
-#: shell/e-storage.c:600
+#: shell/e-storage.c:596
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Nie je možné presunúť priečinok do jednoho zo svojích podpriečinkov."
 
-#: shell/e-storage.c:602
+#: shell/e-storage.c:598
 msgid "Cannot create a folder with that name"
 msgstr "Nepodarilo sa vytvoriť priečinok s týmto menom"
 
-#: shell/e-storage.c:604
+#: shell/e-storage.c:600
 msgid "This operation cannot be performed in off-line mode"
 msgstr "Túto operáciu nie je možné urobiť v režime off-line"
 
@@ -25944,11 +25875,11 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hotových)"
 
-#: shell/evolution-folder-selector-button.c:101
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<kliknutím vyberiete priečinok>"
 
-#: shell/evolution-shell-component-utils.c:123
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -25959,7 +25890,7 @@ msgstr ""
 "\n"
 "Neznáma chyba."
 
-#: shell/evolution-shell-component-utils.c:126
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -25972,7 +25903,7 @@ msgstr ""
 "Chyba z komponentového systému:\n"
 "%s"
 
-#: shell/evolution-shell-component-utils.c:133
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -25985,63 +25916,63 @@ msgstr ""
 "Chyba z aktivačného systému:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1164
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "Chyba CORBA"
 
-#: shell/evolution-shell-component.c:1166
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Prerušené"
 
-#: shell/evolution-shell-component.c:1168
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Neplatné argumenty"
 
-#: shell/evolution-shell-component.c:1170
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "Už je vlastník"
 
-#: shell/evolution-shell-component.c:1172
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Žiadny vlastník"
 
-#: shell/evolution-shell-component.c:1174
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Nenájdený"
 
-#: shell/evolution-shell-component.c:1176
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Nepodporovaný typ"
 
-#: shell/evolution-shell-component.c:1178
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Nepodporovaná schéma"
 
-#: shell/evolution-shell-component.c:1180
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Nepodporovaná operácia"
 
-#: shell/evolution-shell-component.c:1182
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Interná chyba"
 
-#: shell/evolution-shell-component.c:1186
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Existuje"
 
-#: shell/evolution-shell-component.c:1188
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "Neplatné URI"
 
-#: shell/evolution-shell-component.c:1192
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Má podpriečinky"
 
-#: shell/evolution-shell-component.c:1194
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Žiadne voľné miesto"
 
-#: shell/evolution-shell-component.c:1196
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "Starý vlastník skončil"
 
@@ -26061,10 +25992,6 @@ msgstr "Stlačením OK tieto spojenia zatvoríte a prejdete do módu off-line"
 msgid "The following connections are currently active:"
 msgstr "Tieto spojenia sú momentálne aktívne:"
 
-#: 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 "Kalen_dár:"
@@ -26201,16 +26128,16 @@ msgstr "Túto správu už nezobrazovať"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution našiel tieto súbory dát pre import:"
 
-#: 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 končí..."
 
 #. 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"
@@ -26230,7 +26157,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:240
+#: shell/main.c:290
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -26238,40 +26165,44 @@ msgstr ""
 "Ďakujeme\n"
 "Tím Ximian Evolution\n"
 
-#: shell/main.c:248
+#: shell/main.c:298
 msgid "Don't tell me again"
 msgstr "Túto správu už nezobrazovať"
 
-#: shell/main.c:335
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nie je možné inicializovať shell Ximian Evolution."
 
-#: shell/main.c:344
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nie je možné inicializovať shell Ximian Evolution: %s"
 
-#: shell/main.c:476
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Zakázať úvodné okno"
 
-#: shell/main.c:478
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "Spustiť v režime off-line"
 
-#: shell/main.c:480
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "Spustiť v režime on-line"
 
-#: 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 "Poslať ladiaci výstup zo všetkých komponent od súboru."
 
-#: shell/main.c:485
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr "Vynútiť aktualizáciu konfiguračných súborov z Evolution 1.0.x"
 
-#: shell/main.c:510
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26281,7 +26212,6 @@ msgstr ""
 "  Použite %s --help pre zobrazenie dalších informácií.\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 "Chyba pri načítavaní štandardného adresára"
@@ -26291,14 +26221,49 @@ msgstr "Chyba pri načítavaní štandardného adresára"
 msgid "Input File"
 msgstr "Vstupný súbor"
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "Výstupný súbor"
-
 #: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Nezadané meno súboru."
 
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "Pridať prílohu..."
+
+#: 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 "Popis obsahuje"
+
+#: 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 "Nie je možné premenovať priečinok: %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 "Kopírovať vybrané kontakty do iného priečinka..."
@@ -26387,7 +26352,7 @@ msgstr "Zobraziť aktuálny 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 "A_kcie"
 
@@ -26505,7 +26470,7 @@ msgid "Print this item"
 msgstr "Tlačiť túto položku"
 
 #: 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 "Uložiť"
 
@@ -26532,7 +26497,7 @@ msgstr "Uložiť túto položku na 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 "_Súbor"
 
@@ -26714,7 +26679,8 @@ msgid "Hide _Read Messages"
 msgstr "Skryť _prečítané správy"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr "Skryje zmazané správy namiesto zobrazenia škrtnutím"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -26777,7 +26743,7 @@ msgstr "Zoznam vlákien"
 msgid "_Expunge"
 msgstr "_Vyčistiť"
 
-#: 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 "_Priečinok"
 
@@ -27181,7 +27147,7 @@ msgstr "_Citované"
 msgid "_Resend..."
 msgstr "Poslať _znovu..."
 
-#: 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 "_Nástroje"
 
@@ -27196,12 +27162,12 @@ msgstr "Zavrie toto okno"
 #: 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 "_Zavrieť"
 
 #: 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 "_Pohľad"
 
@@ -27380,7 +27346,7 @@ msgstr "_HTML"
 msgid "Save the current file and close the window"
 msgstr "Uložiť aktuálny súbor a zavrieť okno"
 
-#: 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 "_Pomocník"
 
@@ -27557,122 +27523,116 @@ msgid "Pi_lot Settings..."
 msgstr "Nastavenie _pilota..."
 
 #: ui/evolution.xml.h:27
-msgid "Pilot Con_duit Settings..."
-msgstr "Nastavenie spojky _pilota..."
-
-#: ui/evolution.xml.h:28
 msgid "Remove a folder added with \"Open Other User's Folder\""
-msgstr "Odstrániť priečinok pridaný pomocou \"Otvoriť priečinok iného používateľa\""
+msgstr ""
+"Odstrániť priečinok pridaný pomocou \"Otvoriť priečinok iného používateľa\""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "Príjem / odoslanie"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Send queued items and retrieve new items"
 msgstr "Poslať neodoslanú poštu a prijať novú poštu"
 
-#: ui/evolution.xml.h:31
-msgid "Set up Pilot conduit configuration"
-msgstr "Nastavenie spojky pre Pilota"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Set up Pilot configuration"
 msgstr "Nastavenie Pilota"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr "Zobrazí informáciu o Ximian Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Pošle správu o chybe"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "_Poslať správu o chybe"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
-msgstr "Pošle správu o chybe pomocou nástroja pre oznamovanie chýb Priateľ v núdzi."
+msgstr ""
+"Pošle správu o chybe pomocou nástroja pre oznamovanie chýb Priateľ v núdzi."
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "Prepnúť"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "Prepne, či sa má zobrazovať panel priečinkov"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Prepne, či sa má zobrazovať panel skratiek"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr "Prepne, či pracujete on alebo off-line."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "Zobraziť vybraný priečinok"
 
-#: 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 "O Ximian _Evolution..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "_Kopírovať..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Pru_h priečinkov"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Folder..."
 msgstr "_Priečinok..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "_Prejsť do priečinku..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr "_Import..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "_Presunúť..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "_Nový"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "Nový _priečinok"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 msgid "_Remove Other User's Folder"
 msgstr "_Odstrániť priečinok iného používateľa"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_Premenovať..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "_Poslať / Prijať"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "_Panel skratiek"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 msgid "_Shortcut..."
 msgstr "Klávesová _skratka..."
 
@@ -27748,9 +27708,8 @@ msgstr "S _kategóriou"
 msgid "_Tasks"
 msgstr "Ú_lohy"
 
-#. 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"
 
@@ -27795,12 +27754,12 @@ msgstr "Definovať pohľady"
 
 #. 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 "PUSŠPSN"
 
 #. 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"
 
@@ -27902,11 +27861,12 @@ msgstr "Znaková sada"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:190
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr "Editor hľadania"
 
-#: widgets/misc/e-filter-bar.c:212
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "Uložiť hľadanie"
 
@@ -27938,41 +27898,396 @@ msgstr "Otázka"
 msgid "Message"
 msgstr "Správa"
 
-#: widgets/misc/e-search-bar.c:524
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "_Nájsť"
+
+#: widgets/misc/e-search-bar.c:537
 msgid "_Find Now"
 msgstr "_Nájsť teraz"
 
-#: widgets/misc/e-search-bar.c:525
+#: widgets/misc/e-search-bar.c:538
 msgid "_Clear"
 msgstr "_Vyčistiť"
 
-#: widgets/misc/e-search-bar.c:826
+#: widgets/misc/e-search-bar.c:833
 msgid "Item ID"
 msgstr "ID položky"
 
-#: widgets/misc/e-search-bar.c:833
+#: widgets/misc/e-search-bar.c:840
 msgid "Subitem ID"
 msgstr "ID podpoložky"
 
-#: 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 "Vymazať"
 
-#: widgets/misc/e-search-bar.c:920
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Nájsť"
 
 #: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Osobný adresárový server"
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Prehliadač minikariet adresára 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 "Vytváracie rozhranie kalendára pre Osobný kalendárový server."
+#, fuzzy
+msgid "Evolution Calendar local file backend"
+msgstr "Prehliadač iTip/mTip kalendára Evolution"
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Prehliadač minikariet adresára Evolution"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Vytváracie rozhranie pre import súborov LDIF do Evolution."
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Importuje súbory LDIF do Evolution."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Vytváracie rozhranie pre import súborov VCard do Evolution."
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Importuje súbory VCard do Evolution."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "Ovládací prvok Bonobo pre adresy."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Ovládací prvok Bonobo, ktorý zobrazuje adresy."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Ukážkový ovládací prvok Bonobo, ktorý zobrazuje adresár."
+
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr "Ovládací prvok nastavenia pre adresáre Evolution."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Ovládací prvok pre zobrazenie minikariet adresára Evolution."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Komponent Evolution pre prácu s kontaktami."
+
+#~ msgid "Factory for the controls exported by the Evolution Addressbook"
+#~ msgstr "Vytváracie rozhranie pre prvky adresára Evolution"
+
+#~ msgid "1234"
+#~ msgstr "1234"
+
+#~ msgid "380"
+#~ msgstr "380"
+
+#~ msgid "666"
+#~ msgstr "666"
+
+#~ msgid "<- _Remove"
+#~ msgstr "<- _Odstrániť"
+
+#~ msgid "<< Fewer Options"
+#~ msgstr "<< Menej možností"
+
+#~ msgid "Add (or Edit) Attribute Mappings"
+#~ msgstr "Pridať (alebo upraviť) mapovanie atribútov"
+
+#~ msgid "DN Customization"
+#~ msgstr "Upravenie DN"
+
+#~ msgid "Mappings"
+#~ msgstr "Mapovanie"
+
+#~ msgid "Objectclasses"
+#~ msgstr "Objektové triedy"
+
+#~ msgid "Objectclasses Used in Evolution:"
+#~ msgstr "Objektové triedy použité v Evolution:"
+
+#~ msgid "Objectclasses Used on Server:"
+#~ msgstr "Objektové triedy použité na serveri:"
+
+#~ msgid ""
+#~ "Please select an Evolution attribute and an\n"
+#~ "LDAP attribute to associate with it."
+#~ msgstr ""
+#~ "Prosím, vyberte atribút Evolution a atribút\n"
+#~ "LDAP, ktorý s nim chcete asociovať."
+
+#~ msgid "R_estore Defaults"
+#~ msgstr "Š_tandardné"
+
+#~ msgid "Re_store Defaults"
+#~ msgstr "Š_tandardné"
+
+#~ 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 ""
+#~ "Atribút do DN pridáte tak, že ho vyberiete v zozname a stlačíte\n"
+#~ "\"Pridať atribút\".\n"
+#~ "Každá hodnota, ktorú pridáte, sa bude požadovať pre každý nový\n"
+#~ "kontakt, ktorý pridáte do adresára na serveri LDAP."
+
+#~ msgid "_Add ->"
+#~ msgstr "_Pridať ->"
+
+#~ msgid "_Add Mapping"
+#~ msgstr "_Pridať mapovanie"
+
+#~ msgid "_Add to DN"
+#~ msgstr "_Pridať do DN"
+
+#~ msgid "_Always"
+#~ msgstr "_Vždy"
+
+#~ msgid "_Delete Mapping"
+#~ msgstr "_Odstrániť mapovanie"
+
+#~ msgid "_Distinguished Name (DN):"
+#~ msgstr "_Známe meno (DN):"
+
+#~ msgid "_Don't use SSL/TLS"
+#~ msgstr "_Nepoužívať SSL/TLS"
+
+#~ msgid "_Edit Mapping"
+#~ msgstr "_Upraviť mapovanie"
+
+#~ msgid "_Evolution attribute:"
+#~ msgstr "Atribút _Evolution:"
+
+#~ msgid "_If necessary "
+#~ msgstr "_Ak potrebné"
+
+#~ msgid "_LDAP attribute:"
+#~ msgstr "Atribút _LDAP:"
+
+#~ msgid "_LDAP attributes:"
+#~ msgstr "Atribúty _LDAP:"
+
+#~ msgid "_More Options >>"
+#~ msgstr "_Viac možností >>"
+
+#~ msgid "_Restore Defaults"
+#~ msgstr "Š_tandardné"
+
+#~ msgid "account-druid"
+#~ msgstr "account-druid"
+
+#~ msgid "account-editor"
+#~ msgstr "account-editor"
+
+#~ 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 "Factory for the Addressbook's name selection interface"
+#~ msgstr "Vytváracie rozhranie pre rozhranie pre výber mena adresára."
+
+#~ msgid "Edit Contact List"
+#~ msgstr "Upraviť zoznam kontaktov"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Zoznam kontaktov bez mena"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d nezobrazených)"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Ovládací prvok Bonobo pre zobrazenie zoznamu úloh."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Ukážkový ovládací prvok Bonobo pre zobrazenie kalendára."
+
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Nastavenie pre kalendár Evolution."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Komponent Evolution pre prácu s kalendárom."
+
+#~ msgid "Factory for the Evolution Calendar objects"
+#~ msgstr "Vytváracie rozhranie pre objekty Kalendár Evolution"
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr ""
+#~ "Vytváracie rozhranie pre centralizáciu komponent Kalendár Evolution."
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Služba upozorňovania na poplachy"
+
+#~ msgid ""
+#~ "Evolution has taken the tasks that were in your calendar folder and "
+#~ "automatically migrated them to the new tasks folder."
+#~ msgstr ""
+#~ "Evolution automaticky previedol úlohy z priečinku kalendára do nového "
+#~ "priečinku úloh."
+
+#~ 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 sa pokúsil automaticky previesť úlohy z priečinku kalendára do "
+#~ "nového priečinku úloh.\n"
+#~ "Niektoré úlohy nebolo možné preniesť, takže je možné sa o to pokúsiť "
+#~ "neskôr."
+
+#~ msgid ""
+#~ "Could not open `%s'; no items from the calendar folder will be migrated "
+#~ "to the tasks folder."
+#~ msgstr ""
+#~ "Nie je možné otvoriť `%s'; žiadne údaje z priečinku kalendára nebudú "
+#~ "prevedené do priečinku úloh."
+
+#~ msgid ""
+#~ "The method required to load `%s' is not supported; no items from the "
+#~ "calendar folder will be migrated to the tasks folder."
+#~ msgstr ""
+#~ "Metóda pre načítanie `%s' nie je podporovaná, žiadne položky z priečinku "
+#~ "kalendára nebudú prenesené do priečinku úloh."
+
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Vytváracie rozhranie pre import súborov iCalendar do Evolution"
+
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Importuje súbory iCalendar do Evolution"
+
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Importuje súbory vCalendar do Evolution"
+
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr "Nie je možné získať zoznam skladov z registra: %s"
+
+#~ msgid "Can't call getFolderAtPath on storage: %s"
+#~ msgstr "Nie je možné zavolať getFolderAtPath pre sklad: %s"
+
+#~ msgid "minute"
+#~ msgstr "minúty"
+
+#~ msgid "hour"
+#~ msgstr "hodiny"
+
+#~ msgid "week"
+#~ msgstr "týždňa"
+
+#~ msgid "year"
+#~ msgstr "roku"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Vytváracie rozhranie pre editor správ Evolution."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Vytváracie rozhranie pre ovládací prvok úloh Evolution."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Vytváracie rozhranie pre editor správ Evolution."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Vytváracie rozhranie pre editor správ Evolution."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Komponent Evolution pre prácu s poštou."
+
+#, fuzzy
+#~ msgid "Factory for the controls exported by the Evolution Mailer"
+#~ msgstr "Vytváracie rozhranie pre editor správ Evolution."
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Vytváracie rozhranie pre import súborov mbox do Evolution"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importuje súbory mbox do Evolution"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr ""
+#~ "Vytváracie rozhranie pre import súborov Outlook Express 4 do Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importuje súbory Outlook Express 4 do Evolution"
+
+#~ msgid "On Screen fonts"
+#~ msgstr "Písma pre zobrazenie"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "_Pevná šírka:"
+
+#~ msgid "_Variable-width:"
+#~ msgstr "P_remenlivá šírka:"
+
+#~ msgid "All folders"
+#~ msgstr "Všetky priečinky"
+
+#~ msgid "Display Options"
+#~ msgstr "Možnosti zobrazenia"
+
+#~ msgid "Folders whose names begin with:"
+#~ msgstr "Priečinky, ktorých meno začína na:"
+
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Konfiguračný prvok pre súhrn Evolution."
+
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Ovládací prvok nastavenia priečinkov Evolution."
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie je možné vytvoriť priečinok\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 ""
+#~ "Priečinok %s\n"
+#~ "nemá správne nastavené práva. Prosím, zmeňte ich tak,\n"
+#~ "aby bolo možné čítanie a vykonanie a reštartujte Evolution."
+
+#~ msgid ""
+#~ "File %s\n"
+#~ "should be removed to allow Evolution to work correctly.\n"
+#~ "Please remove this file and restart Evolution."
+#~ msgstr ""
+#~ "Súbor %s\n"
+#~ "musí byť odstránený, aby Evolution správne fungoval.\n"
+#~ "Prosím, odstráňte tento súbor a reštartujte Evolution."
+
+#~ msgid "Output File"
+#~ msgstr "Výstupný súbor"
+
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "Nastavenie spojky _pilota..."
+
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "Nastavenie spojky pre Pilota"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Osobný adresárový server"
 
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "Vytváracie rozhranie kalendára pre Osobný kalendárový server."
diff --git a/po/sl.po b/po/sl.po
index cb2beef3c1..fe7c7cb66a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-03-10 20:58+0100\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2000-07-28 03:15+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -13,38 +13,52 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\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 "Tovarna uvozov datotek LDIF v Evolucijo."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolucijin uvozni druid"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "Uvozi datoteke LDIF v Evolucijo. "
+#: 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 "Tovarna uvozov datotek vVizitk v Evolucijo."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolucijin setavljalnik pošte."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Uvozi datoteke vVizitk v Evolucijo. "
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolucijin setavljalnik pošte."
+
+#: 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/gui/widgets/e-addressbook-view.c:332
+#: addressbook/backend/ebook/e-card.c:1301
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Zavedi kot"
 
 #: 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 "Ime"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:334
+#: addressbook/backend/ebook/e-card.c:1342
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-pošta"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "Prvi"
 
@@ -54,16 +68,17 @@ msgstr "Prvi"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
-#: addressbook/gui/widgets/e-addressbook-view.c:366
+#: 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 "Pomočnik"
 
 #: 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:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: 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 "Služba"
 
@@ -73,12 +88,12 @@ msgid "Bus"
 msgstr "Služ."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr "Povratni klic"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "Podjetje"
 
@@ -89,13 +104,14 @@ msgstr "Podj."
 #: 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:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr "Doma"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:341
+#: addressbook/backend/ebook/e-card.c:1362
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organizacija"
 
@@ -105,19 +121,19 @@ 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:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "Prenosni telefon"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Car"
 msgstr "Avto"
 
 #: 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:1719
-#: addressbook/gui/widgets/e-addressbook-view.c:346
+#: 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 "Službeni faks"
 
@@ -126,13 +142,13 @@ msgid "Bus Fax"
 msgstr "Služb. fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
-#: addressbook/gui/widgets/e-addressbook-view.c:347
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Domači faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "Služba"
 
@@ -141,69 +157,68 @@ msgid "Bus 2"
 msgstr "Služba 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "Doma 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
-#: addressbook/gui/widgets/e-addressbook-view.c:350
+#: 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:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "Drugo"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
-#: addressbook/gui/widgets/e-addressbook-view.c:352
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Drugi faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
-#: addressbook/gui/widgets/e-addressbook-view.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Pozivnik"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
-#: addressbook/gui/widgets/e-addressbook-view.c:354
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radijo"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
-#: addressbook/gui/widgets/e-addressbook-view.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Teleks"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 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:1759
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: 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-naslov 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:1760
-#: addressbook/gui/widgets/e-addressbook-view.c:359
+#: 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-naslov 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:360
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Web Site"
 msgstr "Spletna stran"
 
@@ -212,7 +227,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:361
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Department"
 msgstr "Oddelek"
 
@@ -221,7 +236,8 @@ msgid "Dep"
 msgstr "Odd."
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:362
+#: addressbook/backend/ebook/e-card.c:1376
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Pisarna"
 
@@ -230,12 +246,13 @@ msgid "Off"
 msgstr "Pisar."
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/backend/ebook/e-card.c:1383
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Naziv"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:364
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
 msgstr "Poklic"
 
@@ -244,7 +261,8 @@ msgid "Prof"
 msgstr "Pokl."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/backend/ebook/e-card.c:1397
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Upravljalec"
 
@@ -257,7 +275,8 @@ msgid "Ass"
 msgstr "Pomoč."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:367
+#: addressbook/backend/ebook/e-card.c:1411
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Vzdevek"
 
@@ -266,16 +285,19 @@ msgid "Nick"
 msgstr "Vzdevek"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:368
+#: addressbook/backend/ebook/e-card.c:1418
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Partner(ka)"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:369
+#: addressbook/backend/ebook/e-card.c:1459
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Opomba"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr "URI koledarja"
 
@@ -284,7 +306,7 @@ msgid "CALUri"
 msgstr "URI koledarja"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
 msgstr "URL zasedenosti"
 
@@ -293,419 +315,415 @@ msgid "FBUrl"
 msgstr "Url zased."
 
 #: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "Default server calendar"
+msgstr "Shrani koledar"
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "icsCalendar"
+msgstr "Koledar"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
 msgid "Anniversary"
 msgstr "Obletnica"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Oblet."
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "Rojstni datum"
 
-#: 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 "kategorije"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Družinsko ime"
 
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:335
+#, fuzzy
+msgid "ECard"
+msgstr "Avto"
+
+#: addressbook/backend/ebook/e-card-simple.c:832
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2677
-msgid "Multiple VCards"
-msgstr "Več vVizitk"
+#: addressbook/backend/ebook/e-card-simple.c:893
+#: addressbook/backend/ebook/e-destination.c:706
+#, fuzzy
+msgid "Unnamed List"
+msgstr "Neimenovan seznam stikov"
 
-#: addressbook/backend/ebook/e-card.c:2685
-#, c-format
-msgid "VCard for %s"
-msgstr "VVizitka za %s"
+#: 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 "Polno ime"
+
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "_Naslov:"
+
+#: addressbook/backend/ebook/e-card.c:1328
+#, fuzzy
+msgid "Address Label"
+msgstr "Vizitke"
+
+#: addressbook/backend/ebook/e-card.c:1335
+#, fuzzy
+msgid "Phone"
+msgstr "Telefon v avtu"
+
+#: addressbook/backend/ebook/e-card.c:1349
+#, fuzzy
+msgid "Birth date"
+msgstr "Rojstni datum"
+
+#: 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 "Organizacija"
+
+#: 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 "Vloga"
+
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
+#, fuzzy
+msgid "Mailer"
+msgstr "Pošta"
+
+#: addressbook/backend/ebook/e-card.c:1445
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "URL zasedenosti:"
+
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Koledar"
+
+#: addressbook/backend/ebook/e-card.c:1466
+#, fuzzy
+msgid "Related Contacts"
+msgstr "Zbriši stik?"
+
+#: addressbook/backend/ebook/e-card.c:1480
+#, fuzzy
+msgid "Category List"
+msgstr "Kategorija je"
+
+#: 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 "seznam"
+
+#: addressbook/backend/ebook/e-card.c:1508
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "Drug naslov"
+
+#: addressbook/backend/ebook/e-card.c:1515
+#, fuzzy
+msgid "Arbitrary"
+msgstr "Prvi"
+
+#: addressbook/backend/ebook/e-card.c:1522
+#, fuzzy
+msgid "ID"
+msgstr "I"
+
+#: addressbook/backend/ebook/e-card.c:1529
+#, fuzzy
+msgid "Last Use"
+msgstr "Prilepi"
 
-#: 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:1727
-#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
-#: tools/evolution-addressbook-abuse.c:132
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
+#: addressbook/backend/ebook/e-card.c:1540
+#, fuzzy
+msgid "Use Score"
+msgstr "Točke"
+
+#: 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 "Nisem mogel inicializirati Bonoba"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2727
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 msgid "Searching..."
 msgstr "Iščem..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr "Nalagam..."
 
-#. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
-msgid "Error in search expression."
-msgstr "Napaka v iskalnem izrazu."
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+#, fuzzy
+msgid "Using Distinguished Name (DN)"
+msgstr "Razločno ime (DN)"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "E-poštni naslov:"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1120
+#: addressbook/backend/pas/pas-backend-ldap.c:748
+#, fuzzy
+msgid "Reconnecting to LDAP server..."
+msgstr "Vzpostavljam povezavo s strežnikom LDAP..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr "Dodajam vizitko v strežnik LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1223
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr "Odstranjujem vizitko iz strežnika LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1459
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr "Spreminjam vizitko iz strežnika LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2580
-msgid "Restarting search."
-msgstr "Znova začenjam iskanje."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:2672
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "Dobivam rezultate iskanja LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2754
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 msgid "Error performing search"
 msgstr "Napaka ob iskanju"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2778
-msgid "Could not parse query string"
-msgstr "Nisem mogel razčleniti niza poizvedbe"
-
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Privzet usklajevalni naslov:"
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Kazalec se ni mogel naložiti\n"
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EKnjiga ni naložena\n"
 
-#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
-#: 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 "Nisem mogel pognati strežnika wombat"
 
-#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: 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 "Nisem mogel pognati programa 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 "Nisem mogel prebrati Pilotovega adresarja"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Kontrola Bonobo za vznik naslova."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Kontrola Bonobo za prikaz naslova."
+#: 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:3
-#: notes/GNOME_Evolution_Notes.oaf.in.h:1
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Vzorčna kontrola Bonobo, ki prikaže adresar."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Directory Servers"
+msgstr "N_ov strežnik imenikov"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Kontrola, ki prikaže mini vizitko iz Evolucijinega adresarja."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Evolucijin adresarjev veznik"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Evolucijin adresarjev veznik"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Evolucijina komponenta za urejanje stikov."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolucijin adresarjev veznik"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Tovarna za orodje mini vizitk adresarja"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Tovarna za prikazovalnik adresarjeve adrese"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr "Tovarna za Adresarjev vznik naslova"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolucijin adresarjev veznik"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the sample Addressbook control"
-msgstr "Tovarna za vzorčno kontrolo adresarja"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
 
-#: addressbook/gui/component/addressbook-component.c:71
-#: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: 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 "Stiki"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:76
 msgid "Folder containing contact information"
 msgstr "Mapa, ki vsebuje podatke o stikih"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP Server"
 msgstr "Strežnik LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP server containing contact information"
 msgstr "Strežnik LDAP, ki vsebuje podatke o stikih"
 
-#: addressbook/gui/component/addressbook-component.c:558
+#: addressbook/gui/component/addressbook-component.c:80
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Stiki"
+
+#: addressbook/gui/component/addressbook-component.c:80
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Mapa, ki vsebuje podatke o stikih"
+
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Nov stik"
 
-#: addressbook/gui/component/addressbook-component.c:558
-#: ui/evolution-addressbook.xml.h:34
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_Stik"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Ustvari nov stik"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Nov seznam stikov"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "Seznam _stikov"
 
-#: addressbook/gui/component/addressbook-config.c:225
-msgid "Edit Addressbook"
-msgstr "Uredi adresar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "100"
-msgstr "100"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "389"
-msgstr "389"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "A_uthenticate with server using:"
-msgstr "_Avtentificiraj se pri srežniku z uporabo:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
-msgstr "Ime računa"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "Dodaj adresar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Addressbook Sources"
-msgstr "Viri adresarja"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
-msgstr "Napredno"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "Osnovno"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Osnovno"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Check this if the server requires you to authenticate."
-msgstr "Izberite to, če strežnik zahteva od vas avtentifikacijo."
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "De_lete"
-msgstr "Z_briši"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Distinguished name (DN)"
-msgstr "Razločno ime (DN)"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Email address"
-msgstr "E-poštni naslov"
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid ""
-"Evolution will use this Distinquished Name (DN) to authenticate you with the "
-"server"
-msgstr ""
-"Evolucija bo uporabila to Razločno ime (DN), za vašo avtentifikacijo pri "
-"strežniku"
-
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-"Evolucija bo uporabila ta e-poštni naslov, za vašo avtentifikacijo pri "
-"strežniku"
-
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "One"
-msgstr "Ena"
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-msgstr "Iskanje v _zbirki:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "Search s_cope: "
-msgstr "_Doseg iskanja:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "Ime strežnika"
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "Sub"
-msgstr "Pod"
-
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "The information below is required in order to add an addressbook.  "
-msgstr "Podatki spodaj so potrebni za dodajanje adresarja.  "
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Ustvari nov seznam stikov"
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
-msgstr "Te podatki za večino strežnikov ldap niso potrebni"
+#: addressbook/gui/component/addressbook-config.c:206
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Nisem se mogel povezati s strežnikom LDAP."
 
-#: addressbook/gui/component/addressbook-config.glade.h:23
-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."
+#: addressbook/gui/component/addressbook-config.c:231
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
 msgstr ""
-"Te podatke potrebuje vaš strežnik ldap za določitev katera vozlišča naj se "
-"uporabljajo za iskanja. Za več podatkov se obrnite na svojega "
-"administratorja."
+"Strežniku IMAP se nisem mogel avtentificirati.\n"
+"%s\n"
+"\n"
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
-msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
-msgstr ""
-"To je izhodiščno vozlišče vseh vaših iskanj na strežniku ldap. Za več "
-"podatkov se obrnite na svojega administratorja."
+#: addressbook/gui/component/addressbook-config.c:259
+#, fuzzy
+msgid "Could not perform query on Root DSE"
+msgstr "Nisem mogel razčleniti niza poizvedbe"
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
-msgid ""
-"This is the maximum number of cards to download.  Setting this number too "
-"large will slow down this addressbook."
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
 msgstr ""
-"To je največje število vizik za prenos.  Če je to nastavljeno na preveč, bo "
-"upočasnilo ta adresar."
 
-#: addressbook/gui/component/addressbook-config.glade.h:26
-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."
+#: addressbook/gui/component/addressbook-config.c:1193
+msgid "This server does not support LDAPv3 schema information"
 msgstr ""
-"To je način, ki ga bo Evolucija uporabila, za vašo avtentifikacijo.  Če "
-"boste to nastavili na \"E-poštni naslov\", bo potrebovan anonimni dostop do "
-"vašega strežnika LDAP"
 
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "This is the name of the server where your addressbook is located."
-msgstr "To je ime strežnika, kjer se nahaja vaš adresar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "This is the port that your ldap server uses."
-msgstr "To so vrata, ki jih uporablja vaš strežnik ldap."
-
-#: addressbook/gui/component/addressbook-config.glade.h:29
-msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
+#: addressbook/gui/component/addressbook-config.c:1215
+#, fuzzy
+msgid "Error retrieving schema information"
 msgstr ""
-"To ime bo uporabljeno za identifikacijo vašega računa. Uporablja se le za "
-"prikaz."
-
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Account name:"
-msgstr "Ime _računa:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:31
-#: 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:7
-#: mail/mail-config.glade.h:126
-msgid "_Add"
-msgstr "_Dodaj"
-
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "_Distinguished Name:"
-msgstr "_Razločno ime:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:33
-msgid "_Download Limit"
-msgstr "_Omejitev prenosov"
-
-#: addressbook/gui/component/addressbook-config.glade.h:34
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:135
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:39
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:21
-msgid "_Edit"
-msgstr "_Uredi"
+"Napaka ob nalaganju podatkov o filtrih:\n"
+"%s"
 
-#: addressbook/gui/component/addressbook-config.glade.h:35
-msgid "_Email address:"
-msgstr "_E-poštni naslov:"
+#: addressbook/gui/component/addressbook-config.c:1223
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "Odgovor strežnika IMAP ni vseboval podatkov %s"
 
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "_Vrata:"
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr "Ime računa"
 
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "Ime _strežnika:"
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "Ime strežnika"
 
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-msgid "Could not initialize gnome-vfs"
-msgstr "Nisem mogel inicializirati gnome-vfs"
+#: addressbook/gui/component/addressbook-config.c:1676
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL v to zgradbi Evolucije ni vgrajen)"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
 msgid "Other Contacts"
 msgstr "Drugo stiki"
 
-#: addressbook/gui/component/addressbook.c:525
-msgid "Unable to open addressbook"
-msgstr "Kliknite tu za odprtje adresarja"
+#: 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 ""
+"Nisem megel odpreti tega adresarja. Prosim preverite, ali \n"
+"pot obstaja in ali imate dovoljenje za dostop."
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:522
+#, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
-"is down"
+"is unreachable."
 msgstr ""
 "Ne morem odpreti tega adresarja. To pomeni, da \n"
 "ste vpisali neveljaven URI ali, da strežnik LDAP ne deluje"
 
-#: addressbook/gui/component/addressbook.c:539
+#: 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"
@@ -717,51 +735,94 @@ msgstr ""
 "ko boste s spodnje povezave prenesli program OpenLDAP,\n"
 "Evolucijo prevesti iz izvorne kode CVS.\n"
 
-#: addressbook/gui/component/addressbook.c:547
+#: addressbook/gui/component/addressbook.c:537
+#, fuzzy
 msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the server\n"
+"is unreachable."
 msgstr ""
-"Nisem megel odpreti tega adresarja. Prosim preverite, ali \n"
-"pot obstaja in ali imate dovoljenje za dostop."
+"Ne morem odpreti tega adresarja. To pomeni, da \n"
+"ste vpisali neveljaven URI ali, da strežnik LDAP ne deluje"
 
-#: addressbook/gui/component/addressbook.c:655
-#: addressbook/gui/component/addressbook.c:658
-#, c-format
-msgid "Enter password for %s (user %s)"
+#: addressbook/gui/component/addressbook.c:557
+msgid "Unable to open addressbook"
+msgstr "Kliknite tu za odprtje adresarja"
+
+#: addressbook/gui/component/addressbook.c:622
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:667
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr "Nisem mogel preveriti certifikatov."
+
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr "Vpišite geslo za %s (uporabnik %s)"
 
-#: addressbook/gui/component/addressbook.c:836
+#: addressbook/gui/component/addressbook.c:813
 msgid "Name begins with"
 msgstr "Ime se začne z"
 
-#: addressbook/gui/component/addressbook.c:837
-msgid "Email is"
-msgstr "E-naslov je"
+#: addressbook/gui/component/addressbook.c:814
+#, fuzzy
+msgid "Email begins with"
+msgstr "Ime se začne z"
 
-#: addressbook/gui/component/addressbook.c:838
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:815
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:839
-#: calendar/gui/cal-search-bar.c:55
+#: addressbook/gui/component/addressbook.c:816
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Katerokoli polje vsebuje"
 
-#: addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "Napredno..."
 
+#: 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"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: 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"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:999
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:1002
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:1006
+msgid "This query did not complete successfully."
+msgstr ""
+
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1082
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1089
+#: calendar/gui/cal-search-bar.c:354
 msgid "Any Category"
 msgstr "katerakoli kategorija"
 
-#: addressbook/gui/component/addressbook.c:1167
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
@@ -770,176 +831,573 @@ msgstr "URI, ki naj ga prikaže brskalnik map"
 #. * 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 "(brez)"
 
-#: 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:1758
+#: 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 "prvi e-naslov"
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Izberi dejanje"
 
-#: 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 "Ustvari nov stik \"%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 "Dodaj naslov k obstoječemu stiku \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Poizvedujem v adresarju..."
 
-#: 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 "Uredi podatke stika"
 
-#: 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 "Dodaj k stikom"
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Zlij E-poštne naslove"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Izključi poizvedbe"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Vključi poizvedbe (nevarno!)"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
+#: 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/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Tovarna Evolucijinih vmesnikov za izbiro imen iz adresarja"
+#: addressbook/gui/component/ldap-config.glade.h:3
+#, fuzzy
+msgid "  S_how Supported Bases "
+msgstr "_Preveri za podprte vrste  "
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:849
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
-msgid "Remove"
-msgstr "Odstrani"
+#: 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:5
+#, fuzzy
+msgid "1:00"
+msgstr "100"
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "Add LDAP Server"
+msgstr "Strežnik LDAP"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "Addressbook Sources"
+msgstr "Viri adresarja"
+
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
+#: mail/mail-config.glade.h:16
+msgid "Always"
+msgstr "Vedno"
+
+#: addressbook/gui/component/ldap-config.glade.h:14
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anonimno"
+
+#: 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"
+"\n"
+"Please click the \"Finish\" button to save the settings you have entered "
+"here."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:19
+#, fuzzy
+msgid "Connecting"
+msgstr "Connecticut"
+
+#: addressbook/gui/component/ldap-config.glade.h:20
+msgid "De_lete"
+msgstr "Z_briši"
+
+#: addressbook/gui/component/ldap-config.glade.h:21
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "_Razločno ime:"
+
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid "Edit LDAP Server"
+msgstr "Strežnik LDAP"
+
+#: addressbook/gui/component/ldap-config.glade.h:23
+msgid "Email Address:"
+msgstr "E-poštni naslov:"
+
+#: addressbook/gui/component/ldap-config.glade.h:24
+#, fuzzy
+msgid "Evolution will use this DN to authenticate you with the server"
+msgstr ""
+"Evolucija bo uporabila ta e-poštni naslov, za vašo avtentifikacijo pri "
+"strežniku"
+
+#: addressbook/gui/component/ldap-config.glade.h:25
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"Evolucija bo uporabila ta e-poštni naslov, za vašo avtentifikacijo pri "
+"strežniku"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Finished"
+msgstr "_Poišči"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Splošno"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "Nastavitev"
+
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:77
+msgid "Never"
+msgstr "Nikoli"
+
+#: 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"
+"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."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+msgid "One"
+msgstr "Ena"
+
+#: addressbook/gui/component/ldap-config.glade.h:34
+#, fuzzy
+msgid "S_earch scope: "
+msgstr "_Doseg iskanja:"
+
+#. No time range is set, so don't start a query
+#: 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 "Iskanje"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Selected:"
+msgstr "Zbrisano"
+
+#: 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:39
+msgid ""
+"Selecting this option means that Evolution will only try to use SSL/TLS if "
+"you are in a \n"
+"insecure environment. For example, if you and your LDAP server are behind a "
+"firewall\n"
+"at work, then Evolution doesn't need to use SSL/TLS because your connection "
+"is already\n"
+"secure."
+msgstr ""
+
+#: 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"
+"means that your connection will be insecure, and that you will be vulnerable "
+"to security\n"
+"exploits. "
+msgstr ""
+
+#: 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:48
+msgid ""
+"Specifying a display name is the last required step in configuring an LDAP "
+"server."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "Step 1: Server Information"
+msgstr "Podatki o izvorni kodi"
+
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Vzpostavljam povezavo s strežnikom..."
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+msgid "Step 3: Searching the Directory"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Step 4: Display Name"
+msgstr "Piskaj ob zaslonskih alarmih"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+msgid "Sub"
+msgstr "Pod"
+
+#: addressbook/gui/component/ldap-config.glade.h:54
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Shranjena iskanja"
+
+#: 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"
+"information. Please ask your system administrator if you are unsure of this "
+"information."
+msgstr ""
+
+#: 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"
+"need to change these options."
+msgstr ""
+
+#: 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"
+"begin. If you leave this blank, the search will begin at the root of the "
+"directory tree."
+msgstr ""
+
+#: 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.\n"
+msgstr ""
+
+#: 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"
+"\n"
+"Adding a new LDAP server requires some specialized information\n"
+"about the server. Please contact your system administrator if you \n"
+"need help finding this information."
+msgstr ""
+
+#: 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:73
+#, fuzzy
+msgid ""
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
+"too large will slow down your addressbook."
+msgstr ""
+"To je največje število vizik za prenos.  Če je to nastavljeno na preveč, bo "
+"upočasnilo ta adresar."
+
+#: 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 ""
+"To je način, ki ga bo Evolucija uporabila, za vašo avtentifikacijo.  Če "
+"boste to nastavili na \"E-poštni naslov\", bo potrebovan anonimni dostop do "
+"vašega strežnika LDAP"
+
+#: addressbook/gui/component/ldap-config.glade.h:76
+#, fuzzy
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list.\n"
+"It is for display purposes only. "
+msgstr ""
+"To ime bo uporabljeno za identifikacijo vašega računa. Uporablja se le za "
+"prikaz."
+
+#: 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"
+"list of standard ports has been provided. Ask your system administrator\n"
+"what port you should specify."
+msgstr ""
+
+#: 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:82
+msgid "U_se SSL/TLS:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid "Using distinguished name (DN)"
+msgstr "Razločno ime (DN)"
+
+#: addressbook/gui/component/ldap-config.glade.h:84
+#, fuzzy
+msgid "Using email address"
+msgstr "E-poštni naslov"
+
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:132
+msgid "Whenever Possible"
+msgstr "Kadar je možno"
+
+#: 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 "_Dodaj"
+
+#: addressbook/gui/component/ldap-config.glade.h:87
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Prikaz"
+
+#: addressbook/gui/component/ldap-config.glade.h:88
+#, fuzzy
+msgid "_Download limit:"
+msgstr "_Omejitev prenosov"
+
+#: 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
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
+msgid "_Edit"
+msgstr "_Uredi"
+
+#: addressbook/gui/component/ldap-config.glade.h:90
+msgid "_Log in method:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:91
+#, fuzzy
+msgid "_Port number:"
+msgstr "Številka vrat:"
+
+#: addressbook/gui/component/ldap-config.glade.h:92
+#, fuzzy
+msgid "_Search base:"
+msgstr "Iskanje v _zbirki:"
+
+#: addressbook/gui/component/ldap-config.glade.h:93
+msgid "_Server name:"
+msgstr "Ime _strežnika:"
+
+#: addressbook/gui/component/ldap-config.glade.h:94
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Čas podaljška spanja (minut)"
+
+#: addressbook/gui/component/ldap-config.glade.h:95
+#, fuzzy
+msgid "cards"
+msgstr "ni vizitk"
+
+#: addressbook/gui/component/ldap-config.glade.h:96
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Znova se povezujem z %s"
+
+#: addressbook/gui/component/ldap-config.glade.h:97
+#, fuzzy
+msgid "general-tab"
+msgstr "Splošno"
+
+#: addressbook/gui/component/ldap-config.glade.h:98
+#, fuzzy
+msgid "searching-tab"
+msgstr "Iskanje"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
 msgid "Remove All"
 msgstr "Odstrani vse"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:202
-msgid "Send HTML Mail?"
-msgstr "Pošlji pošto v obliki 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 "Odstrani"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:405
-msgid "Edit Contact List"
-msgstr "Uredi seznam stikov"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+msgstr "Nov seznam stikov"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:423
-msgid "Unnamed Contact List"
-msgstr "Neimenovan seznam stikov"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact Info"
+msgstr "Uredi podatke stika"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:440
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d ni pokazanih)"
+#: 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 "Pošlji pošto v obliki 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 "Neimenovan stik"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
-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 ""
-"Evolucija ne more dobiti krajevne hrambe adresarja.\n"
-"To se lahko zgodi, če se komponenta evolution-addressbook sesuje.\n"
-"Da bi nam pomagali bolje razumeti in na koncu rešiti ta problem,\n"
-"prosim pošljite e-pošto na Jon Trowbridge <trow@ximian.com>.\n"
-"Vsebuje naj podroben opis okoliščin v katerih se je ta napaka tgodila.\n"
-"Hvala."
-
-#: addressbook/gui/component/select-names/e-select-names.c:608
-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 ""
-"Evolucija ne more dobiti krajevne hrambe adresarja.\n"
-"V normalnih okoliščinah se to nikoli ne bi smelo zgoditi.\n"
-"Za rešitev tega problema boste morali zapustiti in znova\n"
-"pognati Evolucijo."
+#: 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 "Izvorna koda"
 
-#: addressbook/gui/component/select-names/e-select-names.c:690
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr "Izberi stike iz adresarja"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "_Vsebujejo:"
+#: addressbook/gui/component/select-names/e-select-names.c:648
+#, fuzzy
+msgid "Find contact in"
+msgstr "Poišči stik"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "_Poišči"
+#, fuzzy
+msgid "Find"
+msgstr "Poišči"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "Izberi imena"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
-msgstr "Kaži stike, ki ustrezajo naslednjim kriterijem:"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Zbriši stik?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:5
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Stiki"
+
+#: 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:8
 msgid "_Category:"
 msgstr "_Kategorija:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr "_Mapa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "A_ssistant's name:"
 msgstr "_Ime pomočnika:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Add_ress..."
 msgstr "_Naslov..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr "Ob_letnica:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Birthda_y:"
 msgstr "_Rojstni dan:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
-msgstr "_Stiki..."
-
 #: 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_tegorije..."
@@ -950,7 +1408,7 @@ msgstr "Sodelovanje"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr "Urejevalnik stikov"
 
@@ -959,7 +1417,7 @@ msgid "D_epartment:"
 msgstr "O_ddelek:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:196
 msgid "Details"
 msgstr "Podrobnosti"
 
@@ -975,10 +1433,6 @@ msgstr "Zavedi _kot:"
 msgid "Full _Name..."
 msgstr "_Polno ime..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "Splošno"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1004,1106 +1458,1155 @@ msgstr "Organi_zacija:"
 msgid "P_rofession:"
 msgstr "_Poklic:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr "Vrste telefonov"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "S_pouse:"
 msgstr "_Partner(ka):"
 
-#: 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 "_To je poštni naslov"
 
-#: 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 "Želi dobivati _HTML e-pošto"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1492 mail/mail-config.glade.h:133
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:107
-#: ui/evolution-tasks.xml.h:20 ui/evolution.xml.h:35
+#: 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 "_Zbriši"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "Službeni _naziv:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr "Ime _managerja:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "_Vzdevek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "Pi_sarna:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Public Calendar URL:"
 msgstr "URL _javnega koledarja"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Web page address:"
 msgstr "Naslov _spletne strani:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: 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 "Vključi"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr "Združene države amerike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "Albanija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "Alžirija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "American Samoa"
 msgstr "Ameriška Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Andorra"
 msgstr "Andora"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Anguilla"
 msgstr "Angvila"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antigua And Barbuda"
 msgstr "Antigva in Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: 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:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Armenia"
 msgstr "Armenija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "Avstralija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "Avstrija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Azerbaijan"
 msgstr "Azerbajdžan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "Bahami"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "Bahrajn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bangladesh"
 msgstr "Bangladeš"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Belarus"
 msgstr "Belorusija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "Belgija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: 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:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bermuda"
 msgstr "Bermudi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bhutan"
 msgstr "Butan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Bolivija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bosnia And Herzegowina"
 msgstr "Bosna in Hercegovina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Botswana"
 msgstr "Bocvana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bouvet Island"
 msgstr "Bouvetski otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Brazilija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "British Indian Ocean Territory"
 msgstr "Britansko Indijsko oceansko območje"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: 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:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bolgarija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: 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:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cambodia"
 msgstr "Kambodža"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: 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:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cape Verde"
 msgstr "Zelenortski otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Kajmanski otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Central African Republic"
 msgstr "Srednjaafriška republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Chad"
 msgstr "Čad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Čile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "China"
 msgstr "Kitajska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "Velikonočni otok"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokosovi otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Kolumbija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Comoros"
 msgstr "Komori"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: 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:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cook Islands"
 msgstr "Cookovi otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cote d'Ivoire"
 msgstr "Cote d'Ivoire"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Hrvaška"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: 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:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "Ciper"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "Češka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Danska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Djibouti"
 msgstr "Džibuti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Dominica"
 msgstr "Dominika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "Dominikanska republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr "Vshodni timor"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: 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:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Egipt"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: 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:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "Ekvatorijalna gvineja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Eritreja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Estonija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Etiopija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "Falklandski otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr "Farski otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "Fidži"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Finska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "Francija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "Francoska Gvajana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "Francoska polinezija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr "Francoska ju>na obmohja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Gambija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "Gruzija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Nemčija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "Gana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Gibrlaltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Grčija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Grenlandija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Gvatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guinea"
 msgstr "Gvineja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea-bissau"
 msgstr "Gvineja bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guyana"
 msgstr "Gvajana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: 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:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Heard And McDonald Islands"
 msgstr "Heardovi in McDonaldovi otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr "Sveto morje"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: 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:225
+#: 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:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "Madžarska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "Islandija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "Indija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Indonesia"
 msgstr "Indonezija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "Irska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Izrael"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "Italija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Jamajka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "Japonska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "Jordanija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kazahstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Kenija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Republic Of"
 msgstr "Koreja, Republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuvajt"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kyrgyzstan"
 msgstr "Kirgizistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Latvia"
 msgstr "Latvija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lesotho"
 msgstr "Lesoto"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Litvanija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: 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:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Macau"
 msgstr "Macao"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Macedonia"
 msgstr "Makedonija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Malawi"
 msgstr "Malavi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Malaysia"
 msgstr "Malezija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Maldives"
 msgstr "Maldivi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: 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:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Marshall Islands"
 msgstr "Marshallovi otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Martinique"
 msgstr "Martinik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mauritania"
 msgstr "Mavretanija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: my-evolution/Locations.h:1385
 msgid "Mexico"
 msgstr "Mehika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Micronesia"
 msgstr "Mikronezija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Moldova, Republic Of"
 msgstr "Moldova, Republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Monaco"
 msgstr "Monako"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mongolia"
 msgstr "Mongolija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: 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:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mozambique"
 msgstr "Mozambik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Myanmar"
 msgstr "Mjanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Namibia"
 msgstr "Namibija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: my-evolution/Locations.h:1529
 msgid "Netherlands"
 msgstr "Nizozemska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Netherlands Antilles"
 msgstr "Nizozemski Antili"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "New Caledonia"
 msgstr "Nova Kaledonija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1558
 msgid "New Zealand"
 msgstr "Nova Zelandija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1560
 msgid "Nicaragua"
 msgstr "Nikaragva"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nigeria"
 msgstr "Nigerija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1572
 msgid "Norfolk Island"
 msgstr "Norfolški otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Northern Mariana Islands"
 msgstr "Severni marianski otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1585
 msgid "Norway"
 msgstr "Norveška"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: 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:287
-#: my-evolution/Locations.h:1673
+#: 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:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Palau"
 msgstr "Paragvaj"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Palestinian Territory"
 msgstr "Palestinsko osvobojeno ozemlje"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: 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:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Papua New Guinea"
 msgstr "Papua Nova Gvineja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1686
 msgid "Paraguay"
 msgstr "Paragvaj"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: 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:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Philippines"
 msgstr "Filipini"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pitcairn"
 msgstr "Pitcairin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: my-evolution/Locations.h:1762
 msgid "Poland"
 msgstr "Poljska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: my-evolution/Locations.h:1789
 msgid "Portugal"
 msgstr "Portugalska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: my-evolution/Locations.h:1822
 msgid "Puerto Rico"
 msgstr "Portoriko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: 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:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Reunion"
 msgstr "Reunion"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: my-evolution/Locations.h:1909
 msgid "Romania"
 msgstr "Romunija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Russian Federation"
 msgstr "Ruska federacija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Saint Kitts And Nevis"
 msgstr "St. Kitts in Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Saint Lucia"
 msgstr "St. Lucija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Vincent And The Grena-dines"
 msgstr "St. Vincent in Grenadini"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: 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:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome in Principe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: my-evolution/Locations.h:2032
 msgid "Saudi Arabia"
 msgstr "Savdska Arabija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Senegal"
 msgstr "Senegalija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Seychelles"
 msgstr "Sejšeli"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: 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:314
-#: my-evolution/Locations.h:2090
+#: 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:315
-#: my-evolution/Locations.h:2103
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: my-evolution/Locations.h:2100
 msgid "Slovakia"
 msgstr "Slovaška"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: my-evolution/Locations.h:2101
 msgid "Slovenia"
 msgstr "Slovenija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Solomon Islands"
 msgstr "Solomonovi otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Somalia"
 msgstr "Somalija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2116
 msgid "South Africa"
 msgstr "Južno afriška republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Južna Georgija in Južni Sandwichovi otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: my-evolution/Locations.h:2124
 msgid "Spain"
 msgstr "Španija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sri Lanka"
 msgstr "Šrilanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "St. Helena"
 msgstr "Sv. Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "St. Pierre And Miquelon"
 msgstr "Sv. Pierre in Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: 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:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbardovi in Jan Mayenovi otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Swaziland"
 msgstr "Svazi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: my-evolution/Locations.h:2178
 msgid "Sweden"
 msgstr "Švedska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: my-evolution/Locations.h:2180
 msgid "Switzerland"
 msgstr "Švica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: my-evolution/Locations.h:2202
 msgid "Taiwan"
 msgstr "Tajvan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tajikistan"
 msgstr "Tadžikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzanija, Združena republika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Thailand"
 msgstr "Tajska"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tonga"
 msgstr "Tongo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Trinidad And Tobago"
 msgstr "Trinidad in Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tunisia"
 msgstr "Tunizija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2318
 msgid "Turkey"
 msgstr "Turčija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Turks And Caicos Islands"
 msgstr "Otočji Turks in Caicos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2331
 msgid "Ukraine"
 msgstr "Ukrajina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "United Arab Emirates"
 msgstr "Združeni arabski emirati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: my-evolution/Locations.h:2339
 msgid "United Kingdom"
 msgstr "Velika Britanija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "United States Minor Outlying Islands"
 msgstr "Ameriški zunajležeči otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: my-evolution/Locations.h:2345
 msgid "Uruguay"
 msgstr "Urugvaj"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: 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:353
-#: my-evolution/Locations.h:2392
+#: 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:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Virgin Islands, British"
 msgstr "Britanski deviški otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Virgin Islands, U.S."
 msgstr "Ameriški deviški otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Wallis And Futuna Islands"
 msgstr "Wallisovi in Futunini otoki"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Western Sahara"
 msgstr "Zahodna sahara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: my-evolution/Locations.h:2509
 msgid "Yemen"
 msgstr "Jemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: my-evolution/Locations.h:2521
 msgid "Yugoslavia"
 msgstr "Jugoslavija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Zambia"
 msgstr "Zambija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: 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
-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
+#, fuzzy
+msgid "Card"
+msgstr "Avto"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
+msgid "Is New Card"
 msgstr ""
-"Ste prepričani, \n"
-"da želite zbrisati ta stik?"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "Zbriši stik?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
+#, fuzzy
+msgid "Writable Fields"
+msgstr "Virtualne mape"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: 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 "Urejevalnik kategorij ni na voljo."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "This contact belongs to these categories:"
 msgstr "Stik pripada sledečim kategorijam:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr "Shrani stik kot vVizitko"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Ste prepričani, \n"
+"da želite zbrisati ta stik?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Ste prepričani, \n"
+"da želite zbrisati ta stik?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nisem mogel najti gradnika za polje `%s'"
@@ -2112,29 +2615,29 @@ msgstr "Nisem mogel najti gradnika za polje `%s'"
 msgid "Contact Quick-Add"
 msgstr "Hitro dodaj stik"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr "Uredi celoto"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:333
-msgid "Full Name"
-msgstr "Polno ime"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "E-mail"
 msgstr "E-pošta"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, fuzzy, c-format
+msgid "Error saving %s: %s"
+msgstr "Napaka ob shranjevanju datoteke: %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 "vizitka.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 msgid "list"
 msgstr "seznam"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:206
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2143,140 +2646,155 @@ msgstr ""
 "%s že obstaja\n"
 "Jo želite prepisati?"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-save-as.c:210
+#, fuzzy
+msgid "Overwrite"
+msgstr "Prepiši datoteko?"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Naslov _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Preveri naslov"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Držav_a:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Naslov:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr "_Mesto:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Poštni predal:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Država/Provinca:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_Poštna številka:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Check Full Name"
 msgstr "Preveri polno ime"
 
-#: 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 "Ssq."
 
-#: 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 "Ml."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Gdč."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "G."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Ga."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Ga."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "St."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Ime:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Priimek:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Drugo ime:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "P_ripona:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Naziv:"
 
-#: 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 "_Ime seznama::"
 
-#: 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 "Člani"
 
-#: 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 "Vpišite e-poštni naslov ali potegnite skik na spodnji seznam:"
 
-#: 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 "_Skrij naslove ob pošiljanju pošte na ta seznam"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: 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 "_Odstrani"
 
-#: 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 "Urejevalnik stikov"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+#, fuzzy
+msgid "Is New List"
+msgstr "Nov seznam"
+
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:242
 msgid "Contact List Editor"
 msgstr "Urejevalnik stikov"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr "Shrani kot vVizitko"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Stiki"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Vseeno dodaj"
@@ -2322,286 +2840,301 @@ msgstr ""
 "Spremenjeno ime ali e-poštni naslov tega stika že\n"
 "obstaja v tej mapi. Ga želite vseeno dodati?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:238
+#. 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 "Napredno iskanje"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr "Iskanje"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:136
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr "ni vizitk"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:139
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr "1 vizitka"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr "%d vizitk"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:369
+#: 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 "Vsak"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 msgid "Error getting book view"
 msgstr "Napaka ob dobivanju pogleda knjige"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:313
-#: addressbook/gui/widgets/e-addressbook-view.c:902
-#: addressbook/gui/widgets/e-addressbook-view.c:1016
-#: addressbook/gui/widgets/e-addressbook-view.c:1638
-#: ui/evolution-addressbook.xml.h:22
-msgid "Save as VCard"
-msgstr "Shrani kot vVizitko"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:312
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Odpri"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:314
-#: addressbook/gui/widgets/e-addressbook-view.c:1017
-#: ui/evolution-addressbook.xml.h:13
-msgid "Forward Contact"
-msgstr "Posreduj _stik"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:315
-#: addressbook/gui/widgets/e-addressbook-view.c:1018
-msgid "Send Message to Contact"
-msgstr "Stiku pošlji sporočilo"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:316
-#: addressbook/gui/widgets/e-addressbook-view.c:1019
-#: ui/evolution-addressbook.xml.h:19 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:71
-#: ui/my-evolution.xml.h:2
-msgid "Print"
-msgstr "Natisni"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:318
-#: addressbook/gui/widgets/e-addressbook-view.c:1021
-msgid "Print Envelope"
-msgstr "Natisni kuverto"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:322
-#: addressbook/gui/widgets/e-addressbook-view.c:1025
-msgid "Copy to folder..."
-msgstr "Kopiraj v mapo..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:323
-#: addressbook/gui/widgets/e-addressbook-view.c:1026
-msgid "Move to folder..."
-msgstr "Prestavi v mapo..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:1029
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:7
-msgid "Cut"
-msgstr "Izreži"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:327
-#: addressbook/gui/widgets/e-addressbook-view.c:1030
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Kopiraj"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:328
-#: addressbook/gui/widgets/e-addressbook-view.c:1031
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-tasks.xml.h:12
-msgid "Paste"
-msgstr "Prilepi"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:1032
-#: filter/libfilter-i18n.h:10 mail/mail-accounts.c:306
-#: ui/evolution-addressbook.xml.h:10 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:22
-msgid "Delete"
-msgstr "Zbriši"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#, fuzzy
+msgid "Model"
+msgstr "Prestavi"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
-#: addressbook/gui/widgets/e-minicard.c:475
+#: 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 "Napaka ob spreminjanju vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1020
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr "Uspeh"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1945
-#: shell/e-storage.c:468 shell/evolution-shell-component.c:1057
+#: 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
+#: 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 "Neznana napaka"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Skladišče, ki ni na mreži"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:456
-#: shell/evolution-shell-component.c:1048
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr "Nimate dovoljenja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Vizitka ni bila najdena"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "ID vizitke že obstaja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protokol ni podprt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: 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:482 calendar/gui/print.c:2276
-#: camel/camel-service.c:610 camel/camel-service.c:646
+#: 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 "preklicano"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Avtentifikacija ni uspela."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Potrebna je avtentifikacija"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Mapa %s ne obstaja"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Drugačna napaka"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Želite shraniti spremembe"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:77
+#, fuzzy
+msgid "_Discard"
+msgstr "_Prikaz"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Napaka ob dodajanju seznama"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Napaka ob dodajanju vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Napaka ob spreminjanju seznama"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Napaka ob odstranjevanju seznama"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1436
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Napaka ob odstranjevanju vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
-msgid "Display Cards?"
-msgstr "Prikaži vizitke?"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:205
-msgid "Display Cards"
-msgstr "Prikaži vizitke"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-#, c-format
+#: addressbook/gui/widgets/e-addressbook-util.c:197
+#, fuzzy, c-format
 msgid ""
-"You have requested that %d cards be cards. This will cause %d new windows to "
-"be\n"
-"displayed on your screen. Do you really want to display all of these cards?"
+"Opening %d cards will open %d new windows as well.\n"
+"Do you really want to display all of these cards?"
 msgstr ""
 "Zahtevali ste prikaz %d vizitk. To bo povzročilo odprtje %d novih oken na \n"
 " vašem zaslonu. Resnično želite prikazati vse te vizitke?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:342
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr "Prestavi vizitko v"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Kopiraj vizitko v"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Prestavi vizitke v"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Kopiraj vizitke v"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:331
-msgid "* Click here to add a contact *"
-msgstr "* Kliknite tu za dodajo stika *"
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "Več vVizitk"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:335
-msgid "Primary Phone"
-msgstr "Osnovni telefon"
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "VVizitka za %s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:336
-msgid "Assistant Phone"
-msgstr "Pomožni telefon"
+#: 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 "Vrsta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:337
-msgid "Business Phone"
-msgstr "Službebni telefon"
+#: 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 "Adresar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:338
-msgid "Callback Phone"
-msgstr "Povratni telefon"
+#: 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 "Shrani kot vVizitko"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:339
-msgid "Company Phone"
-msgstr "Telefon podjetja"
+#: addressbook/gui/widgets/e-addressbook-view.c:871
+#, fuzzy
+msgid "New Contact..."
+msgstr "Nov stik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:340
-msgid "Home Phone"
-msgstr "Domač telefon"
+#: addressbook/gui/widgets/e-addressbook-view.c:872
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Nov seznam stikov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:342
-msgid "Business Address"
-msgstr "Službeni naslov"
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "Pojdi v _mapo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:343
-msgid "Home Address"
-msgstr "Domači naslov"
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "Import..."
+msgstr "_Uvozi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:344
-msgid "Mobile Phone"
-msgstr "Prenosni telefon"
+#: addressbook/gui/widgets/e-addressbook-view.c:878
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Išči po kontaktih"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:345
-msgid "Car Phone"
-msgstr "Telefon v avtu"
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "Viri _adresarja..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:348
-msgid "Business Phone 2"
-msgstr "Službeni telefon 2"
+#: addressbook/gui/widgets/e-addressbook-view.c:881
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Nastavitve pilota..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:349
-msgid "Home Phone 2"
-msgstr "Domač telefon 2"
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Posreduj _stik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:351
-msgid "Other Phone"
-msgstr "Drug telefon"
+#: addressbook/gui/widgets/e-addressbook-view.c:886
+msgid "Send Message to Contact"
+msgstr "Stiku pošlji sporočilo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:357
-msgid "Other Address"
-msgstr "Drug naslov"
+#: 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 "Natisni"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+msgid "Print Envelope"
+msgstr "Natisni kuverto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:893
+msgid "Copy to folder..."
+msgstr "Kopiraj v mapo..."
 
+#: addressbook/gui/widgets/e-addressbook-view.c:894
+msgid "Move to folder..."
+msgstr "Prestavi v mapo..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Izreži"
+
+#: 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 "Kopiraj"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
+msgid "Paste"
+msgstr "Prilepi"
+
+#: 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 "Zbriši"
+
+#: 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 "_Trenutni pogled"
+
+#. Minicard view stuff
 #. 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:580
+#: 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,ž"
 
@@ -2609,24 +3142,133 @@ 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:585
+#: 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-minicard-control.c:185
+#: addressbook/gui/widgets/e-addressbook-view.c:1339
+#, c-format
+msgid ""
+"The addressbook backend for\n"
+"%s\n"
+"has crashed. You will have to restart Evolution in order to use it again"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr "* Kliknite tu za dodajo stika *"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr "Pomožni telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr "Službeni naslov"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr "Službebni telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr "Službeni telefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr "Povratni telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr "Telefon v avtu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Telefon podjetja"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr "Domači naslov"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr "Domač telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr "Domač telefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr "Prenosni telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr "Drug naslov"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr "Drug telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr "Osnovni telefon"
+
+#: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
 msgstr "in %d drugih vizitk."
 
-#: addressbook/gui/widgets/e-minicard-control.c:187
+#: addressbook/gui/widgets/e-minicard-control.c:206
 msgid "and one other card."
 msgstr "in ena druga vizitka."
 
-#: addressbook/gui/widgets/e-minicard-control.c:316
+#: addressbook/gui/widgets/e-minicard-control.c:318
 msgid "Save in addressbook"
 msgstr "Shranite v adresarju"
 
-#: addressbook/gui/widgets/e-minicard-view.c:158
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+#, fuzzy
+msgid "Width"
+msgstr "Širina:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+#, fuzzy
+msgid "Height"
+msgstr "Višina:"
+
+#: 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 "Polje _cc"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+#, fuzzy
+msgid "Field Name"
+msgstr "Družinsko ime"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+#, fuzzy
+msgid "Text Model"
+msgstr "_Velikost besedila"
+
+#: 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 "Kolumbija"
+
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -2640,7 +3282,7 @@ msgstr ""
 "\n"
 "Če želite ustvariti nov stik, dvojno kliknite tu."
 
-#: addressbook/gui/widgets/e-minicard-view.c:161
+#: addressbook/gui/widgets/e-minicard-view.c:144
 msgid ""
 "\n"
 "\n"
@@ -2650,21 +3292,41 @@ msgstr ""
 "\n"
 "V tem pogledu ni predmetov za prikaz."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#: addressbook/gui/widgets/e-minicard-view.c:452
+#, fuzzy
+msgid "Adapter"
+msgstr "po"
+
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "Zbrisano"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Sortiranje opravil"
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Pogled vizitke"
 
-#: 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 "Tedenski pogled"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr "Natisni kuverto"
 
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1130
 msgid "Print cards"
 msgstr "Natisni vizitke"
 
-#: 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 "Natisni vizitko"
 
@@ -2737,7 +3399,6 @@ msgid "Include:"
 msgstr "Vključi:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:643
 msgid "Landscape"
 msgstr "Ležeče"
 
@@ -2757,17 +3418,16 @@ msgstr "Robovi"
 msgid "Number of columns:"
 msgstr "Število stolpcev:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr "Možnosti"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:630
 msgid "Orientation"
 msgstr "Usmerjenost"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "Stran"
 
@@ -2783,9 +3443,7 @@ msgstr "Papir"
 msgid "Paper source:"
 msgstr "Vir papirja:"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:636
 msgid "Portrait"
 msgstr "Pokončno"
 
@@ -2841,43 +3499,171 @@ msgstr "Širina:"
 msgid "_Font..."
 msgstr "_Pisava..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Neimenovan sestanek"
 
-#: calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
+#: 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:406 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
 msgid "High"
 msgstr "visoka"
 
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/calendar-model.c:1711
+#: 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:407 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
 msgstr "običajna"
 
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
+#: 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:408 mail/message-list.c:648
+#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
 msgid "Low"
 msgstr "nizka"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:518
+#: calendar/cal-util/cal-util.c:570
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:396
 msgid "Undefined"
 msgstr "ni definirana"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:835
+#: calendar/conduits/calendar/calendar-conduit.c:206
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Napaka ob komuniciranju s strežnikom koledarja"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1297
-#: calendar/conduits/calendar/calendar-conduit.c:1300
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisem mogel prebrati Pilotovega koledarja"
 
@@ -2885,80 +3671,77 @@ msgstr "Nisem mogel prebrati Pilotovega koledarja"
 msgid "Default Priority:"
 msgstr "Privzeta prioriteta:"
 
-#: 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 "Nisem mogel prebrati Pilotovega seznama opravil"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "Kontrola Bonobo, ki prikaže seznam nalog."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Kontrola Bonobo, ki prikaže koledar."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar executive summary component."
-msgstr "Evolucijina komponenta za povzetke."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolucijin pregledovalnik iTip/iMip"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Nastavitve koledarja in nalog"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution component for handling the calendar."
-msgstr "Komponenta Evolucije za urejanje koledarja."
+#: 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 "Factory for the Calendar Summary component."
-msgstr "Tovarna komponent za povzetke koledarja."
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolucijin veznik koledarja"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the Evolution Tasks control"
-msgstr "Tovarna za Evolucijino komponento nalog."
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolucijin veznik Koledarja"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the calendar iTip view control"
-msgstr "Tvoarna za orodje koledarja iTip"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolucijin veznik Koledarja"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the sample Calendar control"
-msgstr "Vzorčna tovarna za kontrolo koledarja"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolucijin pregledovalnik iTip/iMip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Tovarna za centralzacijo dialogov urejevalnika komponent koledarja."
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolucijin pregledovalnik iTip/iMip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory to create a component editor factory"
-msgstr "Tovarna za ustvarjanje tovarne komponent urejevalnika."
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolucijin veznik Koledarja"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "Storitev opozorilnega alarma"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Urejevalnik Evolucijinih novic"
 
-#: 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 "Tovarna za storitev opozorlinega alarma"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Starting:"
 msgstr "Pričetek ob:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Ending:"
 msgstr "Konec ob:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
 msgid "invalid time"
 msgstr "neveljaven čas"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:274
 msgid "Evolution Alarm"
 msgstr "Alarm Evolucije"
 
-#: 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 "Alarmi ob %s"
@@ -2980,11 +3763,17 @@ msgstr "Čas podaljška spanja (minut)"
 msgid "_Edit appointment"
 msgstr "_Uredi sestanek"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "Opis ni na voljo."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: 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 "Opozorilo"
+
+#: 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"
@@ -2996,13 +3785,7 @@ msgstr ""
 "bilo nastavljeno, da pošlje e-pošto. Evolucija bo\n"
 "prikazala običajen opozorilni dialog."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:447 mail/mail-callbacks.c:2581
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Opozorilo"
-
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3019,135 +3802,226 @@ msgstr ""
 "\n"
 "Ste prepričani, da želite pognati ta program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:889
 msgid "Do not ask me about this program again."
 msgstr "O tem programu me ne sprašuj več."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
-msgid "Could not initialize GNOME"
-msgstr "Nisem mogel inicializirati GNOMEa"
-
-#: calendar/gui/alarm-notify/notify-main.c:181
-msgid "Could not create the alarm notify service"
-msgstr "Nisem mogel ustvariti storitve alarma"
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize gnome-vfs"
+msgstr "Nisem mogel inicializirati gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:180
 msgid "Could not create the alarm notify service factory"
 msgstr "Nisem mogel ustvariti tovarne opozorilnega alrama"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Povzetek vsebuje"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Opis vsebuje"
 
-#: calendar/gui/cal-search-bar.c:58
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komentar vsebuje"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1118
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
 msgid "Unmatched"
 msgstr "Brez zadetka"
 
-#: calendar/gui/calendar-commands.c:457
+#: 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:460 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1403 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:462 calendar/gui/calendar-commands.c:467
-#: calendar/gui/calendar-commands.c:469
+#: 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:480 calendar/gui/calendar-commands.c:487
-#: calendar/gui/calendar-commands.c:493 calendar/gui/calendar-commands.c:495
+#: 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:485
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1468
+#: 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"
 
-#: calendar/gui/calendar-commands.c:834
+#: calendar/gui/calendar-commands.c:799
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nisem mogel ustvariti pogleda koledarja. Prosim preverite nastavitve ORBit-a "
 "in OAF-a."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:385
+#: 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 "Koledar"
+
+#: calendar/gui/calendar-component.c:71
+msgid "Folder containing appointments and events"
+msgstr "Mapa, ki vsebuje sestanke in dogodke"
+
+#: calendar/gui/calendar-component.c:75
+#, fuzzy
+msgid "Public Calendar"
+msgstr "URL _javnega koledarja"
+
+#: calendar/gui/calendar-component.c:76
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Mapa, ki vsebuje sestanke in dogodke"
+
+#: 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 "Naloge"
+
+#: calendar/gui/calendar-component.c:81
+msgid "Folder containing to-do items"
+msgstr "Mapa, ki vsebuje predmete za opravit"
+
+#: calendar/gui/calendar-component.c:85
+#, fuzzy
+msgid "Public Tasks"
+msgstr "Natisni naloge"
+
+#: calendar/gui/calendar-component.c:86
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Mapa, ki vsebuje predmete za opravit"
+
+#: calendar/gui/calendar-component.c:730
+msgid "New appointment"
+msgstr "Nov sestanek"
+
+#: calendar/gui/calendar-component.c:730
+msgid "_Appointment"
+msgstr "_Sestanek"
+
+#: calendar/gui/calendar-component.c:731
+msgid "Create a new appointment"
+msgstr "Ustvari nov sestanek"
+
+#: calendar/gui/calendar-component.c:735
+msgid "New meeting"
+msgstr "Nov sestanek"
+
+#: calendar/gui/calendar-component.c:735
+msgid "_Meeting"
+msgstr "_Sestanek"
+
+#: calendar/gui/calendar-component.c:736
+msgid "Create a new meeting request"
+msgstr "Ustvari nov zahtevek za sestanek"
+
+#: calendar/gui/calendar-component.c:740
+msgid "New task"
+msgstr "Nova naloga"
+
+#: calendar/gui/calendar-component.c:740
+msgid "_Task"
+msgstr "_Naloga"
+
+#: calendar/gui/calendar-component.c:741
+msgid "Create a new task"
+msgstr "Ustvari nov posel"
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Nov sestanek"
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "_Sestanek"
+
+#: calendar/gui/calendar-component.c:746
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Ustvari nov sestanek"
+
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
+#: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "osebno"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:386
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:961
+#: calendar/gui/e-calendar-table.c:373
 msgid "Confidential"
 msgstr "zaupno"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
 msgid "Public"
 msgstr "javno"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:522
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:522
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:524
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:524
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1129
+#: calendar/gui/e-calendar-table.c:445
 msgid "Free"
 msgstr "Prost"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:459
-#: calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1042
+#: 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 "Zaseden"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
+#: 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:479 calendar/gui/print.c:2267
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr "ni pričeto"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: 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:480 calendar/gui/print.c:2270
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr "v teku"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: 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:481 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2273
+#: 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 "končano"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3158,289 +4032,157 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1035
-#: mail/mail-account-gui.c:1036 mail/mail-account-gui.c:1617
-#: mail/mail-accounts.c:151 mail/mail-accounts.c:416
-#: mail/mail-config.glade.h:74
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
-#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
+#: 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 "brez"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Ponovi se"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Določena"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
-#: calendar/gui/e-meeting-model.c:821
+#: 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 "Da"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:822
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "Ne"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
-#: calendar/gui/e-week-view.c:1188
-msgid "Searching"
-msgstr "Iskanje"
-
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Dnevni pogled"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:121
 msgid "Work Week View"
 msgstr "Pogled delavnega tedna"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:124
 msgid "Week View"
 msgstr "Tedenski pogled"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:127
 msgid "Month View"
 msgstr "Mesečni pogled"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
-msgid "Calendar"
-msgstr "Koledar"
-
-#: calendar/gui/component-factory.c:65
-msgid "Folder containing appointments and events"
-msgstr "Mapa, ki vsebuje sestanke in dogodke"
-
-#: calendar/gui/component-factory.c:69 calendar/gui/print.c:1754
-#: calendar/gui/tasks-control.c:517 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Naloge"
-
-#: calendar/gui/component-factory.c:70
-msgid "Folder containing to-do items"
-msgstr "Mapa, ki vsebuje predmete za opravit"
-
-#: calendar/gui/component-factory.c:683
-msgid "New meeting"
-msgstr "Nov sestanek"
-
-#: calendar/gui/component-factory.c:683
-msgid "_Meeting"
-msgstr "_Sestanek"
-
-#: calendar/gui/component-factory.c:687
-msgid "New task"
-msgstr "Nova naloga"
-
-#: calendar/gui/component-factory.c:687 ui/evolution-tasks.xml.h:25
-msgid "_Task"
-msgstr "_Naloga"
+#: calendar/gui/comp-editor-factory.c:456
+#, fuzzy
+msgid "Error while opening the calendar"
+msgstr "Napaka ob komuniciranju s strežnikom koledarja"
 
-#: calendar/gui/component-factory.c:691
-msgid "New appointment"
-msgstr "Nov sestanek"
+#: calendar/gui/comp-editor-factory.c:467
+msgid "Method not supported when opening the calendar"
+msgstr ""
 
-#: calendar/gui/component-factory.c:691
-msgid "_Appointment"
-msgstr "_Sestanek"
+#: calendar/gui/comp-editor-factory.c:473
+#, fuzzy
+msgid "Permission denied to open the calendar"
+msgstr "Nimate dovoljenja"
 
-#: calendar/gui/control-factory.c:103
+#: calendar/gui/control-factory.c:119
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Nisem mogel odpreti imenika v '%s'"
 
-#: calendar/gui/control-factory.c:130
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
-#: calendar/gui/dialogs/alarm-options.c:359
+#: calendar/gui/control-factory.c:172
+#, fuzzy
+msgid "The type of view to show"
+msgstr "Spremeni pogled na %s"
+
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Možnosti zvočnega alarma"
 
-#: calendar/gui/dialogs/alarm-options.c:368
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "možnosti alrama sporočil"
 
-#: calendar/gui/dialogs/alarm-options.c:377
-msgid "Mail Alarm Options"
+#: calendar/gui/dialogs/alarm-options.c:438
+#, fuzzy
+msgid "Email Alarm Options"
 msgstr "Možnosti alarma pošte"
 
-#: calendar/gui/dialogs/alarm-options.c:386
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Možnosti alarma programa"
 
-#: calendar/gui/dialogs/alarm-options.c:395
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Neznane možnosti alarma"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Alarm Repeat"
 msgstr "Ponovitev alarma"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Sporočila za prikaz"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "Jedro sporočila"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "Predvajaj zvok:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "Ponovi alarm"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "Poženi program:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid ""
-"This is an email reminder, but Evolution does not yet support this kind of "
-"reminders.  You will not be able to edit the options for this reminder."
-msgstr ""
-"To je opozorilo preko elektronske pošte, ki pa ga Evolucija še ne podpira. "
-"Ne boste mogli spremeniti možnosti za to opozorilo."
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "Pošlji kot:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr "S temi argumenti:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
 msgid "days"
 msgstr "dni"
 
-#: 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
+#, fuzzy
+msgid "dialog1"
+msgstr "Kaži dialog"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:12
 msgid "extra times every"
 msgstr "dodatnih ponovitev vsakih"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
 msgid "hours"
 msgstr "ur"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11
-#: executive-summary/test-service/rdf-summary.c:806
-#: filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.c:309
-#, c-format
-msgid "%d days"
-msgstr "%d dni"
-
-#: calendar/gui/dialogs/alarm-page.c:312
-msgid "1 day"
-msgstr "1 dan"
-
-#: calendar/gui/dialogs/alarm-page.c:317
-#, c-format
-msgid "%d weeks"
-msgstr "%d tednov"
-
-#: calendar/gui/dialogs/alarm-page.c:320
-msgid "1 week"
-msgstr "1 teden"
-
-#: calendar/gui/dialogs/alarm-page.c:325
-#, c-format
-msgid "%d hours"
-msgstr "%d ur"
-
-#: calendar/gui/dialogs/alarm-page.c:328
-msgid "1 hour"
-msgstr "1 ura"
-
-#: calendar/gui/dialogs/alarm-page.c:333
-#, c-format
-msgid "%d minutes"
-msgstr "%d minut"
-
-#: calendar/gui/dialogs/alarm-page.c:336
-msgid "1 minute"
-msgstr "1 minuta"
-
-#: calendar/gui/dialogs/alarm-page.c:341
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekund"
-
-#: calendar/gui/dialogs/alarm-page.c:344
-msgid "1 second"
-msgstr "1 sekunda"
-
-#: calendar/gui/dialogs/alarm-page.c:373
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
-msgstr "Predvajaj zvok"
-
-#: calendar/gui/dialogs/alarm-page.c:377
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
-msgstr "Kaži sporočilo"
-
-#: calendar/gui/dialogs/alarm-page.c:381
-msgid "Send an email"
-msgstr "Pošlji e-pošto"
-
-#: calendar/gui/dialogs/alarm-page.c:385
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
-msgstr "Poženi program"
-
-#: calendar/gui/dialogs/alarm-page.c:391
-msgid "Unknown action to be performed"
-msgstr "Izvršena bi moralo biti neznano dejanje"
-
-#: calendar/gui/dialogs/alarm-page.c:403
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "%s %s pred pričetkom sestanka"
-
-#: calendar/gui/dialogs/alarm-page.c:406
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "%s %s po pričetku sestanka"
-
-#: calendar/gui/dialogs/alarm-page.c:411
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr "%s ob pričetku sestanka"
-
-#: calendar/gui/dialogs/alarm-page.c:420
-#, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "%s %s pred koncem sestanka"
-
-#: calendar/gui/dialogs/alarm-page.c:423
-#, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "%s %s po koncu sestanka"
-
-#: calendar/gui/dialogs/alarm-page.c:428
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr "%s na koncu sestanka"
-
-#: calendar/gui/dialogs/alarm-page.c:452
-#, c-format
-msgid "%s at %s"
-msgstr "%s ob %s"
-
-#: calendar/gui/dialogs/alarm-page.c:458
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr "%s za neznano vrsto sprožilca"
-
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3451,46 +4193,63 @@ msgstr "Osnove"
 msgid "Date/Time:"
 msgstr "Datum/ura:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "Kaži sporočilo"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "Predvajaj zvok"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Opomnilniki"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "Poženi program"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "Pošlji e-pošto"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:758 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 "Povzetek:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_Možnosti..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "po"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "pred"
 
-#: 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 "dni"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "konec sestanka"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "ur"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:160
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
 msgid "minute(s)"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "pričetek sestanka"
 
@@ -3514,32 +4273,35 @@ msgstr "30 minut"
 msgid "60 minutes"
 msgstr "60 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
+#, fuzzy
+msgid "Alerts"
+msgstr "Alberta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Nastavitve koledarja in nalog"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Barva za opravila, katerim je rok že pretekel"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Barva za opravila, ki so na vrsti danes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "Ustvari nove sestanke s privzetim _opomnilnikom"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Days"
-msgstr "Dni"
+#, fuzzy
+msgid "Day _ends:"
+msgstr "Konec dneva:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "Prvi dan ted_na:"
+msgid "Days"
+msgstr "Dni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr "petek"
 
@@ -3552,275 +4314,321 @@ msgid "Minutes"
 msgstr "Minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr "ponedeljek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "Naloge s p_rekoračenim rokom"
+#, fuzzy
+msgid "S_un"
+msgstr "_ned"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr "sobota"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
-msgstr "Kaži čase _koncev sestankov v tedenskih in mesečnih pogledih"
+msgid "Sh_ow a reminder"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Kaži številke tednov v navigatorju po dnevih"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Sta_rt of day:"
-msgstr "Zače_tek dneva:"
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
+msgid "Sunday"
+msgstr "nedeljo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Su_n"
-msgstr "_ned"
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Nalo_ge z današnjim rokom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Sunday"
-msgstr "nedeljo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "T_hu"
 msgstr "č_et"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "T_ue"
-msgstr "_tor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "Nalo_ge z današnjim rokom"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "Seznam _nalog"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:962
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr "četrtek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Čas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Časovni _pas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Časovne _delitve:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Oblika izpisa časa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:960
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr "torek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:961
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr "sreda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Delavni teden"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 urna (dop./pop.)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 urna"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Vprašaj za potrditev ob brisanju predmetov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "_Skrči vikende v mesečnem pogledu"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "Konec dneva:"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Prikaz"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "_End of day:"
-msgstr "_Konec dneva:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Fri"
 msgstr "_pet"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "_Splošno"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "_Skrij opravljene naloge po"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "po_n"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Drugo"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "Naloge s p_rekoračenim rokom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "so_b"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "_Show appointment end times in week and month views"
+msgstr "Kaži čase _koncev sestankov v tedenskih in mesečnih pogledih"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "Seznam _nalog"
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Časovne _delitve:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "_tor"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "_sre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "before the start of the appointment"
-msgstr "pred pričetkom sestanka"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
+msgstr "pred koncem sestanka"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "Stanje sestanka se je spremenilo. Pošlji posodobljeno različico?"
+#: 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:57
+#: calendar/gui/dialogs/cancel-comp.c:61
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Ste prepričani, da želite preklicati in zbrisati ta sestanek?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: 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:70
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Ste prepričani, da želite preklicati in zbrisati to opravilo?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: 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:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Ste prepričani, da želite preklicati in zbrisati ta dnevniški vpis?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Ta dogodek je bil zbrisan."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "To opravilo je bilo zbrisano."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Ta dnevniški vpis je bil zbrisan."
 
-#: 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  Naredili ste spremembe. Prekliči spremembe in zapri urejevalnik?"
 
-#: 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  Ničesar niste spremenili, zapri urejevalnik?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Ta dogodek je bil spremenjen."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Ta posel je bil spremenjen."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Ta dnevniški vpis je bil spremenjen."
 
-#: 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  Naredili ste spremembe. Pozabi spremembe in posodobi urejevalnik?"
 
-#: 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 Ničesar niste spremenili, posodobi urejevalnik?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2185
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Neznana napaka: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr " do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2189
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2230
 msgid " (Completed "
 msgstr " (Končano "
 
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2191
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2232
 msgid "Completed "
 msgstr "končano "
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2196
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2237
 msgid " (Due "
 msgstr " (Rok "
 
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2198
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2239
 msgid "Due "
 msgstr "Rok"
 
-#: calendar/gui/dialogs/comp-editor.c:321
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:328
+#, fuzzy
+msgid "Could not update invalid object"
 msgstr "Nisem mogel posodobiti predmeta!"
 
-#: calendar/gui/dialogs/comp-editor.c:692
+#: calendar/gui/dialogs/comp-editor.c:331
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:334
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:337
+#, fuzzy
+msgid "Could not update object"
+msgstr "Nisem mogel posodobiti predmeta!"
+
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Uredi sestake"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sestanek - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:700
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "Naloga - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Vpis v dnevniku - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "Ni povzetka"
 
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2234
-#: mail/mail-display.c:113
-msgid "Overwrite file?"
-msgstr "Prepiši datoteko?"
+#: 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 "Shrani kot..."
 
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2241
-#: mail/mail-display.c:117
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+#: 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 ""
-"Datoteka z enakim imenom že obstaja.\n"
-"Naj jo prepišem?"
-
-#: calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Shrani kot..."
 
-#: calendar/gui/dialogs/comp-editor.c:1277
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr "Ne morem dobiti trenutne različice!"
 
@@ -3878,87 +4686,100 @@ msgstr "Delegirano komu:"
 msgid "Enter Delegate"
 msgstr "Vnesi delegata"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2224
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2265
 msgid "Appointment"
 msgstr "Sestanek"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Opomnilnik"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Ponovitev"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:434
 msgid "Scheduling"
 msgstr "Načrtovanje časa"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: 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 "Sestanek"
 
-#: 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 "Datum pričetka"
+
+#: 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 "_Čas pričetka:"
+
+#: 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 "_Celodnevni dogodek"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "_Zaseden"
 
-#: 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 "Uvrstitev"
 
-#: 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 "_Zaupno"
 
-#: 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 "Datum in ura"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "P_rost"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr "_Lega:"
 
-#: 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_vatno"
 
-#: 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 "_Javno"
 
-#: 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 "Kaži čas kot"
 
-#: 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 "_Povzetek:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Stiki..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "_Čas konca:"
@@ -3968,6 +4789,10 @@ msgid "_Start time:"
 msgstr "_Čas pričetka:"
 
 #: 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 "Potreben je organizator."
 
@@ -3975,11 +4800,11 @@ msgstr "Potreben je organizator."
 msgid "At least one attendee is required."
 msgstr "Potreben je vsaj en udeleženec."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr "Ta oseba se je že udeleženec sestanka!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr "_Delegiraj komu..."
 
@@ -4019,30 +4844,18 @@ msgid "Member"
 msgstr "Član"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:853
+#: 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 "Vloga"
-
 #: 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:51
-#: mail/message-list.etspec.h:11
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stanje"
 
-#: 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 mail/mail-config.glade.h:118
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr "Vrsta"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4053,35 +4866,87 @@ msgid "_Change Organizer"
 msgstr "_Spremeni organizatorja"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:425
 msgid "_Invite Others..."
 msgstr "_Povabi ostale..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_Drug organizator"
+#: 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 "Wallisovi in Futunini otoki"
+
+#: calendar/gui/dialogs/recur-comp.c:77
+#, fuzzy
+msgid "All Instances"
+msgstr "Vse _postaje:"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ta sestanek vsebuje ponovitve, ki jih Evolucija ne zna urejati."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:806
+#, fuzzy
+msgid "Recurrence date is invalid"
+msgstr "Čas ni veljaven"
+
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:977
+msgid "first"
+msgstr "prvi"
+
+#: calendar/gui/dialogs/recurrence-page.c:978
+msgid "second"
+msgstr "sekunda"
+
+#: calendar/gui/dialogs/recurrence-page.c:979
+#, fuzzy
+msgid "third"
+msgstr "ta"
+
+#: calendar/gui/dialogs/recurrence-page.c:980
+#, fuzzy
+msgid "fourth"
+msgstr "sever"
+
+#: calendar/gui/dialogs/recurrence-page.c:981
+#, fuzzy
+msgid "last"
+msgstr "seznam"
+
+#: calendar/gui/dialogs/recurrence-page.c:1004
+#, fuzzy
+msgid "Other Date"
+msgstr "Drugi faks"
+
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "dan"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:1096
-msgid "th"
-msgstr "4."
-
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr "pojavitve"
 
@@ -4145,23 +5010,28 @@ msgstr "tednov"
 msgid "year(s)"
 msgstr "let"
 
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has been created. Send it?"
 msgstr "Podatki o sestanku so bili ustvarjeni. Naj jih pošljem?"
 
-#: 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 ""
 "Podatki o sestanku so se spremenili. Naj pošljem posodobljeno različico?"
 
-#: 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 "Podatki o nalogi so bili ustvarjeni. Naj jih pošljem?"
 
-#: 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 "Podatki o nalogi so se spremenili. Naj pošljem posodobljeno različico?"
 
+#: calendar/gui/dialogs/task-details-page.c:397
+#, fuzzy
+msgid "Completed date is wrong"
+msgstr "končano "
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -4177,7 +5047,7 @@ msgid "Progress"
 msgstr "Napredek"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:755
+#: my-evolution/e-summary-preferences.c:633
 msgid "URL:"
 msgstr "URL:"
 
@@ -4189,15 +5059,23 @@ msgstr "_Prioriteta:"
 msgid "_Status:"
 msgstr "_Stanje:"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:325
+#: calendar/gui/dialogs/task-editor.c:189
+msgid "Basic"
+msgstr "Osnovno"
+
+#: calendar/gui/dialogs/task-editor.c:203
+#: calendar/gui/dialogs/task-editor.c:251
+#: calendar/gui/dialogs/task-editor.c:385
 msgid "Assignment"
 msgstr "Dodelitev"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:801
+#: 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:39
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Opis:"
 
@@ -4205,119 +5083,236 @@ msgstr "Opis:"
 msgid "Sta_rt Date:"
 msgstr "Datum _pričetka:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Stiki..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Do datuma:"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d dni"
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "1 dan"
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d tednov"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 teden"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d ur"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 ura"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d minut"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 minuta"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekund"
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "1 sekunda"
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "Pošlji e-pošto"
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr "Izvršena bi moralo biti neznano dejanje"
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s pred pričetkom sestanka"
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s po pričetku sestanka"
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s ob pričetku sestanka"
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s pred koncem sestanka"
+
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s po koncu sestanka"
+
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s na koncu sestanka"
+
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr "%s ob %s"
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s za neznano vrsto sprožilca"
+
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:418
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:419
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:420
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:421
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:422
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:436
+#: calendar/gui/e-calendar-table.c:423
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/e-calendar-table.c:424
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:438
+#: calendar/gui/e-calendar-table.c:425
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
-#: calendar/gui/e-week-view.c:1828
+#: 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 "Brišem izbrane predmete"
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3546
-#: calendar/gui/e-week-view.c:3433 mail/folder-browser.c:1463
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:41
+#: 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 "_Odpri"
 
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3442 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:951
+#, fuzzy
+msgid "_Save as..."
+msgstr "Shrani kot..."
+
+#: 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 "Na_tisni..."
+
+#: 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 "_Izreži"
 
-#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3557
-#: calendar/gui/e-week-view.c:3444 ui/evolution-addressbook.xml.h:36
-#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
-#: ui/evolution-tasks.xml.h:19
+#: 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 "_Kopiraj"
 
-#: calendar/gui/e-calendar-table.c:968 calendar/gui/e-day-view.c:3532
-#: calendar/gui/e-day-view.c:3559 calendar/gui/e-week-view.c:3420
-#: calendar/gui/e-week-view.c:3446 ui/evolution-addressbook.xml.h:42
-#: ui/evolution-calendar.xml.h:41 ui/evolution-mail-list.xml.h:29
-#: ui/evolution-tasks.xml.h:23
+#: 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 "_Prilepi"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:962
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Dodeli nalogo"
+
+#: calendar/gui/e-calendar-table.c:963
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Posreduj naprej kot i_Koledar"
+
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "_Označi kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:975
-msgid "_Delete this Task"
-msgstr "_Zbriši to opravilo"
-
-#: calendar/gui/e-calendar-table.c:978
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:965
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "_Označi opravila kot opravljena"
 
-#: calendar/gui/e-calendar-table.c:980
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "_Zbriši izbrana opravila"
 
-#: calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7140
-#: calendar/gui/e-week-view.c:3930
+#: 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 "Posodabljam predmete"
 
-#: calendar/gui/e-calendar-table.c:1247
+#: calendar/gui/e-calendar-table.c:1327
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kliknite tu za dodajanje opravila"
@@ -4326,8 +5321,8 @@ msgstr "Kliknite tu za dodajanje opravila"
 msgid "Alarms"
 msgstr "Alarmi"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:924
-#: camel/camel-filter-driver.c:1026
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Končano"
 
@@ -4355,11 +5350,9 @@ msgstr "Prioriteta"
 msgid "Start Date"
 msgstr "Datum pričetka"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:44 shell/e-shell.c:661
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
+#: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Povzetek"
 
@@ -4367,19 +5360,15 @@ msgstr "Povzetek"
 msgid "Task sort"
 msgstr "Sortiranje opravil"
 
-#: 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:163
-#: e-util/e-time-utils.c:357
+#: 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:158
-#: e-util/e-time-utils.c:366
+#: 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"
 
@@ -4394,121 +5383,219 @@ 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 deljenj 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:284 calendar/gui/e-day-view.c:1389
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1484
+#: 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:1416
-#: 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:614 calendar/gui/e-week-view.c:350
-#: 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 "dop"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
-#: 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 "pop"
 
-#: calendar/gui/e-day-view.c:3525
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "Nov _sestanek"
 
-#: calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3415
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _dogodek"
 
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3425
-#: ui/evolution-calendar.xml.h:19
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
+#, fuzzy
+msgid "New Meeting"
+msgstr "Nov sestanek"
+
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
+#, fuzzy
+msgid "New Task"
+msgstr "Nova _naloga"
+
+#: calendar/gui/e-day-view.c:3673 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Natisni..."
+
+#: 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 "Pojdi na _danes"
 
-#: calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3427
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
 msgid "_Go to Date..."
 msgstr "_Pojdi na datum..."
 
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3435
-msgid "_Delete this Appointment"
-msgstr "_Zbriši ta sestanek"
+#: 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 "_Objavi podatek o zasedenosti"
+
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Nastavitve pošte..."
 
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3460
+#: 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 "_Shrani kot..."
+
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "_Načrtuj sestanek"
+
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "Posreduj naprej kot i_Koledar"
+
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
 msgid "Make this Occurrence _Movable"
 msgstr "Naredi to pojavitev _prestavljivo"
 
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3462
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
 msgid "Delete this _Occurrence"
 msgstr "Zbriši to _pojavitev"
 
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3464
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
 msgid "Delete _All Occurrences"
 msgstr "Zbriši _vse pojavitve"
 
-#: calendar/gui/e-itip-control.c:545
-msgid "Meeting begins: <b>"
-msgstr "Čas pričetka sestanka: <b>"
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Yes. (Complex Recurrence)"
+msgstr "_Enostavna ponovitev"
+
+#: calendar/gui/e-itip-control.c:716
+#, fuzzy
+msgid "Every day"
+msgstr "Vsak "
+
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "Every %d days"
+msgstr "%d dni"
+
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Every week"
+msgstr "Vsak "
+
+#: calendar/gui/e-itip-control.c:726
+#, fuzzy, c-format
+msgid "Every %d weeks"
+msgstr "%d tednov"
+
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Every week on "
+msgstr "Vsak "
+
+#: calendar/gui/e-itip-control.c:731
+#, fuzzy, c-format
+msgid "Every %d weeks on "
+msgstr "%d tednov"
+
+#: calendar/gui/e-itip-control.c:739
+#, fuzzy
+msgid " and "
+msgstr "Pesek"
+
+#: 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 "En _mesec"
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Task begins: <b>"
-msgstr "Čas pričetka opravila: <b>"
+#: calendar/gui/e-itip-control.c:769
+#, c-format
+msgid "every %d months"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:555
-msgid "Free/Busy info begins: <b>"
-msgstr "Podatki o zasedenosti se pričnejo: <b>"
+#: calendar/gui/e-itip-control.c:775
+#, fuzzy
+msgid "Every year"
+msgstr "Vsak "
 
-#: calendar/gui/e-itip-control.c:559
-msgid "Begins: <b>"
-msgstr "Pričetek: <b>"
+#: calendar/gui/e-itip-control.c:777
+#, fuzzy, c-format
+msgid "Every %d years"
+msgstr "Vsak "
 
-#: calendar/gui/e-itip-control.c:571
-msgid "Meeting ends: <b>"
-msgstr "Čas zaključka sestanka: <b>"
+#: calendar/gui/e-itip-control.c:789
+#, c-format
+msgid " a total of %d times"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:574
-msgid "Free/Busy info ends: <b>"
-msgstr "Podatki o zasedenosti se končajo: <b>"
+#: calendar/gui/e-itip-control.c:797
+msgid ", ending on "
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:578
-msgid "Ends: <b>"
+#: calendar/gui/e-itip-control.c:821
+msgid "<b>Starts:</b> "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:831
+#, fuzzy
+msgid "<b>Ends:</b> "
 msgstr "Konec: <b>"
 
-#: calendar/gui/e-itip-control.c:592
-msgid "Task Completed: <b>"
-msgstr "Opravilo končano: <b>"
+#: calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "<b>Completed:</b> "
+msgstr "končano "
 
-#: calendar/gui/e-itip-control.c:602
-msgid "Task Due: <b>"
-msgstr "Rok opravila: <b>"
+#: calendar/gui/e-itip-control.c:861
+msgid "<b>Due:</b> "
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:639 calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 msgid "iCalendar Information"
 msgstr "Podatki o iKoledarju"
 
 #. Title
-#: calendar/gui/e-itip-control.c:654
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr "Napaka iKoledarja"
 
-#: calendar/gui/e-itip-control.c:719 calendar/gui/e-itip-control.c:735
+#: 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 "neznana oseba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -4516,297 +5603,345 @@ msgstr ""
 "<br> Prosimo, preglejte sledeče podatke in izberite dejanje iz spodnjega "
 "menuja."
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Nič</i>"
 
-#: calendar/gui/e-itip-control.c:770
+#: calendar/gui/e-itip-control.c:1059
+#, fuzzy
+msgid "Location:"
+msgstr "_Lega:"
+
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr "Stanje:"
 
-#: calendar/gui/e-itip-control.c:775 calendar/gui/e-meeting-model.c:318
-#: calendar/gui/e-meeting-model.c:341 calendar/gui/e-meeting-model.c:835
-#: calendar/gui/itip-utils.c:323
+#: 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 "Sprejeto"
 
-#: calendar/gui/e-itip-control.c:779 calendar/gui/itip-utils.c:326
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Poskusno sprejeto"
 
-#: calendar/gui/e-itip-control.c:783 calendar/gui/e-meeting-model.c:320
-#: calendar/gui/e-meeting-model.c:343 calendar/gui/e-meeting-model.c:836
-#: calendar/gui/itip-utils.c:329 calendar/gui/itip-utils.c:355
+#: 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 "Zavrnjeno"
 
-#: calendar/gui/e-itip-control.c:787 calendar/gui/e-itip-control.c:986
-#: calendar/gui/e-itip-control.c:1057 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:289 calendar/gui/e-meeting-model.c:354
-#: calendar/gui/e-meeting-model.c:793 calendar/gui/e-meeting-model.c:809
-#: camel/providers/smtp/camel-smtp-transport.c:180
-#: camel/providers/smtp/camel-smtp-transport.c:235 mail/folder-browser.c:317
-#: mail/mail-display.c:817 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:442
+#: 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 "neznano"
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:849
-#: calendar/gui/e-itip-control.c:865 calendar/gui/e-itip-control.c:878
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.c:904
+#: 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 "Izberi dejanje:"
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Posodobi"
 
-#: calendar/gui/e-itip-control.c:835 calendar/gui/e-itip-control.c:854
-#: calendar/gui/e-itip-control.c:867 calendar/gui/e-itip-control.c:880
-#: calendar/gui/e-itip-control.c:893 calendar/gui/e-itip-control.c:906
-#: shell/e-shell.c:1935 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 "V redu"
 
-#: calendar/gui/e-itip-control.c:850
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr "Sprejmi"
 
-#: calendar/gui/e-itip-control.c:851
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Poskusno sprejmi"
 
-#: calendar/gui/e-itip-control.c:852
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Odbij"
 
-#: calendar/gui/e-itip-control.c:866
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Pošlji podatek o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:879
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Osveži stanje respondenta"
 
-#: calendar/gui/e-itip-control.c:892
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Pošlji zadnje podatke"
 
-#: calendar/gui/e-itip-control.c:905 calendar/gui/itip-utils.c:343
-#: 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 "Prekliči"
 
-#: calendar/gui/e-itip-control.c:953
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> je izdal(a) podatke o sestanku."
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Podatki o sestanku"
 
-#: calendar/gui/e-itip-control.c:958
+#: 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> zahteva vašo prisotnost na sestanku."
+
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> zahteva vašo prisotnost na sestanku."
 
-#: calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Predlog sestanka"
 
-#: calendar/gui/e-itip-control.c:963
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> vas želi dodati k obstoječem sestanku."
 
-#: calendar/gui/e-itip-control.c:964
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Posodobitev sestanka"
 
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> želi dobiti najnovejše podatke o sestanku."
 
-#: calendar/gui/e-itip-control.c:969
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "Zahtevek za posodobitev sestanka"
 
-#: calendar/gui/e-itip-control.c:992
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> je odgovoril(a) na zahtevek po sestanku."
 
-#: calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Odgovor na sestanek"
 
-#: calendar/gui/e-itip-control.c:997
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> je preklical(a) sestanek."
 
-#: calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Preklic sestanka"
 
-#: calendar/gui/e-itip-control.c:1002 calendar/gui/e-itip-control.c:1073
-#: calendar/gui/e-itip-control.c:1108
+#: 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> je poslal(a) nerazumljivo sporočilo."
 
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Nerazumljivo sporočilo o sestanku"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> je objavil(a) podatke o nalogi."
 
-#: calendar/gui/e-itip-control.c:1024
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Podatki o nalogi"
 
-#: calendar/gui/e-itip-control.c:1028
+#: calendar/gui/e-itip-control.c:1393
+#, fuzzy, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> zahteva, da opravite nalogo."
+
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> zahteva, da opravite nalogo."
 
-#: calendar/gui/e-itip-control.c:1029
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Predlog naloge"
 
-#: calendar/gui/e-itip-control.c:1033
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> vas želi dodati k obstoječi nalogi."
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Posodobitev naloge"
 
-#: calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> želi dobiti najnovejše podatke o nalogi."
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Zahtevek za posodobitev naloge"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> je odgovoril(a) na dodelitev naloge."
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Odgovor na nalogo"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> je preklical(a) nalogo."
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Preklic naloge"
 
-#: calendar/gui/e-itip-control.c:1074
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Nerazumljivo sporočilo o nalogi"
 
-#: calendar/gui/e-itip-control.c:1093
+#: calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> je objavil(a) podatke o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Podatek o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1098
+#: calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> zahteva vaše podatke o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Zahtevek po podatkih o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> je odgovoril(a) na zahtevek po podatkih o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Odgovor zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Nerazumljivo sporočilo o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1541
 msgid "The message does not appear to be properly formed"
 msgstr "Zdi se, da sporočilo ni pravilno oblikovano"
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "To sporočilo vsebuje le nepodprte zahtevke."
 
-#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1235
+#: 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 "Priloga ne vsebuje veljavnega sporočila koledarja"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "Priloga nima gledljivih predmetov koledarja"
 
-#: calendar/gui/e-itip-control.c:1338
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr "Ne morem najti nobene od vaših identitet v seznamu udeležencev!\n"
+#: 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:1369
-msgid "Calendar file could not be updated!\n"
-msgstr "Datoteke koledarja ni bilo mogoče posodobiti!\n"
+#: 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 "Napaka ob prenašanju podatkov za"
+
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:2005
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Predmeta ni bilo mogoče poslati!\n"
 
-#: calendar/gui/e-itip-control.c:1371
+#: 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:1919
 msgid "Update complete\n"
 msgstr "Posodobitev končana\n"
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1922
+msgid "Calendar file could not be updated!\n"
+msgstr "Datoteke koledarja ni bilo mogoče posodobiti!\n"
+
+#: 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 "Stanja udeleženca ni bilo možno posodobiti, ker predmet ne obstaja več"
+
+#: 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:1984
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Stanja udeleženca ni bilo možno posodobiti zaradi neveljavnega stanja!\n"
 
-#: calendar/gui/e-itip-control.c:1424
-msgid "Attendee status could not be updated!\n"
-msgstr "Stanja udeleženca ni bilo možno posodobiti!\n"
+#: 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:1426
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Stanje udeleženca posodobljeno\n"
 
-#: calendar/gui/e-itip-control.c:1428
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Stanja udeleženca ni bilo možno posodobiti, ker predmet ne obstaja več"
+#: calendar/gui/e-itip-control.c:2014
+msgid "Attendee status could not be updated!\n"
+msgstr "Stanja udeleženca ni bilo možno posodobiti!\n"
 
-#: calendar/gui/e-itip-control.c:1456
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Odstranjevanje končano"
 
-#: calendar/gui/e-itip-control.c:1486 calendar/gui/e-itip-control.c:1536
+#: calendar/gui/e-itip-control.c:2079 calendar/gui/e-itip-control.c:2129
 msgid "Item sent!\n"
 msgstr "Predmet poslan!\n"
 
-#: calendar/gui/e-itip-control.c:1488 calendar/gui/e-itip-control.c:1540
+#: calendar/gui/e-itip-control.c:2081 calendar/gui/e-itip-control.c:2133
 msgid "The item could not be sent!\n"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
+#: calendar/gui/e-itip-control.c:2206
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Izberi mapo"
+
+#: calendar/gui/e-itip-control.c:2213
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Izberi mapo"
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -4844,201 +5979,253 @@ msgstr "končni-datum"
 msgid "date-start"
 msgstr "začetni-datum"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr "Predsedujoči"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
 msgid "Required Participants"
 msgstr "Potrebni udeleženci"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr "Možni udeleženci"
 
-#: calendar/gui/e-meeting-model.c:84
-msgid "Non-Participants"
-msgstr "Ne-udeleženci"
+#: calendar/gui/e-meeting-model.c:83
+#, fuzzy
+msgid "Resources"
+msgstr "Vir"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533 calendar/gui/e-meeting-model.c:789
+#: 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 "Individualno"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
+#: calendar/gui/e-meeting-model.c:807
 msgid "Group"
 msgstr "Skupina"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:791
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
+#: calendar/gui/e-meeting-model.c:808
 msgid "Resource"
 msgstr "Vir"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:792
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
+#: calendar/gui/e-meeting-model.c:809
 msgid "Room"
 msgstr "Soba"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
-#: calendar/gui/e-meeting-model.c:805
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:822
 msgid "Chair"
 msgstr "Stol"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535 calendar/gui/e-meeting-model.c:806
+#: 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 "Potrebni udeleženci"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:807
+#: 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 "Možni sodelujoči"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:808
+#: 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 "Ne-sodelujoči"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543 calendar/gui/e-meeting-model.c:834
+#: 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 "Potrebuje dejanje"
 
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-model.c:837 calendar/gui/e-meeting-time-sel.c:434
+#: 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 "Poskusno"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
-#: calendar/gui/e-meeting-model.c:838
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
+#: calendar/gui/e-meeting-model.c:855
 msgid "Delegated"
 msgstr "Delegirano"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
 msgid "In Process"
 msgstr "V obdelavi"
 
 #. 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:2088
+#: 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:2118 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
+#: 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:221
-#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1612
+#: 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:436
+#: calendar/gui/e-meeting-time-sel.c:408 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Iz pisarne"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Ni podatkov"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Možnosti"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Kaži le delavne ure"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Kaži poman_jšano"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "_Posodobi prosto/zasedeno"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:517
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:534
 msgid "_Autopick"
 msgstr "_Samodeno izberi"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:567
 msgid "_All People and Resources"
 msgstr "_Vsi ljudje in vsa sredstva"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Vsi ljudje in eno sredstvo"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "_Potrebni ljudje"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Potrebni ljudje in eno sredstvo"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Čas pričetka sestanka:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Čas zaključka sestanka:"
 
-#: calendar/gui/e-tasks.c:351
+#: 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 "Odpiram naloge v %s"
 
-#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nisem mogel naložiti nalog v `%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 "Postopek potreben za naložitev `%s' ni podprt"
 
-#: calendar/gui/e-tasks.c:643
+#: 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 "Nisem mogel odpreti imenika v `%s'"
+
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
+#, fuzzy, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr ""
+"Napaka ob '%s':\n"
+"%s"
+
+#: calendar/gui/e-tasks.c:554
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Datum zaključka"
+
+#: calendar/gui/e-tasks.c:577
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Brišem izbrane predmete"
+
+#: calendar/gui/e-tasks.c:672
 msgid "Expunging"
 msgstr "Uničujem"
 
-#: calendar/gui/e-week-view.c:3413 calendar/gui/e-week-view.c:3451
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Nov _sestanek..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/gnome-cal.c:1503
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nisem mogel odpreti imenika v `%s'"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1517
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Postopek potreben za naložitev `%s' ni podprt"
 
-#: calendar/gui/gnome-cal.c:1872
+#: calendar/gui/gnome-cal.c:1563
+#, fuzzy, c-format
+msgid "Adding alarms for %s"
+msgstr "Alarmi ob %s"
+
+#: calendar/gui/gnome-cal.c:1755
+#, c-format
+msgid ""
+"The calendar backend for\n"
+"%s\n"
+" has crashed. You will have to restart Evolution in order to use it again"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1764
+#, c-format
+msgid ""
+"The task backend for\n"
+"%s\n"
+" has crashed. You will have to restart Evolution in order to use it again"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Odpiram koledar v %s"
 
+#: calendar/gui/gnome-cal.c:2035
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Odpiram mapo %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "april"
@@ -5095,303 +6282,173 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/itip-utils.c:220
-msgid "At least one attendee is necessary"
-msgstr "Potreben je vsaj en udeleženec"
-
-#: calendar/gui/itip-utils.c:251
+#: 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 "Organizator mora biti naveden."
 
-#: calendar/gui/itip-utils.c:295
+#: calendar/gui/itip-utils.c:298
+msgid "At least one attendee is necessary"
+msgstr "Potreben je vsaj en udeleženec"
+
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 msgid "Event information"
 msgstr "Podatki o dogodku"
 
-#: calendar/gui/itip-utils.c:297
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 msgid "Task information"
 msgstr "Podatki o nalogi"
 
-#: calendar/gui/itip-utils.c:299
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Journal information"
 msgstr "Podatki o dnevniku"
 
-#: calendar/gui/itip-utils.c:301
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 msgid "Free/Busy information"
 msgstr "Podatki o zasedenosti"
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Podatki o kodledarju"
 
-#: calendar/gui/itip-utils.c:339
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr "Posodobljen"
 
-#: calendar/gui/itip-utils.c:347
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr "Osveži"
 
-#: calendar/gui/itip-utils.c:351
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr "Proti-predlog"
 
-#: calendar/gui/itip-utils.c:617
-msgid "You must be an attendee of the event."
-msgstr "Biti morate udeleženec dogodka."
-
-#: calendar/gui/main.c:91
-msgid "Could not create the component editor factory"
-msgstr "Nisem mogel ustvariti tovarne komponent urejevalnikov"
-
-#: 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/itip-utils.c:513
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Podatki o zasedenosti (%s do %s)"
 
-#: calendar/gui/print.c:461
-msgid "30th"
-msgstr "30."
+#: calendar/gui/itip-utils.c:525
+msgid "iCalendar information"
+msgstr "Podatki o iKodledarju"
 
-#: calendar/gui/print.c:462
-msgid "31st"
-msgstr "31."
+#: calendar/gui/itip-utils.c:669
+msgid "You must be an attendee of the event."
+msgstr "Biti morate udeleženec dogodka."
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr "ne"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "po"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "to"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "sr"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "če"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "pe"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "so"
 
 #. Day
-#: calendar/gui/print.c:1840
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Izbrann dan (%b %a %d %Y)"
 
-#: calendar/gui/print.c:1865 calendar/gui/print.c:1869
+#: calendar/gui/print.c:1910 calendar/gui/print.c:1914
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1866
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1870 calendar/gui/print.c:1872
-#: calendar/gui/print.c:1873
+#: 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:1877
+#: calendar/gui/print.c:1922
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Izbran teden (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1885
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr "Izbran mesec (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr "Izbrano leto (%Y)"
 
-#: calendar/gui/print.c:2226
+#: calendar/gui/print.c:2267
 msgid "Task"
 msgstr "Naloga"
 
-#: calendar/gui/print.c:2283
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
-#: calendar/gui/print.c:2301
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteta: %s"
 
-#: calendar/gui/print.c:2315
+#: calendar/gui/print.c:2358
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procentov opravljeno: %i"
 
-#: calendar/gui/print.c:2327
+#: calendar/gui/print.c:2370
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2384
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: calendar/gui/print.c:2352
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr "Stiki: "
 
-#: calendar/gui/print.c:2407
-msgid "Print Calendar"
-msgstr "Natisni koledar"
-
-#: calendar/gui/print.c:2498 calendar/gui/print.c:2590
-#: calendar/gui/tasks-control.c:598 mail/mail-callbacks.c:2890
-#: my-evolution/e-summary.c:605 ui/evolution-addressbook.xml.h:20
-#: ui/evolution-mail-message.xml.h:72
+#: 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 "Predogled tiskanja"
 
-#: calendar/gui/print.c:2527
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "Natisni predmet"
 
-#: calendar/gui/print.c:2608
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "Nastavitev tiskanja"
 
-#: calendar/gui/tasks-control-factory.c:75
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Nisem mogel ustvariti pogleda nalog. Prosim preverite nastavitve ORBit-a in "
-"OAF-a."
-
 #: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr "URI mape nalog, ki naj se kaže"
 
-#: calendar/gui/tasks-control.c:455
+#: 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"
@@ -5403,142 +6460,142 @@ msgstr ""
 " \n"
 "Resnično zbriši te naloge? "
 
-#: calendar/gui/tasks-control.c:462 mail/mail-callbacks.c:2367
-#: mail/mail-callbacks.c:2595
+#: calendar/gui/tasks-control.c:479
 msgid "Do not ask me again."
 msgstr "Ne sprašuj me več."
 
-#: calendar/gui/tasks-control.c:627
+#: calendar/gui/tasks-control.c:615
 msgid "Print Tasks"
 msgstr "Natisni naloge"
 
-#: 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 ""
-"Evolucija je vzela naloge, ki so bile v vaši mapi koledarja in jih samodejno "
-"prenesla v novo mapo nalog."
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:388
+msgid "SMTWTFS"
+msgstr "NPTSČPS"
 
-#: 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 ""
-"Evolucija je poskušala vzeti vse naloge, ki so bile v vaši mapi koledarja in "
-"jih prenesti v novo mapo nalog.\n"
-"Nekaterih nalog ni bilo mogoče prenesti, zato bo ta proces v prihodnosti še "
-"ponovljen."
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Evolucijin veznik koledarja"
 
-#: 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 ""
-"Ne morem odpreti `%s'; noben predmet iz mape koledarja ne bo prenešen v mapo "
-"nalog."
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Evolucijin veznik koledarja"
 
-#: 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."
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Evolucijin veznik koledarja"
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Sporočilo koledarja"
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
 msgstr ""
-"Metoda potrebna za naložitev `%s' ni podprta; predmeti iz mape koledarja ne "
-"bodo prenešeni v mapo nalog."
 
-#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
-msgid "SMTWTFS"
-msgstr "NPTSČPS"
+#: calendar/importers/icalendar-importer.c:404
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Opomnilnik"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "Tovarna uvozov datotek iCalendar v Evolucijo"
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Sporočilo koledarja"
+
+#: calendar/importers/icalendar-importer.c:663
+#, fuzzy
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolucija je našla poštne datoteke programa Pine.\n"
+"Jih želite uvoziti v Evolucijo?"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "Uvozi datoteke iCalendar v Evolucijo."
+#: calendar/importers/icalendar-importer.c:670
+msgid "Gnome Calendar"
+msgstr "Gnome Koledar"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "Uvozi datoteke vCalendar v Evolucijo."
+#: calendar/pcs/cal-backend-file.c:311
+msgid "Can't save calendar data: Malformed URI."
+msgstr ""
 
-#: calendar/pcs/query.c:246
+#: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "time-now ne pričakuje argumentov"
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:313
 msgid "make-time expects 1 argument"
 msgstr "make-time pričakuje 1 argument"
 
-#: calendar/pcs/query.c:275
+#: calendar/pcs/query.c:318
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time pričakuje, da je 1. argument niz"
 
-#: calendar/pcs/query.c:283
+#: calendar/pcs/query.c:326
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "1. argument make-time mora biti niz ISO 8601 datuma/časa"
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:355
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:317
+#: calendar/pcs/query.c:360
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:324
+#: calendar/pcs/query.c:367
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day pričakuje, da je 2. argument celo število (integer)"
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:394
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin pričakuje 1 argument"
 
-#: calendar/pcs/query.c:356
+#: calendar/pcs/query.c:399
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:426
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end pričakuje 1 argument"
 
-#: calendar/pcs/query.c:388
+#: calendar/pcs/query.c:431
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:467
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype ne pričakuje argumentov"
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:563
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:525
+#: calendar/pcs/query.c:568
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:532
+#: calendar/pcs/query.c:575
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? pričakuje, da je 2. argument time_t"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:705
 msgid "contains? expects 2 arguments"
 msgstr "contains? pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:710
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? pričakuje, da je 1. argument niz"
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:717
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? pričakuje, da je 2. argument niz"
 
-#: calendar/pcs/query.c:691
+#: calendar/pcs/query.c:734
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -5546,11 +6603,11 @@ msgstr ""
 "contains? pričakuje, da je 1. argument eden od \"any\" (karkoli), \"summary"
 "\" (povzetek), \"description\"(opis)"
 
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? pričakuje vsaj 1 argument"
 
-#: calendar/pcs/query.c:745
+#: calendar/pcs/query.c:788
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -5558,23 +6615,28 @@ msgstr ""
 "has-categories? pričakuje, da so vsi argumenti nizi ali da je natanko en "
 "argument boolean neresničen (#f)"
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? ne pričakuje argumentov"
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:921
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? pričakuje 1 argument"
 
-#: calendar/pcs/query.c:883
+#: calendar/pcs/query.c:926
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1229
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 "Izračun iskalnega izraza ni podal vrednosti resnično/neresnično (boolean)"
 
+#: calendar/pcs/query.c:1483
+#, fuzzy
+msgid "Parse error"
+msgstr "Drugačna napaka"
+
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -6473,651 +7535,677 @@ msgid "Asia/Macao"
 msgstr "Azija/Makao"
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Azija/Makao"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr ""
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Azija/Jakarta"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Azija/Manila"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr ""
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Azija/Nikozija"
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Azija/Novosibirsk"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Azija/Omsk"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Azija/Kabul"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr ""
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr ""
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Azija/Pjongjang"
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Azija/Katar"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "Azija/Gaza"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr ""
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr ""
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Azija/Sajgon"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr ""
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr ""
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Azija/Seul"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Azija/Shanghai"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Azija/Singapur"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr ""
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr ""
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr ""
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Azija/Teheran"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Azija/Tokijo"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr ""
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr ""
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Azija/Vladivostok"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr ""
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr ""
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr ""
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azori"
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermudi"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr ""
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Zelenortski otoki"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr ""
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr ""
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantik/Reykjavik"
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlantik/Sveta_Helena"
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Avstralija/Adelaide"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Avstralia/Brisbane"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Avstralija/Broken_Hill"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Avstralija/Darwin"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Avstralija/Hobart"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Avstralija/Lindeman"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Avstralija/Lord_Howe"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Avstralija/Melbourne"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Avstralija/Perth"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Avstralija/Sydney"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Evropa/Amsterdam"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Evropa/Andora"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Evropa/Atene"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Evropa/Belfast"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Evropa/Beograd"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Evropa/Berlin"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Evropa/Bratislava"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Evropa/Brusel"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Evropa/Bukarešta"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Evropa/Budimpešta"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Evropa/Chisinau"
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Evropa/Kobenhavn"
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Evropa/Dublin"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Evropa/Gibrlaltar"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Evropa/Helsinki"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Evropa/Istanbul"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr ""
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Evropa/Kijev"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Evropa/Lizbona"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Evropa/Ljubljana"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Evropa/London"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Evropa/Luksemburg"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Evropa/Madrid"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Evropa/Malta"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Evropa/Minsk"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Evropa/Monako"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Evropa/Moskva"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Evropa/Nikozija"
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Evropa/Oslo"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Evropa/Pariz"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Evropa/Praga"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Evropa/Riga"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Evropa/Rim"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Evropa/Samara"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Evropa/San_Marino"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Evropa/Sarajevo"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr ""
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Evropa/Skopje"
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Evropa/Sofija"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Evropa/Stockholm"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Evropa/Tallinn"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Evropa/Tirana"
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Evropa/Užgorod"
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Evropa/Vatikan"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Evropa/Dunaj"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Evropa/Vilnius"
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Evropa/Varšava"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Evropa/Zagreb"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Evropa/Zaporožje"
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Evropa/Zurich"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "Indijski_ocean/Komori"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr ""
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "Indijski_ocean/Maldivi"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "Indijski_ocean/Mauritius"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "Indijski_ocean/Mayotte"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr ""
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Pacifik/Fidži"
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Pacifik/Galapagos"
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Pacifik/Gvam"
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Pacifik/Honolulu"
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Pacifik/Midway"
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Pacifik/Norfolk"
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Pacifik/Pitcairin"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Pacifik/Saipan"
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Pacifik/Tahiti"
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr "Podpisovanje v tem kodirniku ni podprto"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "Čisto podpisovanje v tem šifrirniku ni podprto"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr "Preverjanje v tem šifrirniku ni podprto"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr "Šifriranje v tem šifrirniku ni podprto"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr "Dešifriranje v tem šifrirniku ni podprto"
 
-#: camel/camel-data-cache.c:166
+#: camel/camel-cipher-context.c:342
+#, fuzzy
+msgid "You may not import keys with this cipher"
+msgstr "Dešifriranje v tem šifrirniku ni podprto"
+
+#: camel/camel-cipher-context.c:374
+#, fuzzy
+msgid "You may not export keys with this cipher"
+msgstr "Dešifriranje v tem šifrirniku ni podprto"
+
+#: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
 msgstr "Nisem mogel ustvariti poti predpomnilnika"
 
-#: camel/camel-data-cache.c:438
+#: camel/camel-data-cache.c:370
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nisem mogel odstraniti vnosa v predpomnilnišk: %s: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7128,7 +8216,7 @@ msgstr ""
 "Nadalnje operacije na tem strežniku ne bodo pomnjene, ko se boste\n"
 "znova povezali v mrežo."
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7139,74 +8227,106 @@ msgstr ""
 "%s\n"
 "Spremembe storjene v tej mapi ne bodo sinhronizirane."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Sinhroniziram s strežnikom"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Odstranjujem mapo %s"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "Za dokončanje te operacije morate delati z mrežo"
 
-#: camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:698
+#: 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 "Nisem mogel ustvariti cevi do %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 "Nisem uspel predpomniti sporočila %s: %s"
+
+#: 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 "Uskljajujem mape"
 
-#: camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Napaka ob razčlenjanju filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Napaka ob izvajanju filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Ne morem odpreti mape vrste 'spool'"
 
-#: camel/camel-filter-driver.c:874
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Nisem mogel obdelati mape vrste 'spool'"
 
-#: camel/camel-filter-driver.c:889
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Dobivam sporočilo %d (%d%%)"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Ne morem dobiti sporočila"
 
-#: camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nauspeh ob sporočilu %d"
 
-#: camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Uskljajujem mapo"
 
-#: camel/camel-filter-driver.c:988
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Dobivam sporočilo %d od %d"
 
-#: camel/camel-filter-driver.c:1003
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:134
 msgid "Failed to retrieve message"
 msgstr "Nisem uspel prenesti sporočila"
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Neveljavni argumenti"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Neveljavni argumenti"
+
+#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Napaka ob izvajanju iskanja s filtrom: %s: %s"
 
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -7215,7 +8335,7 @@ msgstr ""
 "Nisem mogel razčleniti iskalnega izraza %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -7224,38 +8344,120 @@ msgstr ""
 "Napaka ob izvajanju iskalnega izraza %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) zahteva enojen booleanov rezultat"
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Opravljam poizvedbo na neznani glavi: %s"
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Neveljaven tip v body-contains, pričakovan niz"
-
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nepodprto dejanje: dodaj sporočilo: za %s"
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nepodprto dejanje: iskanje z izrazom: za %s"
 
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nepodprto dejanje: iskanje po uid-jih: za %s"
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1319
 msgid "Moving messages"
 msgstr "Prestavljam sporočila"
 
+#: camel/camel-folder.c:1319
+#, fuzzy
+msgid "Copying messages"
+msgstr "Kopiram sporočila v %s"
+
+#: camel/camel-gpg-context.c:724
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:738
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:761
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: 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: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 "Preklicano."
+
+#: camel/camel-gpg-context.c:798
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:804
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Nepričakovan odgovor strežnika POP: %s"
+
+#: camel/camel-gpg-context.c:814
+#, fuzzy
+msgid "No data provided"
+msgstr "Ime datoteke ni navedeno."
+
+#: camel/camel-gpg-context.c:857
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Ne morem zašifirati tega sporočila: naslovniki niso navedeni"
+
+#: camel/camel-gpg-context.c:1125
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s: %s\n"
+"\n"
+"%.*s"
+msgstr "Nisem uspel predpomniti sporočila %s: %s"
+
+#: camel/camel-gpg-context.c:1131
+#, fuzzy, c-format
+msgid "Failed to GPG %s: %s\n"
+msgstr "Nisem uspel predpomniti sporočila %s: %s"
+
+#: 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 "Nisem mogel izvršiti %s: %s\n"
+
+#: 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 "Nisem uspel dešifrirati sporočila"
+
+#: camel/camel-gpg-context.c:1333
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr ""
+"Nisem mogel preveriti tega sporočila: nisem mogel ustvariti začasne "
+"datoteke: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7276,25 +8478,24 @@ msgstr "Nisem mogel zakleniti '%s': napaka v protokolu s programom lock-helper"
 msgid "Could not lock '%s'"
 msgstr "Nisem se mogel zakleniti '%s'"
 
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nisem mogel ustvariti ključavnične datoteke za %s: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Ob pridobivanju ključavnice na %s je pretekla časovna omejitev. Poskusite "
 "znova kasneje."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Nisem uspel zakleniti s pomočjo fcntl(2): %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nisem uspel zakleniti s pomočjo flock(2): %s"
@@ -7304,236 +8505,92 @@ msgstr "Nisem uspel zakleniti s pomočjo flock(2): %s"
 msgid "Could not check mail file %s: %s"
 msgstr "Nisem mogel preverti poštne datoteke %s: %s"
 
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nisem mogel odpreti poštne datoteke %s: %s"
 
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nisem mogel odpreti začasne poštne datoteke %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 "Nisem uspel shraniti pošte v začasno datoteko %s: %s"
 
-#: camel/camel-movemail.c:188
+#: camel/camel-movemail.c:187
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nisem mogel ustvariti cevi: %s"
 
-#: camel/camel-movemail.c:200
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nisem se mogel razvejiti: %s"
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:237
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program movemail ni uspel: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 msgid "(Unknown error)"
 msgstr "(Neznana napaka)"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Napaka ob branju poštne datoteke: %s"
 
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Napaka ob pisanju v začasno poštno datoteko: %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 "Napaka ob kopiranju začasne poštne datoteke: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Prosim vpišite svoje %s geslo za %s"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Prosim vpišite svoje %s geslo"
-
-#: camel/camel-pgp-context.c:622
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Ne morem podpisati sporočila: osnovnega besedila ni"
-
-#: camel/camel-pgp-context.c:629 camel/camel-pgp-context.c:803
-msgid "Cannot sign this message: no password provided"
-msgstr "Ne morem podpisati sporočila: geslo ni podano"
-
-#: camel/camel-pgp-context.c:635 camel/camel-pgp-context.c:809
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"Ne morem podpisati tega sporočila: nisem mogel ustvariti cevi do GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:796
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Ne morem podpisati tega sporočila: ni osnovnega besedila"
-
-#: camel/camel-pgp-context.c:988
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Ne morem preveriti tega sporočila: ni osnovnega besedila za preverbo"
-
-#: camel/camel-pgp-context.c:994
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
-"Nisem mogel preveriti tega sporočila: nisem mogel ustvariti cevi do GPG/PGP: "
-"%s"
 
-#: camel/camel-pgp-context.c:1005
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr ""
-"Nisem mogel preveriti tega sporočila: nisem mogel ustvariti začasne "
-"datoteke: %s"
-
-#: camel/camel-pgp-context.c:1178
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Ne morem zašifirati tega sporočila: ni besedila za zašifriranje"
-
-#: camel/camel-pgp-context.c:1188
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Ne morem zašifirati tega sporočia: geslo ni podano"
-
-#: camel/camel-pgp-context.c:1195
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Ne morem zašifirati tega sporočila: nisem mogel ustvariti cevi do GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1204
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Ne morem zašifirati tega sporočila: naslovniki niso navedeni"
-
-#: camel/camel-pgp-context.c:1373
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr ""
-"Ne morem dešifrirati tega sporočila: ni zašifriranega besedila za "
-"dekodiranje."
-
-#: camel/camel-pgp-context.c:1381
-msgid "Cannot decrypt this message: no password provided"
-msgstr "Ne morem dešifrirati tega sporočila: geslo ni podano"
-
-#: camel/camel-pgp-context.c:1388
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Ne morem dešifrirati tega sporočila: nisem mogel ustvariti cevi do GPG/PGP: %"
-"s"
+#: camel/camel-multipart-encrypted.c:327
+#, fuzzy
+msgid "Failed to decrypt MIME part: parse error"
+msgstr "Nisem uspel dešifirati: vzrok neznan"
 
-#: camel/camel-pgp-mime.c:332
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr "To je digitalno podpisan del sporočila"
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "Prosim vpišite svoje geslo za %s"
-
-#: camel/camel-pkcs7-context.c:213
-msgid "Error hashing password."
-msgstr "Napaka ob razprševanju gesla."
-
-#: camel/camel-pkcs7-context.c:222
-msgid "Invalid password."
-msgstr "Neveljavno geslo.7"
-
-#: camel/camel-pkcs7-context.c:329
-#, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "Nisem mogel podpisati: certifikat za \"%s\" ni bil najden."
-
-#: camel/camel-pkcs7-context.c:378
-#, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "Nisem mogel čistopodpisati: certifikat za \"%s\" ni bil najden."
-
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr "Nisem mogel šifrirati: nisem uspel ustvariti podatkovne ovojnice."
-
-#: camel/camel-pkcs7-context.c:590
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "Nisem mogel šifrirati: nisem uspel ustvariti konteksta šifriranja"
-
-#: camel/camel-pkcs7-context.c:620
-#, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "Nisem mogel šifrirati podatkov: neveljaven ključ uporabnika \"%s\"."
-
-#: camel/camel-pkcs7-context.c:626
-msgid "Could not encrypt: encoding failed."
-msgstr "Nisem mogel šifirirati: enkodiranje ni uspelo."
-
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr "Nisem uspel dešifirati: vzrok neznan"
+#: camel/camel-multipart-signed.c:682
+#, fuzzy
+msgid "parse error"
+msgstr "Drugačna napaka"
 
-#: camel/camel-provider.c:130
+#: camel/camel-provider.c:132
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Nisem mogel naložiti %s: Nalaganje modulov na tem sistemu ni podprto."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:141
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nisem mogel naložiti %s: %s"
 
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:149
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nisem mogel naložiti %s: V modulu ni inicializacijske kode."
 
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s server %s"
-msgstr "strežnik %s %s"
-
-#: camel/camel-remote-store.c:207
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "storitev %s za %s na %s"
-
-#: camel/camel-remote-store.c:264 camel/providers/pop3/camel-pop3-store.c:194
-msgid "Connection cancelled"
-msgstr "Povezava prekinjena"
-
-#: camel/camel-remote-store.c:267 camel/providers/pop3/camel-pop3-store.c:197
-#: camel/providers/smtp/camel-smtp-transport.c:294
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
-
-#: camel/camel-remote-store.c:268 camel/providers/pop3/camel-pop3-store.c:198
-msgid "(unknown host)"
-msgstr "(neznan gostitelj)"
-
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Operacija razveljavljena"
-
-#: camel/camel-remote-store.c:484
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Povezava s strežnikom je bila nepričakovano prekinjena: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anonimno"
@@ -7585,11 +8642,11 @@ msgstr ""
 "Ta možnost narekuje povezavo s strežnikom z uporabo varnega CRAM-MD5 gesla, "
 "če to podpira strežnik."
 
-#: 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."
@@ -7597,42 +8654,119 @@ msgstr ""
 "Ta možnost narekuje povezavo s strežnikom z uporabo varnega DIGEST-MD5 "
 "gesla, če to podpira strežnik."
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Strežnikov izziv predolg (>2048 oktetov)\n"
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr "Strežnikov izziv ni veljaven\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 ""
 "Strežnikov izziv je vseboval neveljaven člen \"Quality of Protection"
 "\" (kvaliteta zaščite)\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 "Odziv strežnika ni vseboval podatkov o avtorizaciji\n"
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Odziv strežnika je vseboval nepopolne podatke o avtorizaciji\n"
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr "Odziv strežnika ne ustreza\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 ""
+"Ta možnost narekuje povezavo s strežnikom z uporabo avtentikacije 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 "Strežnik je sporočil slab odgovor avtentifikaciji."
+
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "Nisem uspel predpomniti sporočila %s: %s"
+
+#: camel/camel-sasl-gssapi.c:299
+#, fuzzy
+msgid "Unsupported security layer."
+msgstr "Nepodprta vrsta"
+
+#: 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 ""
 "Ta možnost narekuje povezavo s strežnikom z uporabo avtentikacije Kerberos 4."
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -7641,11 +8775,6 @@ msgstr ""
 "Nisem mogel dobiti Kerberos vstopniice:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
-msgid "Bad authentication response from server."
-msgstr "Strežnik je sporočil slab odgovor avtentifikaciji."
-
 #: camel/camel-sasl-login.c:32
 msgid "Login"
 msgstr "Prijava"
@@ -7658,11 +8787,21 @@ msgstr "Ta možnost narekuje povezavo s strežnikom z uporabo enostavnega gesla.
 msgid "Unknown authentication state."
 msgstr "Neznano stanje avtentifikacije."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:149
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:79
-msgid "Password"
-msgstr "Geslo"
+#: camel/camel-sasl-ntlm.c:31
+msgid "NTLM / SPA"
+msgstr ""
+
+#: camel/camel-sasl-ntlm.c:33
+#, fuzzy
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+"Ta možnost narekuje povezavo s strežnikom z uporabo avtentikacije Kerberos 4."
+
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr "ČISTO"
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7684,46 +8823,61 @@ msgstr "Avtentifikacija POP pred SMTP z uporabo neznanega transporta"
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "Avtentifikacija POP pred SMTP z uporabo ne-pop vira"
 
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Prevajanje regularnega izraza ni uspelo: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' potrebuje komponento uporabniškega imena"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' potrebuje komponento gostitelja"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' potrebuje komponento poti"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:741
 #, c-format
 msgid "Resolving: %s"
 msgstr "Razvozlujem: %s"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:773 camel/camel-service.c:887
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Napaka ob poizvedbi imena: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Poizvedba po gostitelju ni uspela: %s: gostitelj ni bil najden"
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Poizvedba po gostitelju ni uspela: %s: vzrok ni znan"
 
+#: camel/camel-service.c:853
+#, fuzzy
+msgid "Resolving address"
+msgstr "Razvozlujem: %s"
+
+#: camel/camel-service.c:915
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "Poizvedba po gostitelju ni uspela: %s: gostitelj ni bil najden"
+
+#: camel/camel-service.c:918
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "Poizvedba po gostitelju ni uspela: %s: vzrok ni znan"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Nuditelj virutalne mape e-pošte"
@@ -7732,12 +8886,12 @@ msgstr "Nuditelj virutalne mape e-pošte"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Za branje pošte kot poizvedbe po drugem sklopu map"
 
-#: camel/camel-session.c:346 camel/camel-session.c:415
+#: camel/camel-session.c:354 camel/camel-session.c:422
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Noben nuditelj za protokol '%s' ni dostopen"
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:548
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -7746,73 +8900,179 @@ msgstr ""
 "Nisem mogel ustvariti imenika %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:203
+#: camel/camel-smime-context.c:171
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "Prosim vpišite svoje geslo za %s"
+
+#: camel/camel-smime-context.c:201
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr "Prosim navedite vzdevek certifikata s katerim se želite podpisati."
 
-#: camel/camel-smime-context.c:209
+#: camel/camel-smime-context.c:207
 #, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr "Podpisni certifikat za \"%s\" ne obstaja."
 
-#: camel/camel-smime-context.c:249
+#: camel/camel-smime-context.c:247
 #, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "Šifrirni certifikat za \"%s\" ne obstaja."
 
-#: 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 "Nisem mogel najti certifikata za \"%s\"."
 
-#: camel/camel-smime-context.c:556
+#: camel/camel-smime-context.c:554
 msgid "Failed to find a common bulk algorithm."
 msgstr "Nisem mogel najti skupnega algoritma."
 
-#: camel/camel-smime-context.c:810
+#: camel/camel-smime-context.c:808
 msgid "Failed to decode message."
 msgstr "Nisem uspel dešifrirati sporočila"
 
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
 msgid "Failed to verify certificates."
 msgstr "Nisem mogel preveriti certifikatov."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ne morem dobiti mape: neveljavno dejanje na tej shrambi"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:268
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ne morem ustvariti mape: neveljavno dejanje na tej shrambi"
 
+#: camel/camel-tcp-stream-openssl.c:571
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Nisem mogel preveriti certifikatov."
+
+#: camel/camel-tcp-stream-openssl.c:573
+msgid "Unable to get Certificate Revocation List"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:575
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Nisem mogel preveriti certifikatov."
+
+#: camel/camel-tcp-stream-openssl.c:577
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:579
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:581
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Nisem mogel shraniti datoteke s podpisom."
+
+#: camel/camel-tcp-stream-openssl.c:583
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:585
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:587
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "ID _certifikata:"
+
+#: camel/camel-tcp-stream-openssl.c:589
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:596
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Napaka ob nalaganju %s"
+
+#: camel/camel-tcp-stream-openssl.c:598
+#, fuzzy
+msgid "Out of memory"
+msgstr "Iz pisarne"
+
+#: camel/camel-tcp-stream-openssl.c:600
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:602
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:604
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:606
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Nisem mogel preveriti certifikatov."
+
+#: camel/camel-tcp-stream-openssl.c:608
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:610
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "ID _certifikata:"
+
 #: camel/camel-tcp-stream-openssl.c:612
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+msgid "Invalid Certificate Authority (CA)"
 msgstr ""
-"Proizvedel: %s\n"
-"Zadeva: %s"
 
-#: camel/camel-tcp-stream-openssl.c:617
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:614
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:616
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Neveljaven argument"
+
+#: camel/camel-tcp-stream-openssl.c:618
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "ID _certifikata:"
+
+#: camel/camel-tcp-stream-openssl.c:620
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "ID _certifikata:"
+
+#: camel/camel-tcp-stream-openssl.c:623
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:625
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:629
+msgid "Key usage does not support certificate signing"
 msgstr ""
-"Slab certifikat od %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Ga želite vseeno sprejeti?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:458
+#: camel/camel-tcp-stream-openssl.c:632
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7825,16 +9085,33 @@ msgstr ""
 "Prstni odtis:      %s\n"
 "Podpis:            %s"
 
-#: camel/camel-tcp-stream-ssl.c:464
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr "V REDU"
 
-#: camel/camel-tcp-stream-ssl.c:464
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr "SLABO"
 
+#: camel/camel-tcp-stream-openssl.c:707
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Slab certifikat od %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Ga želite vseeno sprejeti?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:467
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -7849,119 +9126,198 @@ msgstr ""
 "\n"
 "Ga želite vseeno sprejeti?"
 
-#: camel/camel-url.c:288
+#: camel/camel-tcp-stream-ssl.c:877
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:929
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:947
+#, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:964
+#, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Ne morem odpreti razčleniti URLja '%s'"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Napaka ob zagonu %s"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ni takšnega sporočila %s v %s"
 
-#: camel/camel-vee-folder.c:749
-#, c-format
-msgid "No such message: %s"
-msgstr "Ni takšnega sporočila: %s"
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Preveri za nova sporočila v vseh mapah"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne morem zbrisati mape: %s: mapa ne obstaja"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ne morem preimenovati mape %s: neveljavno dejanjea"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ne morem preimenovati mape: %s: mapa ne obstaja"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "Ne morete kopirati sporočil iz te mape smeti."
+#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:263
+#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-store.c:2642
+msgid "Operation cancelled"
+msgstr "Operacija razveljavljena"
+
+#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-store.c:2645
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Povezava s strežnikom je bila nepričakovano prekinjena: %s"
+
+#. for imap ALERT codes, account user@host
+#: camel/providers/imap/camel-imap-command.c:326
+#, fuzzy, c-format
+msgid ""
+"Alert from IMAP server %s@%s:\n"
+"%s"
+msgstr "Nepričakovan odgovor strežnika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Nepričakovan odgovor strežnika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:405
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Ukaz IMAP ni uspel: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr "Odgovor strežnika se je prehitro končal."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:655
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Odgovor strežnika IMAP ni vseboval podatkov %s"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:691
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Nepričakovan odgovor OK strežnika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:197
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nisem mogel ustvariti imenika %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nisem mogel naložiti povzetka za %s"
 
-#: camel/providers/imap/camel-imap-folder.c:282
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mapa je bila uničena in na novo ustvarjena na strežniku."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:466
+#: camel/providers/imap/camel-imap-folder.c:549
 msgid "Scanning for changed messages"
 msgstr "Pregledujem za spremenjenimi sporočili"
 
-#: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2108
+#: camel/providers/imap/camel-imap-folder.c:1873
+#, fuzzy, c-format
+msgid "Unable to retrieve message: %s"
+msgstr "Nisem uspel prenesti sporočila"
+
+#: 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
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
+#: 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 ""
+"Ne morem dobiti sporočila: %s\n"
+"  %s"
+
+#: 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 "Ni takšnega sporočila"
+
+#: camel/providers/imap/camel-imap-folder.c:1933
+#: camel/providers/imap/camel-imap-folder.c:2529
 msgid "This message is not currently available"
 msgstr "To sporočilo trenutno ni na voljo"
 
-#: camel/providers/imap/camel-imap-folder.c:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
+#: camel/providers/imap/camel-imap-folder.c:2193
+#: camel/providers/imap/camel-imap-folder.c:2263
 msgid "Fetching summary information for new messages"
 msgstr "Prenašam povzetke novih sporočil"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-msgid "Scanning for new messages"
-msgstr "Pregledujem za novimi sporočili"
-
-#: camel/providers/imap/camel-imap-folder.c:2145
+#: camel/providers/imap/camel-imap-folder.c:2567
 msgid "Could not find message body in FETCH response."
 msgstr "Nisem mogel najti telesa sporočila v odgovoru FETCH."
 
-#: camel/providers/imap/camel-imap-message-cache.c:154
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Nisem mogel odpreti predpomnilniškega imenika: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:256
-#: camel/providers/imap/camel-imap-message-cache.c:313
-#: camel/providers/imap/camel-imap-message-cache.c:344
-#: camel/providers/imap/camel-imap-message-cache.c:376
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Nisem uspel predpomniti sporočila %s: %s"
+
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Preverjam za novo pošto"
@@ -7970,7 +9326,7 @@ msgstr "Preverjam za novo pošto"
 msgid "Check for new messages in all folders"
 msgstr "Preveri za nova sporočila v vseh mapah"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1176
 msgid "Folders"
 msgstr "Mape"
 
@@ -7998,32 +9354,77 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za branje in hranjenje pošte na strežnikih 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:86
+msgid "Password"
+msgstr "Geslo"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ta možnost narekuje povezavo s strežnikom IMAP z nešifriranim geslom."
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:457
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "Strežnik SMTP %s"
+
+#: camel/providers/imap/camel-imap-store.c:459
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "storitev %s za %s na %s"
+
+#: 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:183
+msgid "Connection cancelled"
+msgstr "Povezava prekinjena"
+
+#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/smtp/camel-smtp-transport.c:274
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
+
+#: 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 "Nisem se mogel povezati s strežnikom SMTP %s v varnem načinu: %s"
+
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/pop3/camel-pop3-store.c:216
+msgid "SSL/TLS extension not supported."
+msgstr "Razširitev SSL/TLS ni podprta"
+
+#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/pop3/camel-pop3-store.c:257
+msgid "SSL negotiations failed"
+msgstr "Pogajanje SSL ni uspelo"
+
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Strežnik IMAP %s ne podpira zahtevanega načina avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:528
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: 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 "Ni podpore za način avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sProsim vpišite geslo IMAP za %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:553
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "Nistve vpisali gesla."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8034,160 +9435,173 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:1496
+#: camel/providers/imap/camel-imap-store.c:1638
 #, c-format
 msgid "No such folder %s"
 msgstr "Ni takšne mape %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: 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 "Ime mape ne more vsebovati znaka return"
+
+#: camel/providers/imap/camel-imap-store.c:1851
+#, fuzzy, c-format
+msgid "Unknown parent folder: %s"
+msgstr "Neznana napaka: %s"
+
+#: camel/providers/imap/camel-imap-store.c:1887
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Starševski mapi ni dovoljeno vsebovati podmape"
 
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:352
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Ne morem odpreti poštnega predala: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:363
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
 #: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "Poštni imeniki vrste MH"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Za shranjevanje krajevne pošte v imenikih vrste MH."
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Krajevna dostava"
 
-#: camel/providers/local/camel-local-provider.c:54
-msgid "For retrieving local mail from standard mbox formated spools."
+#: camel/providers/local/camel-local-provider.c:66
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "Za pobiranje krajevne pošte iz datotek vrste mbox."
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "Uveljavi filtre na novih sporočilih v mapi INBOX tega strežnika"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Poštni imeniki vrste maildir"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "Za shranjevanje krajevne pošte v imenikih vrste maildir."
 
-#: camel/providers/local/camel-local-provider.c:80
-msgid "Standard Unix mbox spools"
-msgstr "Običajni Unix poštni predali mbox"
-
-#: camel/providers/local/camel-local-provider.c:81
-msgid "For reading and storing local mail in standard mbox spool files."
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
-"Za branje in shranjevanje krajevne pošte v običajnih Unix mbox datotekah"
 
-#: camel/providers/local/camel-local-provider.c:91
-msgid "Directory tree of mbox files"
-msgstr "Imeniško drevo datotek mbox"
+#: camel/providers/local/camel-local-provider.c:101
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Običajni Unix poštni predali mbox"
 
-#: camel/providers/local/camel-local-provider.c:92
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 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."
+"For reading and storing local mail in external standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
-"Za dostopanje do pošte shranjene v zunanjem drevesu datotek mbox.\n"
-"To vam bo omogočilo, da neposredno dostopate do map pine in elm.\n"
-"OPOZORILO: Ta nudilnik je še vedno preizkusen, zato pred uporabo naredite "
-"varnostno kopijo mape."
+"Za branje in shranjevanje krajevne pošte v običajnih Unix mbox datotekah"
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-spool-store.c:109
+#: camel/providers/local/camel-local-store.c:139
+#: 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 "Korenski imenik shrambe %s ni absolutna pot"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Korenski imenik shrambe %s ni običajnen imenik"
 
-#: camel/providers/local/camel-local-store.c:153
-#: camel/providers/local/camel-local-store.c:169
-#: camel/providers/local/camel-local-store.c:235
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ne morem dobiti mape: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr "Krajevno shrambe nimajo vhodnega predala"
 
-#: camel/providers/local/camel-local-store.c:196
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "Krajevna datoteka s pošto %s"
 
-#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
+#: 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 "Nisem mogel preimenovati mape %s v %s: %s"
 
-#: camel/providers/local/camel-local-store.c:374
+#: camel/providers/local/camel-local-store.c:365
+#, fuzzy, c-format
+msgid "Could not rename '%s': %s"
+msgstr "Nisem mogel preimenovati mape: %s"
+
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nisem mogel zbrisati datoteke povzetka mape `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nisem mogel zbrisati datoteke kazala mape `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:398
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Nisem mogel odpreti povzetka: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:457
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ne morem dodati sporočila k povzetku: razlog neznan"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Dodajanje sporočila v mailidr preklicano"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ne morem dodati sporočila v mapo vrste maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Ne morem dobiti sporočila: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
-msgid "No such message"
-msgstr "Ni takšnega sporočila"
-
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
 msgstr "Neveljavna vsebina sporočila"
 
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8196,15 +9610,17 @@ msgstr ""
 "Nisem mogel odpreti imenika `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
-#: camel/providers/local/camel-mh-store.c:96
+#: 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:167
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mapa `%s' ne obstaja."
 
-#: camel/providers/local/camel-maildir-store.c:116
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-maildir-store.c:117
+#: camel/providers/local/camel-mh-store.c:216
+#: camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8213,60 +9629,76 @@ msgstr ""
 "Nisem mogel ustvariti mape `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:131
+#: camel/providers/local/camel-maildir-store.c:132
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' ni imenik vrste maildir."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-maildir-store.c:167
+#: 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 "Nisem mogel zbrisati mape `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:169
 msgid "not a maildir directory"
 msgstr "ni imenik vrste maildir"
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: 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 "Nisem mogel prebrati mape `%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:405
-#: camel/providers/local/camel-maildir-summary.c:526
+#: 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 "Ne morem odpreti poštnega imenika maildir: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-maildir-summary.c:541
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Preverjam za novo pošto"
+
+#: camel/providers/local/camel-maildir-summary.c:644
+#, fuzzy
+msgid "Checking for new messages"
+msgstr "Pregledujem za novimi sporočili"
+
+#: 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 "Shranjujem mapo"
+
+#: 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 "Ne morem ustvariti ključavnice na mapi: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:218
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ne morem odpreti poštnega predala: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr "Dodajanje sporočila razveljavljeno"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:281
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Ne morem pripeti sporočila k datoteki vrste mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: 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"
@@ -8275,17 +9707,15 @@ msgstr ""
 "Ne morem dobiti sporočila: %s iz mape %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Zdi se, da je mapa poškodovana in je ni mogoče popraviti."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Konstrukcija sporočila ni uspela: Naj pokvarim poštni predal?"
 
-#: camel/providers/local/camel-mbox-store.c:93
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -8294,7 +9724,7 @@ msgstr ""
 "Ne morem odpreti datoteke '%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:109
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -8303,14 +9733,14 @@ msgstr ""
 "Nisem mogel ustvariti datoteke `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:118
-#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ni običajna datoteka."
 
-#: camel/providers/local/camel-mbox-store.c:137
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -8319,162 +9749,160 @@ msgstr ""
 "Nisem mogel zbrisati mape `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:152
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mapa `%s' ni prazna. Ni zbrisana."
 
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:248
-#: camel/providers/local/camel-mbox-summary.c:497
-#: camel/providers/local/camel-mbox-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:378
-#: camel/providers/local/camel-spool-summary.c:643
-#: camel/providers/local/camel-spool-summary.c:935
-msgid "Storing folder"
-msgstr "Shranjujem mapo"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nisem mogel odpreti imenika %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:391
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Usodna napaka razčlenjevanja pošte na mestu %ld v mapi %s"
 
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:447
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ne morem preveriti mape: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703
-#: camel/providers/local/camel-spool-summary.c:648
+#: 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 "Nisem mogel odpreti datoteke: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: 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 "Nisem mogel odpreti začasnega poštnega predala: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:544
-#: camel/providers/local/camel-mbox-summary.c:552
-#: camel/providers/local/camel-mbox-summary.c:741
-#: camel/providers/local/camel-mbox-summary.c:749
-#: camel/providers/local/camel-spool-summary.c:697
-#: camel/providers/local/camel-spool-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:978
-#: camel/providers/local/camel-spool-summary.c:986
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Povzetek se ne ujema z mapo, celo po uskladitvi"
-
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-spool-summary.c:749
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Napaka ob pisanju v začasni poštni predal: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-spool-summary.c:771
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Pisanje v začasni poštni predal ni uspelo: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: 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 "Nisem mogel zapreti izvorne mape %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:549
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nisem mogel zapreti začasne mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:560
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:873
-#: camel/providers/local/camel-spool-summary.c:544
-#: camel/providers/local/camel-spool-summary.c:1110
+#: 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 "Povzetek se ne ujema z mapo, celo po uskladitvi"
+
+#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznana napaka: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:812
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Nisem mogel preimenovati mape: %s"
+
+#: 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 "Napaka ob pisanju v začasni poštni predal: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:923
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Pisanje v začasni poštni predal ni uspelo: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "Dodajanje sporočila v MH preklicano"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Ne morem dodati sporočila v mapo vrste mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' ni imenik."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:244
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ne morem odpreti poštnega imenika MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Ne morem pripeti sporočila k datoteki vrste 'spool': %s: %s"
+#: camel/providers/local/camel-spool-store.c:122
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Map vrste 'spool' ni možno preimenovati"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "Datoteka vrste 'spool' `%s' ne obstaja ali ni običajna datoteka"
+#: camel/providers/local/camel-spool-store.c:134
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "Korenski imenik shrambe %s ni običajnen imenik"
 
-#: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spool-store.c:153
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mapa `%s/%s' ne obstaja."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:180
+#, fuzzy, c-format
+msgid "`%s' is not a mailbox file."
+msgstr "`%s' ni običajna datoteka."
+
+#: camel/providers/local/camel-spool-store.c:197
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Datoteka vrste 'spool' s pošto %s"
 
 #: camel/providers/local/camel-spool-store.c:209
-msgid "Spool folders cannot be renamed"
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
 msgstr "Map vrste 'spool' ni možno preimenovati"
 
 #: camel/providers/local/camel-spool-store.c:217
+msgid "Spool folders cannot be renamed"
+msgstr "Map vrste 'spool' ni možno preimenovati"
+
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr "Map vrste 'spool' ni možno zbrisati."
 
-#: camel/providers/local/camel-spool-summary.c:788
-#: camel/providers/local/camel-spool-summary.c:797
-#: camel/providers/local/camel-spool-summary.c:806
+#: 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 "Nisem mogel uskladiti začasne mape %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:211
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Nisem mogel uskladiti mape vrste 'spool' %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: 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"
@@ -8483,66 +9911,6 @@ msgstr ""
 "Nisem mogel uskladiti mape vrste 'spool' %s: %s\n"
 "Mapa je morda pokvarjena, kopija shranjena v `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:940
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "Nisem mogel shraniti: %s: %s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Prosim vpišite geslo NNTP za %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Strežnik je zavrnil uporabniško ime"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Nisem uspel poslati uporabniškega imena strežniku"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Strežnik je zavrnil uporabniško ime/geslo"
-
-#: camel/providers/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr "Notranja napaka: uid ima neveljavno obliko: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:153
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:439
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:502
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Ne morem dobiti sporočila %s: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/pop3/camel-pop3-folder.c:278
-#: camel/providers/pop3/camel-pop3-folder.c:437
-#: camel/providers/pop3/camel-pop3-folder.c:493
-#: camel/providers/pop3/camel-pop3-folder.c:510
-msgid "User cancelled"
-msgstr "Uporabnik je preklical"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Nisem mogel dobiti seznama skupin s strežnika."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "Nisem mogel naložiti datoteke s seznamom skupin za %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Nisem mogel shraniti datoteke s seznamom skupin za %s: %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET novičke"
@@ -8551,12 +9919,22 @@ msgstr "USENET novičke"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "To je nuditelj za branje in pisanje v novičkarske skupine USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:144
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Nisem mogel ustvariti imenika %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "USNET Novičke preko %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8598,32 +9976,47 @@ msgstr "Uporabite preklic"
 msgid "Operation failed: %s"
 msgstr "Operacija ni uspela: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:265
+#: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
 msgstr "Prenašam povzetek POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:280
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: 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 "Uporabnik je preklical"
+
+#: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Ne morem dobiti povzetka POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:316
+#: camel/providers/pop3/camel-pop3-folder.c:308
 msgid "Expunging deleted messages"
 msgstr "Uničujem zbrisana sporočila"
 
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ni sporočila z 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:418
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Prenašam sporočilo POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: 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 "Ne morem dobiti sporočila %s: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:500
 msgid "Unknown reason"
 msgstr "Neznan razlog"
 
@@ -8640,7 +10033,7 @@ msgstr "Pusti sporočila na strežniku"
 msgid "Delete after %s day(s)"
 msgstr "Zbriši po %s dneh"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:78
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr "POP"
 
@@ -8666,69 +10059,70 @@ msgstr ""
 "preko protokola APOP. To ni nujno, da bo delovalo za vse uporabnike in celo "
 "za strežnike, ki trdijo, da jo podpirajo."
 
-#: camel/providers/pop3/camel-pop3-store.c:227
+#: camel/providers/pop3/camel-pop3-store.c:186
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:244
 #: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:272
+#, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr ""
-"Nisem se mogel povezati s strežnikom POP %s v varnem načinu: %s"
+msgstr "Nisem se mogel povezati s strežnikom POP %s v varnem načinu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:228
-msgid "SSL/TLS extension not supported."
-msgstr "Razširitev SSL/TLS ni podprta"
-
-#: camel/providers/pop3/camel-pop3-store.c:273
-msgid "SSL negotiations failed"
-msgstr "Pogajanje SSL ni uspelo"
-
-#: camel/providers/pop3/camel-pop3-store.c:371
-msgid "Could not connect to POP server on %s"
+#: camel/providers/pop3/camel-pop3-store.c:354
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s"
 msgstr "Nisem se mogel povezati s strežnikom POP na %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:412
-#: camel/providers/pop3/camel-pop3-store.c:515
+#: 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.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "Ne morem se povezati s strežnikom POP.\n"
 "Ni podpore za zahtevan avtentifikacijski mehanizm."
 
-#: camel/providers/pop3/camel-pop3-store.c:428
-#, c-format
-msgid "SASL `%s' Login failed: %s"
+#: camel/providers/pop3/camel-pop3-store.c:411
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "Prijava SASL `%s' ni uspela: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:439
-msgid "SASL Protocol error"
-msgstr "Napaka protokola SASL"
-
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
-msgid "I/O Error: %s"
-msgstr "V/I napaka: %s"
+msgid "Cannot login to POP server %s: SASL Protocol error"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:442
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "Strežniku KPOP se nisem mogel avtentificirati: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:475
+#: camel/providers/pop3/camel-pop3-store.c:464
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sProsimo vpišite geslo POP za %s@%s"
 
+#: camel/providers/pop3/camel-pop3-store.c:519
 #: camel/providers/pop3/camel-pop3-store.c:526
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "Nisem se mogel povezati s strežnikom POP.\n"
 "Napaka ob pošiljanju gesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:616
+#: camel/providers/pop3/camel-pop3-store.c:625
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ni takšne mape `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Program sendmail"
 
@@ -8739,45 +10133,41 @@ msgid ""
 msgstr ""
 "Za dostavljanjem pošte preko programa \"sendmail\" na krajevnem sistemu."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
+msgid "Could not parse recipient list"
+msgstr "Ne morem razčleniti seznama prejemnikov"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Nisem mogel ustvariti cevi do programa sendmail: %s: pošta ni bila poslana"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Nisem mogel vejiti programa sendmail: %s: pošta ni bila poslana"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nisem mogel poslati sporočila: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "program sendmail je zaključil s signalom %s: pošta ni bila poslana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:240
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nisem mogel izvršiti %s: pošta ni bila poslana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "program sendmail je zaključil s stanjem %d: pošta ni bila poslana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
-msgid "Could not find 'From' address in message"
-msgstr "V sporočilu nisem našel naslova 'From' (pošiljatelja)."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:226
-msgid "Could not parse recipient list"
-msgstr "Ne morem razčleniti seznama prejemnikov"
-
 #: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
 msgstr "program sendmail"
@@ -8786,7 +10176,7 @@ msgstr "program sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava pošte preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:94
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -8796,140 +10186,141 @@ msgstr ""
 "Za dostavo pošte preko povezave z oddaljenim poštnim razdelilcem z uporabo "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaktična napaka, ukaz ni prepoznan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr "Sintaktična napaka v parametrih ali argumentih"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr "Ukaz ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr "Parameter ukaza ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr "Stanje sistema ali odgvor na pomoč"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr "Sporčilo pomoči"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr "Storitev pripravljena"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr "Storitev zapira kanal za prenos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr "Storitev ni na voljo, zapiram kanal za prenos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr "Zahtevano dejanje v redu, opravljeno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; will forward to <forward-path>"
 msgstr "Uporabnik ni krajeven; bom posredoval na <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Zahtevano poštno dejanje ni bilo izvedeno: poštni predal ni na voljo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Zahtevano dejanje ni bilo izvedeno: poštni predal ni na voljo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr "Zahtevano dejanje prekinjeno: napaka ob obdelavi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "User not local; please try <forward-path>"
 msgstr "Uporabnik ni krajeven; prosimo poskusite <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Zahtevano dejanje ni bilo izvedeno: premalo prostora na disku"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Zahtevano dejanje prekinjeno: prekoračena obremenitev diska"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Zahtevano dejanje ni bilo izvedeno: ime poštnega predala ni dovoljeno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Začni z vpisom pošte; končaj z <ENTER>.<ENTER>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr "Transakcija ni uspela"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr "Potreben je prenos gesla"
 
-#: camel/providers/smtp/camel-smtp-transport.c:226
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr "Mehanizem avtentifikacije je prešibak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:228
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Za zahtevan mehanizem avtentifikacije je potrebno šifriranje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:230
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr "Začasna napaka avtentifikacije"
 
-#: camel/providers/smtp/camel-smtp-transport.c:232
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "Potrebna je avtentifikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Napaka pri pozdravu: %s: morda ni usodna"
+#: camel/providers/smtp/camel-smtp-transport.c:297
+#, fuzzy
+msgid "Welcome response error"
+msgstr "Napaka v odgovoru na QUIT"
 
-#: camel/providers/smtp/camel-smtp-transport.c:374
-#: camel/providers/smtp/camel-smtp-transport.c:420
+#: 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 ""
-"Nisem se mogel povezati s strežnikom SMTP %s v varnem načinu: %s"
+msgstr "Nisem se mogel povezati s strežnikom SMTP %s v varnem načinu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:375
+#: camel/providers/smtp/camel-smtp-transport.c:342
 msgid "server does not appear to support SSL"
 msgstr "zdi se, da strežnik n e podpira SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:389
+#: camel/providers/smtp/camel-smtp-transport.c:356
+#, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Zahtevek STARTTLS je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:404
+#: camel/providers/smtp/camel-smtp-transport.c:371
 msgid "STARTTLS response error"
 msgstr "Napaka v odgovoru na STARTTLS"
 
-#: camel/providers/smtp/camel-smtp-transport.c:502
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:474
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Strežnik SMTP %s ne podpira zahtevanega načina avtentifikacije %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:540
+#: camel/providers/smtp/camel-smtp-transport.c:512
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sProsim vpišite geslo SMTP za %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8940,94 +10331,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:684
+#: camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr "Strežnik SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Dostava pošte s SMTP preko %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
-msgid "Cannot send message: sender address not defined."
-msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni naveden."
-
-#: camel/providers/smtp/camel-smtp-transport.c:717
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "Cannot send message: sender address not valid."
 msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni veljaven."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722 mail/mail-ops.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Pošiljam sporočilo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:733
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne morem poslati sporočila: ni naslovnikov."
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ne morem poslati sporočila: eden ali več neveljavnih naslovnikov"
 
-#: camel/providers/smtp/camel-smtp-transport.c:917
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr "Pozdrav SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Zahtevek HELO je prekoračil časovno omejitev: %s: ni usodno"
+#: camel/providers/smtp/camel-smtp-transport.c:924
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "Zahtevek RSET je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:959
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "Napaka v odgovoru na HELO: %s: ni usodno"
+#: camel/providers/smtp/camel-smtp-transport.c:946
+#, fuzzy
+msgid "HELO response error"
+msgstr "Napaka v odgovoru na RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr "Avtentifikacija SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1012
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr "Napak ob ustvarjanju avtentifikacijskega predmeta SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1027
-#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: 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 "Zahtevek AUTH je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr "Zahtevek AUTH ni uspel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1096
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr "Strežnik je sporočil slab odgovor avtentifikacije.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1122
+#: camel/providers/smtp/camel-smtp-transport.c:1142
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 "Zahtevek MAIL FROM je prekoračil časovno omejitev: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1136
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 msgid "MAIL FROM response error"
 msgstr "Napaka v ogovoru na MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1161
+#: camel/providers/smtp/camel-smtp-transport.c:1186
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 "Zahtevek RCPT TO je prekoračil časovno omejitev: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1177
+#: camel/providers/smtp/camel-smtp-transport.c:1208
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> ni uspel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1247
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9036,78 +10423,69 @@ 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:1227
+#: camel/providers/smtp/camel-smtp-transport.c:1267
 msgid "DATA response error"
 msgstr "Napaka v odgovoru na DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1267
-#: camel/providers/smtp/camel-smtp-transport.c:1285
+#: 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 ""
 "Zahtevek DATA je prekoračil časovno omejitev: konec sporočila: %s: pošta ni "
 "bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1299
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 msgid "DATA termination response error"
 msgstr "Napaka v odgovoru za končanje DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1322
+#: camel/providers/smtp/camel-smtp-transport.c:1374
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zahtevek RSET je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 msgid "RSET response error"
 msgstr "Napaka v odgovoru na RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1359
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Zahtevek QUIT je prekoračil časovno omejitev: %s: ni usodno"
+#: camel/providers/smtp/camel-smtp-transport.c:1417
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "Zahtevek AUTH je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1373
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 msgid "QUIT response error"
 msgstr "Napaka v odgovoru na QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:101
-msgid "1 byte"
-msgstr "1 bajt"
-
-#: composer/e-msg-composer-attachment-bar.c:103
-#, c-format
-msgid "%u bytes"
-msgstr "%u bajtov"
-
-#: composer/e-msg-composer-attachment-bar.c:110
-#, c-format
-msgid "%.1fK"
+#: composer/e-msg-composer-attachment-bar.c:102
+#, fuzzy, c-format
+msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
-#, c-format
-msgid "%.1fM"
+#: composer/e-msg-composer-attachment-bar.c:105
+#, fuzzy, c-format
+msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
-#, c-format
-msgid "%.1fG"
+#: 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:361 mail/mail-display.c:147
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr "priloga"
 
-#: 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 "Odstrani izbrane predmete iz seznama prilog"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Dodaj prilogo..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "Priloži datoteko k sporočilu"
 
@@ -9135,56 +10513,64 @@ msgid "MIME type:"
 msgstr "Vrsta MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:180
+#: composer/e-msg-composer-select-file.c:66
 msgid "Suggest automatic display of attachment"
 msgstr "Predlagan samodejen prikaz priloge"
 
-#: composer/e-msg-composer-hdrs.c:326
+#: 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 "Kliknite tu za adresar"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:356
-msgid "From:"
-msgstr "Od:"
-
-#.
 #. * 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:362
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Odgovori-na:"
 
 #.
-#. * Subject:
+#. * From
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:516
+msgid "From:"
+msgstr "Od:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Vnesite prejemnike sporočila"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Vnesite naslove, ki bodo prejeli, karbonske kopije sporočila"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: 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."
@@ -9192,12 +10578,31 @@ msgstr ""
 "Vnesite naslove, ki bodo prejeli karbonske kopije sporočila, a  se ne bodo "
 "pojavili v seznamu prejemnikov sporočila."
 
-#: composer/e-msg-composer-select-file.c:291
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:547
+#, fuzzy
+msgid "Post To:"
+msgstr "Porto"
+
+#: composer/e-msg-composer-hdrs.c:549
+#, fuzzy
+msgid "Posting destination"
+msgstr "Brez opisa"
+
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+#, fuzzy
+msgid "Attach file(s)"
 msgstr "Priloži datoteko"
 
-#: composer/e-msg-composer.c:715
+#: composer/e-msg-composer.c:533
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Nisem mogel ustvariti konteksta podpisovanja PGP."
+
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9206,38 +10611,30 @@ msgstr ""
 "Napaka ob branju datoteke %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:955
-msgid "Save as..."
-msgstr "Shrani kot..."
-
-#: composer/e-msg-composer.c:964
-msgid "Warning!"
-msgstr "Opozorilo!"
-
-#: composer/e-msg-composer.c:968
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Datoteka obstaja, prepiši?"
 
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Napaka ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:1009
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:1040
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Napaka ob dostopanju do datoteke: %s"
 
-#: composer/e-msg-composer.c:1048
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Od urejevalnika nisem uspel dobiti sporočila"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9246,7 +10643,7 @@ msgstr ""
 "Nisem mogel izvesti klica 'seek' na datoteki: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1062
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9255,7 +10652,16 @@ msgstr ""
 "Nisem mogel odsekati datoteke: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1285
+#, fuzzy, c-format
+msgid ""
+"Unable to copy file descriptor: %s\n"
+"%s"
+msgstr ""
+"Nisem mogel izvesti klica 'seek' na datoteki: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9264,7 +10670,7 @@ msgstr ""
 "Napaka ob samodejnem shranjevanju sporočila: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1173
+#: 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?"
@@ -9272,9 +10678,10 @@ msgstr ""
 "Evolucija je zaznala neshranjene datoteke iz prejšnjih sej.\n"
 "Jih želite poskusiti obnoviti?"
 
-#: composer/e-msg-composer.c:1331
+#: composer/e-msg-composer.c:1550
+#, fuzzy, c-format
 msgid ""
-"This message has not been sent.\n"
+"The message \"%s\" has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
@@ -9282,23 +10689,34 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:1338
+#: composer/e-msg-composer.c:1555
+#, fuzzy
+msgid "_Discard Changes"
+msgstr "Zavrzi to sporočilo"
+
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Opozorilo: Spremenjeno sporočilo"
 
-#: composer/e-msg-composer.c:1361
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:1510
-msgid "Insert File"
-msgstr "Vstavi datoteko"
+#: composer/e-msg-composer.c:2015
+#, fuzzy
+msgid "Signature:"
+msgstr "Podpisi"
+
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
+msgid "Autogenerated"
+msgstr ""
 
-#: composer/e-msg-composer.c:2044 composer/e-msg-composer.c:2641
+#: composer/e-msg-composer.c:2234 composer/e-msg-composer.c:2873
+#: composer/e-msg-composer.c:2874
 msgid "Compose a message"
 msgstr "Sestavi novo sporočilo"
 
-#: composer/e-msg-composer.c:2658
+#: composer/e-msg-composer.c:2905
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9306,25 +10724,30 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja:\n"
 "Nisem mogel aktivirati gradnika za izbiro naslova."
 
-#: composer/e-msg-composer.c:2681 composer/e-msg-composer.c:2736
+#: composer/e-msg-composer.c:2931
+#, fuzzy
 msgid ""
 "Could not create composer window:\n"
-"Unable to activate HTML editor component."
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 "Nisem mogel ustvariti okna skladatelja:\n"
 "Ne morem aktivirati komponente urejevalnika HTML."
 
-#: composer/evolution-composer.c:383
+#: composer/e-msg-composer.c:2991
 msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
 msgstr ""
-"Nisem mogel ustvariti okna skladatelja, ker še niste nastavili\n"
-"identitet v komponenti pošte."
+"Nisem mogel ustvariti okna skladatelja:\n"
+"Ne morem aktivirati komponente urejevalnika HTML."
 
-#: composer/evolution-composer.c:398
-msgid "Cannot initialize Evolution's composer."
-msgstr "Ne morem inicializirati Evolucijinega sestavljalca."
+#: composer/e-msg-composer.c:4005
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
 
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
@@ -9374,427 +10797,351 @@ msgstr "Zadeva vsebuje"
 msgid "Subject does not contain"
 msgstr "Zadeva ne vsebuje"
 
-#. Remember the password?
-#: e-util/e-passwords.c:360 mail/mail-session.c:269
+#: 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 "Iz pisarne"
+
+#: designs/OOA/ooa.glade.h:5
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "Stanje:"
+
+#: 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 "Iz pisarne"
+
+#: designs/OOA/ooa.glade.h:13
+#, fuzzy
+msgid "Yes, Change Status"
+msgstr "Stanje zastavice"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:2
+#, fuzzy
+msgid "<b>Receiving Email</b>"
+msgstr "Sprejemam e-pošto"
+
+#: designs/read_receipts/read.glade.h:3
+#, fuzzy
+msgid "<b>Sending Email:</b>"
+msgstr "Pošiljam e-pošto"
+
+#: 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 "Prejemnik"
+
+#: 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 ""
+"Datoteka z enakim imenom že obstaja.\n"
+"Naj jo prepišem?"
+
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "Prepiši datoteko?"
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Zapomni si geslo"
 
-#: e-util/e-passwords.c:362 mail/mail-session.c:270
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Pomni geslo do konca seje"
 
-#: e-util/e-pilot-settings.c:96
+#: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
 msgstr "Uskladi zasebne kartoteke"
 
-#: e-util/e-pilot-settings.c:105
+#: e-util/e-pilot-settings.c:102
 msgid "Sync Categories:"
 msgstr "kategorije usklajevanja:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
+#: 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:173 e-util/e-time-utils.c:353
+#: 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:178
+#: 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:183
+#: 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:194
+#: 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:198
+#: 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:203
+#: 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:208
+#: 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:213
+#: 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:218
+#: 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:303 e-util/e-time-utils.c:402
+#: 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:307 e-util/e-time-utils.c:394
+#: 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:312 e-util/e-time-utils.c:399
-#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1647
+#: 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:316 e-util/e-time-utils.c:391
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1644
+#: 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:320
+#: e-util/e-time-utils.c:342
 msgid "%I %p"
 msgstr "%I %p"
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Evolucijina komponenta za povzetke."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Tovarna za Evolucijine komponente za povzetke."
-
-#: executive-summary/component/component-factory.c:151
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Ne morem inicializirati Evolucijine komponente za povzetke."
-
-#: executive-summary/component/e-summary-callbacks.c:125
-msgid "Select a service"
-msgstr "Izberi storitev"
-
-#: executive-summary/component/e-summary-callbacks.c:289
-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 ""
-"Za ozadje izvlečka lahko izberete drugačno HTML stran.\n"
-"\n"
-"Pustite pravno za privzete nastavitve"
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Odpri %s s privzetim GNOMEovim programom"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Odpri %s s privzetim GNOMEovim brskalnikom"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Pošlji e-pošto %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Spremeni pogled na %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Poženi %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Zapri %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Premakni %s na levo"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Premakni %s na desno"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Premakni %s v prešnjo vrstico"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Premakni %s v naslednjo vrstico"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Nastavi /%s"
-
-#: executive-summary/component/e-summary-url.c:553
-msgid "page"
-msgstr "stran"
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr "1 sekunda"
 
-#: executive-summary/component/e-summary.c:925
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Nisem mogel odpreti HTML datoteke:\n"
-"%s"
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr "%d sekund"
 
-#: executive-summary/component/e-summary.c:939
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Napaka ob branju podatkov:\n"
-"%s"
+#: filter/filter-datespec.c:66
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 minuta"
 
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr "Datoteka nima mesta za storitve.\n"
+#: filter/filter-datespec.c:66
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "%d minut"
 
-#: executive-summary/component/main.c:61
-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 ""
-"Komponenta Povzetek ni mogla inicializirati Bonoba.\n"
-"Če se je pokazalo opozorilo o RootPOA, to verjetno pomeni,\n"
-"da ste prevedli Bonobo z GOAD-om namesto z OAF-om."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Tovarna za povzetke RDF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "Povzetek RDF"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Tovarna za preizkusno komponento bonobo."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Tovarna za preizkusno komponento."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Preizkusi storitev bonobo"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Preizkusi storitev"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Napaka"
+#: filter/filter-datespec.c:67
+#, fuzzy
+msgid "1 hour ago"
+msgstr "1 ura"
 
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr "Samodejno posodobi"
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d ur"
 
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "Posodobi zdaj"
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "1 day ago"
+msgstr "1 dan"
 
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "Posodobi vsakih"
+#: filter/filter-datespec.c:68
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr "%d dni"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "leto"
+#: filter/filter-datespec.c:69
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 teden"
 
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "let"
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d tednov"
 
-#: filter/filter-datespec.c:81
-msgid "month"
+#: filter/filter-datespec.c:70
+#, fuzzy
+msgid "1 month ago"
 msgstr "mesec"
 
-#: filter/filter-datespec.c:81
-msgid "months"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
 msgstr "mesecev"
 
-#: filter/filter-datespec.c:82
-msgid "week"
-msgstr "teden"
-
-#: filter/filter-datespec.c:82
-msgid "weeks"
-msgstr "tedenov"
-
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "ura"
-
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "minuta"
-
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "sekunda"
-
-#: filter/filter-datespec.c:86
-msgid "seconds"
-msgstr " sekund"
-
-#: filter/filter-datespec.c:194
-msgid "You have forgotten to choose a date."
-msgstr "Pozabili ste izbrati datum."
-
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "Izbrali ste neveljaven datum."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
+#: filter/filter-datespec.c:71
+msgid "1 year ago"
 msgstr ""
-"Datum tega sporočila bo primerjan s\n"
-"časom ob katerem se bo pognal filter\n"
-"ali vmapa odprta."
 
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Datum tega sporočila bo primerjan s časom,\n"
-"ki ga navedete tu."
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr "%d vizitk"
 
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Datum tega sporočila bo primerjan s časom\n"
-"relativnim glede na čas zagona filtra;\n"
-".na primer \"teden dni nazaj\"."
+#: filter/filter-datespec.c:176
+#, fuzzy
+msgid "You must choose a date."
+msgstr "Pozabili ste izbrati datum."
 
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "trenutni čas"
+#: filter/filter-datespec.c:275
+msgid "<click here to select a date>"
+msgstr "<kliknite tukaj za izbiro datuma>"
 
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "čas, ki ga navedete"
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+msgid "now"
+msgstr "sedaj"
 
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "čas, relatievn trenutnemu"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:285
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b %Y"
 
-#. The dialog
-#: filter/filter-datespec.c:394
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Izberi čas s katerim naj se primerja"
 
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Primerjaj z"
-
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
-msgid "now"
-msgstr "sedaj"
-
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " nazaj "
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "nazaj"
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
+msgid "Filter Rules"
+msgstr "Pravila filtriranja"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:993
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %l:%M %p"
+#: filter/filter-file.c:166
+#, fuzzy
+msgid "You must specify a file name."
+msgstr "Navedite ime datoteke:"
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<kliknite tukaj za izbiro datuma>"
+#: filter/filter-file.c:184
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "Datoteka vrste 'spool' `%s' ne obstaja ali ni običajna datoteka"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
-msgid "Filter Rules"
-msgstr "Pravila filtriranja"
+#: filter/filter-file.c:298
+#, fuzzy
+msgid "Choose a file"
+msgstr "Odpri datoteko"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:491
 msgid "Then"
 msgstr "Potem"
 
-#: filter/filter-filter.c:502
-msgid "Add action"
-msgstr "Dodaj dejanje"
-
-#: filter/filter-folder.c:156
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
-"Pozabili ste izbrati mapo.\n"
-"Pojdite nazaj in navedite veljavno mapo v katero naj se dostavlja pošta."
+#: filter/filter-folder.c:155
+#, fuzzy
+msgid "You must specify a folder."
+msgstr "vMapi morate dati ime."
 
-#: filter/filter-folder.c:239 filter/vfolder-rule.c:365
-#: mail/mail-account-gui.c:858
+#: 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 "Izberi mapo"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "Vnesite URI mape"
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<kliknite tukaj za izbiro mape>"
-
-#: filter/filter-input.c:198
+#: filter/filter-input.c:191
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -9803,349 +11150,502 @@ msgstr ""
 "Napaka v regularnem izrazu '%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:44
+#: 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 "Pomembno"
+
+#. red
+#: 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 "Delam"
+
+#. orange
+#: 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 "Priština"
+
+#. forest green
+#: 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 "Seznam opravil"
+
+#. blue
+#: 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 "po"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
 msgid "Test"
 msgstr "Preizkus"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:219
 msgid "You must name this filter."
 msgstr "Filtru morate dati ime."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:751
 msgid "Rule name: "
 msgstr "Ime pravila: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:755
 msgid "Untitled"
 msgstr "Neimenovan"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:772
 msgid "If"
 msgstr "Če"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:790
 msgid "Execute actions"
 msgstr "Izvrši dejanja"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:794
 msgid "if all criteria are met"
 msgstr "če je zadoščeno vsem pogojem"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:799
 msgid "if any criteria are met"
 msgstr "če je zadoščeno kateremukoli pogoju"
 
-#: filter/filter-rule.c:780
-msgid "Add criterion"
-msgstr "Dodaj pogoj"
-
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:894
 msgid "incoming"
 msgstr "dohodna"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:894
 msgid "outgoing"
 msgstr "odhodna"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Primerjaj z"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Uredi filtre"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Uredi vMape"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Dohodna"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Odhodna"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Datum tega sporočila bo primerjan s časom,\n"
+"ki ga navedete tu."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Datum tega sporočila bo primerjan s časom\n"
+"relativnim glede na čas zagona filtra;\n"
+".na primer \"teden dni nazaj\"."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Datum tega sporočila bo primerjan s časom,\n"
+"ki ga navedete tu."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr "Virtualne mape"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "čas, relatievn trenutnemu"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "nazaj"
+
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "mesecev"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr " sekund"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "le izbrane mape"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "trenutni čas"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "čas, ki ga navedete"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "Viri vMap"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "tedenov"
+
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "z vsemi aktivnimi oddaljenimi mapami"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "z vsemi krajevnimi in aktivnimi oddaljenimi mapami"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "z vsemi krajevnimi mapami"
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "let"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Dodeli točke"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Dodeli barvo"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Dodeli točke"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Priloge"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
 msgid "Beep"
 msgstr "Pisk"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "vsebuje"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopiraj v mapo"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Sprejeto dne"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Poslano dne"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Zbrisano"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "ne vsebuje"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "se ne konča z"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "ne obstaja"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "ne obstaja"
+
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "ne zveni kot"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "se ne začne z"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "ne obstaja"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Osnutek"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "se konča z"
 
-#: filter/libfilter-i18n.h:20
-msgid "Execute Shell Command"
-msgstr "Izvedi ukaz lupine"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "obstaja"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "obstaja"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Izraz"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "Navezava"
 
-#: filter/libfilter-i18n.h:25
-msgid "Important"
-msgstr "Pomembno"
-
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "je"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr "je po"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr "je pred"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr "je označeno"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "je večje"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "je manjše"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "ni"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
 msgstr "ni označeno"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
+#, fuzzy
+msgid "Label"
+msgstr "oznaka9"
+
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Dopisni seznam"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Jedro sporočila"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Glava sporočila"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Prestavi v mapo"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Izvedi ukaz lupine"
+
+#: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr "Predvajaj zvok"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
 msgid "Read"
 msgstr "Beri"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Prejemnik"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Regularni izraz"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Odgovorjeno na"
 
-#: filter/libfilter-i18n.h:43 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:8
+#: filter/libfilter-i18n.h:46
+msgid "returns"
+msgstr ""
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "je večje"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "je manjše"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Točke"
 
-#: filter/libfilter-i18n.h:44 mail/mail-callbacks.c:1558
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Nastavi stanje"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Izvedi ukaz lupine"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Velikost (kB)"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "zveni kot"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Izvorni račun"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Določena glava"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "se začne z"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:53 mail/mail-format.c:933
-#: mail/message-list.etspec.h:12
+#: 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 "Zadeva"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Nastavi stanje"
+
+#: 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 "Pravila"
 
-#: filter/rule-editor.c:287
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
 
-#: filter/rule-editor.c:360
+#: filter/rule-editor.c:372
 msgid "Edit Rule"
 msgstr "Uredi pravilo"
 
-#: filter/score-editor.c:130
+#: filter/rule-editor.c:689
+#, fuzzy
+msgid "Rule name"
+msgstr "Ime pravila: "
+
+#: filter/score-editor.c:114
 msgid "Score Rules"
 msgstr "Točke pravil"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:208
 msgid "You must name this vfolder."
 msgstr "vMapi morate dati ime."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:222
 msgid "You need to to specify at least one folder as a source."
 msgstr "Kot vir morate navesti vsaj eno mapo."
 
-#: importers/elm-importer.c:95
+#: filter/vfolder-rule.c:499
+#, fuzzy
+msgid "VFolder source"
+msgstr "Viri vMap"
+
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolucija uvaža vašo staro pošto Elm."
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:107
-#: importers/pine-importer.c:101
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
+#: 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 "Uvažam..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:109
-#: importers/pine-importer.c:103
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
+#: 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 "Prosim pokačajte"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:689
-#: importers/pine-importer.c:365
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
+#: 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 "Uvažam %s kot %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:782
-#: importers/pine-importer.c:471
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
+#: 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 "Pregledujem %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:958
-#: importers/pine-importer.c:637 mail/component-factory.c:100
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2128
+#: 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 "Pošta"
 
-#: 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?"
@@ -10153,14 +11653,10 @@ msgstr ""
 "Evolucija je našla poštne datoteke programa Elm.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Adresar"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10169,23 +11665,78 @@ msgstr ""
 "Evolucija je našla datoteke GnomeCard-a.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Prioriteta: %s"
+
+#: 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"
+"Instead, Evolution provides scores in the range of\n"
+"-3 to 3 that can be assigned to emails and filtered\n"
+"accordingly.\n"
+"\n"
+"As a workaround, a set of filters called \"Priority Filter\"\n"
+"was added that converts Netscape's email priorities into\n"
+"Evolution's scores, and the affected filters use scores instead\n"
+"of priorities. Check the imported filters to make sure\n"
+"everything still works as intended."
+msgstr ""
+
+#: 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"
+"feature, which is not supported in Evolution.\n"
+"These filters will be dropped."
+msgstr ""
+
+#: 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"
+"which is not supported in Evolution. Those filters\n"
+"were modified to test whether that string is or is not\n"
+"contained in the message body."
+msgstr ""
+
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolucija uvaža vaše podatke iz Netscapea"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#. Fill in the new fields
+#: 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 "Smeti"
+
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Krajevna datoteka s pošto %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 "Pregledujem mapo"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr "Pričenjam uvoz"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Uredi filtre"
+
+#: 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?"
@@ -10193,11 +11744,11 @@ msgstr ""
 "Evolucija je našla poštne datoteke programa Netscape.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: 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 "Evolucija uvaža vaše podatke iz Pinea"
 
-#: 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?"
@@ -10205,76 +11756,128 @@ msgstr ""
 "Evolucija je našla poštne datoteke programa Pine.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 msgid "Pine"
 msgstr "Program Pine"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1 notes/GNOME_Evolution_Notes.oaf.in.h:2
-msgid "Evolution component for handling mail."
-msgstr "Evolucijina komponenta za obravnavo pošte."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Nastavitve koledarja"
+
+#: 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 ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "Ustvari ali uredi poštne račune in ostale nastavitve"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolucija "
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Nastavitev Evolucijine pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolucijin setavljalnik pošte."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
 msgstr "Evolucijin setavljalnik pošte."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Evolucijina komponenta za povzetke."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Nastavitev Evolucijine pošte"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Vmesnik za nastavitev pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail folder viewer"
 msgstr "Evolucijina komponenta za poštne mape."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Evolucijina komponenta za tovarne poštnih map."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Nastavitev Evolucijine pošte"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Tovarna za Evolucijinega skladatelja."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolucijin veznik Koledarja"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Mail Summary component."
-msgstr "Tovarna za komponento povzetka pošte."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Nastavitve"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Mail configuration interface"
-msgstr "Vmesnik za nastavitev pošte"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Poštni račun"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Nastavitve"
 
-#: mail/component-factory.c:100
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Mapa, ki vsebuje pošto"
 
-#: mail/component-factory.c:101
-msgid "Mail storage folder (internal)"
-msgstr "Mapa v kateri se hrani pošta (notranja)"
+#: mail/component-factory.c:117
+#, fuzzy
+msgid "Public Mail"
+msgstr "javno"
+
+#: mail/component-factory.c:117
+#, fuzzy
+msgid "Public folder containing mail"
+msgstr "Mapa, ki vsebuje pošto"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Navidezne smeti"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Mapa navideznih smeti"
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Nisem se mogel povezati s hrambo: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Ta mapa ne more vsebovati sporočil."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Lastnosti..."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Spremeni lastnosti te mape"
 
-#: mail/component-factory.c:800
+#: mail/component-factory.c:818
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10282,258 +11885,286 @@ msgstr ""
 "Nekatere vaše nastavitve pošte se zdijo neveljavne. Prosim, preverite, če je "
 "vse v redu."
 
-#: mail/component-factory.c:971
+#: mail/component-factory.c:997
+msgid "You have not set a mail transport method"
+msgstr "Niste nastavili postopka prenašanja pošte"
+
+#: mail/component-factory.c:1020
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Novo poštno sporočilo"
 
-#: mail/component-factory.c:971 ui/evolution-mail-global.xml.h:19
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "_Pošlji sporočilo"
 
-#: mail/component-factory.c:998
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Ne morem inicializirati Evolucijine komponente za pošto."
+#: mail/component-factory.c:1061
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Sestavi novo sporočilo"
+
+#: mail/component-factory.c:1069
+#, fuzzy
+msgid "New Message Post"
+msgstr "Novo sporočilo"
 
-#: mail/component-factory.c:1007
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Ne morem inicializirati Evolucijine komponente za nastavitev pošte."
+#: mail/component-factory.c:1069
+#, fuzzy
+msgid "_Post Message"
+msgstr "Na_tisni sporočilo"
 
-#: mail/component-factory.c:1013
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Ne morem inicializirati Evolucijine komponente za podatke o mapah"
+#: mail/component-factory.c:1070
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Novo poštno sporočilo"
+
+#: mail/component-factory.c:1353
+#, fuzzy
+msgid "Connecting..."
+msgstr "Vzpostavljam povezavo s strežnikom..."
 
-#: mail/component-factory.c:1230
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser-ui.c:348
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Lastnosti za \"%s\""
 
-#: mail/folder-browser-ui.c:350
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Lastnosti"
 
-#: mail/folder-browser.c:299 mail/mail-display.c:300 mail/mail-display.c:809
+#: 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 "Nisem mogel ustvariti začasnega imenika: %s"
 
-#: mail/folder-browser.c:754
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr "%d novih"
 
-#: mail/folder-browser.c:757 mail/folder-browser.c:765
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:787
 #, c-format
 msgid "%d hidden"
 msgstr "%d skritih"
 
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:789
 #, c-format
 msgid "%d visible"
 msgstr "%d vidnih"
 
-#: mail/folder-browser.c:766
+#: mail/folder-browser.c:794
 #, c-format
 msgid "%d selected"
 msgstr "%d izbranih"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr "%d neposlanih"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d sent"
 msgstr "%d poslanih"
 
-#: mail/folder-browser.c:775
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr "skupaj %d"
 
-#: mail/folder-browser.c:1062
-msgid "Create vFolder from Search"
-msgstr "Ustvari vMapo iz iskanja"
+#: mail/folder-browser.c:1182
+msgid "Create _Virtual Folder From Search..."
+msgstr "Iz iskanja ustvari na_videzno mapo..."
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "vMapa glede na p_redmet"
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _pošiljatelja"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na pre_jemnike"
 
-#: mail/folder-browser.c:1449
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "vMapa glede na poštni se_znam"
 
-#: mail/folder-browser.c:1453
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "Filter glede na za_devo"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "Filter glede na pošilja_telja"
 
-#: mail/folder-browser.c:1455
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "Filter glede na preje_mnike"
 
-#: mail/folder-browser.c:1456 mail/folder-browser.c:1693
+#: mail/folder-browser.c:1739 mail/folder-browser.c:2063
 msgid "Filter on _Mailing List"
 msgstr "Filter glede na p_oštni seznam"
 
-#: mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "_Uredi kot novo sporočilo..."
 
-#: mail/folder-browser.c:1465 ui/evolution-mail-message.xml.h:124
-msgid "_Save As..."
-msgstr "_Shrani kot..."
-
-#: mail/folder-browser.c:1466
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "Na_tisni"
 
-#: mail/folder-browser.c:1470 ui/evolution-mail-message.xml.h:123
+#: mail/folder-browser.c:1763 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/folder-browser.c:1471 ui/evolution-mail-message.xml.h:79
+#: mail/folder-browser.c:1764 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Odgovori na _seznam"
 
-#: mail/folder-browser.c:1472 ui/evolution-mail-message.xml.h:78
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: mail/folder-browser.c:1477
+#: mail/folder-browser.c:1770
 msgid "Follo_w Up..."
 msgstr "Nave_zuj se..."
 
-#: mail/folder-browser.c:1478
+#: mail/folder-browser.c:1771
 msgid "Fla_g Completed"
 msgstr "Postavi zastavico končano"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1772
 msgid "Cl_ear Flag"
 msgstr "Zb_riši zastavico"
 
 #. separator here?
-#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:49
+#: mail/folder-browser.c:1776 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Označi kot _prebrano"
 
-#: mail/folder-browser.c:1484
+#: mail/folder-browser.c:1777
 msgid "Mark as _Unread"
 msgstr "Označi kot _neprebrano"
 
-#: mail/folder-browser.c:1485
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "Označi kot po_membno"
 
-#: mail/folder-browser.c:1486
+#: mail/folder-browser.c:1779
 msgid "_Mark as Unimportant"
 msgstr "Označi kot _nepomembno"
 
-#: mail/folder-browser.c:1490
+#: mail/folder-browser.c:1784
+msgid "U_ndelete"
+msgstr "O_dbriši"
+
+#: mail/folder-browser.c:1788
 msgid "Mo_ve to Folder..."
 msgstr "Presta_vi v mapo..."
 
-#: mail/folder-browser.c:1491 ui/evolution-addressbook.xml.h:37
+#: mail/folder-browser.c:1789 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo..."
 
-#: mail/folder-browser.c:1493
-msgid "U_ndelete"
-msgstr "O_dbriši"
-
-#: mail/folder-browser.c:1497
+#: mail/folder-browser.c:1797
 msgid "Add Sender to Address_book"
 msgstr "Pošiljatelja dodaj v _adresar"
 
-#: mail/folder-browser.c:1500
+#: mail/folder-browser.c:1801
 msgid "Appl_y Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:1502
+#: mail/folder-browser.c:1805
 msgid "Crea_te Rule From Message"
 msgstr "Iz sporočila ustvari _pravilo"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:2064
 msgid "VFolder on M_ailing List"
 msgstr "vMapa glede na dopisni seznam"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:2066
+#, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter glede na dopisni seznam (%s)"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:2067
+#, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "vMapa glede na dopisni seznam (%s)"
 
-#: mail/folder-browser.h:26
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Privzeto"
 
-#: mail/folder-info.c:64
+#: mail/folder-info.c:70
 msgid "Getting Folder Information"
 msgstr "Dobivam podatke o mapi"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "Tovarna za uvoz mbox predalov v Evolucijo"
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Evolucijin setavljalnik pošte."
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolucijin setavljalnik pošte."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Uvozi mbox daoteke v Evolucijo"
+#: 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 "Tovarna za uvoz pošte Outlook Express 4 v Evolucijo"
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolucijin setavljalnik pošte."
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Uvozi datoteke Outlook Express 4 v Evolucijo"
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
 
-#: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "Telo vsebuje"
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
 
-#: mail/local-config.glade.h:2
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Evolucijin setavljalnik pošte."
+
+#: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Trenutna oblika hranjenja:"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "Ustvarjanje kazala:"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Vrsta poštnega predala"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "Telo vsebuje"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Nova oblika hranjenja:"
 
-#: mail/local-config.glade.h:6
+#: mail/local-config.glade.h:4
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
@@ -10543,121 +12174,129 @@ msgstr ""
 "napaka (na primer pomanjkanje prosotra na disku) ni nujno samodejno\n"
 " odpravljiva. Prosimo to možnost uprabljajte pazljivo."
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:7
 msgid "maildir"
 msgstr "maildir"
 
-#: mail/local-config.glade.h:10
+#: mail/local-config.glade.h:8
 msgid "mbox"
 msgstr "mbox"
 
-#: mail/local-config.glade.h:11
+#: mail/local-config.glade.h:9
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor.c:102
 msgid "You have not filled in all of the required information."
 msgstr "Niste vpisali vseh potrebnih podatkov."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-msgid "Evolution News Editor"
-msgstr "Urejevalnik Evolucijinih novic"
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:146
 msgid "Evolution Account Editor"
 msgstr "Urejevalnik Evolucijinih računov"
 
-#: mail/mail-account-gui.c:52 mail/mail-config.glade.h:15
-msgid "Always"
-msgstr "Vedno"
-
-#: mail/mail-account-gui.c:53 mail/mail-config.glade.h:125
-msgid "Whenever Possible"
-msgstr "Kadar je možno"
-
-#: mail/mail-account-gui.c:54 mail/mail-config.glade.h:71
-msgid "Never"
-msgstr "Nikoli"
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
+msgid "_Host:"
+msgstr "_Gostitelj:"
 
-#: mail/mail-account-gui.c:1039 mail/mail-account-gui.c:1040
-#: mail/mail-account-gui.c:1279 mail/mail-account-gui.c:1284
-#: mail/mail-config.glade.h:88
-msgid "Random"
-msgstr "Naključno"
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
+#, fuzzy
+msgid "User_name:"
+msgstr "_Uporabniško ime:"
 
-#: mail/mail-account-gui.c:1109 mail/mail-account-gui.c:1124
-#: mail/mail-accounts.c:904
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-"Prosim navedite datoteko s podpisom\n"
-"v naprednem odseku nastavitev podpisa."
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
+msgid "_Path:"
+msgstr "_Pot:"
 
-#: mail/mail-account-gui.c:1790
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr "Ne morete ustvariti dveh računov z enakim imenom."
 
-#: mail/mail-accounts.c:152
-msgid " (default)"
-msgstr " (privzeto)"
+#: mail/mail-accounts.c:231
+msgid "Are you sure you want to delete this account?"
+msgstr "Ste prepričani, da želite zbrisati ta račun?"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:239
+msgid "Don't delete"
+msgstr "Ne zbriši"
+
+#: 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 "Izključi"
 
-#: mail/mail-accounts.c:199
+#: 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 "Vključi"
 
-#: mail/mail-accounts.c:303
-msgid "Are you sure you want to delete this account?"
-msgstr "Ste prepričani, da želite zbrisati ta račun?"
-
-#: mail/mail-accounts.c:307
-msgid "Don't delete"
-msgstr "Ne zbriši"
+#. translators: default account indicator
+#: mail/mail-accounts.c:433
+#, fuzzy
+msgid "[Default]"
+msgstr "Privzeto"
 
-#: mail/mail-accounts.c:310
-msgid "Really delete account?"
-msgstr "Resnično zbriši račun?"
+#: 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 "Vključeno"
 
-#: mail/mail-accounts.c:543 mail/mail-accounts.c:547
-msgid "Are you sure you want to delete this news account?"
-msgstr "Ste prepričani, želite zbrisati ta novičarski račun?"
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "Ime _računa:"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:1247 mail/mail-config.glade.h:64
-msgid "Mail Settings"
-msgstr "Nastavitev pošte"
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Portoriko"
 
-#: mail/mail-autofilter.c:72
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Pošta za %s"
 
-#: mail/mail-autofilter.c:217
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Zadeva je %s"
 
-#: mail/mail-autofilter.c:233
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: mail/mail-autofilter.c:289
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s poštnih seznamov"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:323
 msgid "Add Filter Rule"
 msgstr "Filtru dodaj pravilo"
 
-#: mail/mail-callbacks.c:96
+#: mail/mail-autofilter.c:372
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:378
+#, fuzzy, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+"Sledeče vMape:\n"
+"%s so uporabljale odstranjeno mapo:\n"
+"    '%s'\n"
+"in so bile posodobljene."
+
+#. 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 "Tega sporočila ne kaži več."
+
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10669,7 +12308,16 @@ msgstr ""
 "ali skladate pošto.\n"
 "Bi ga želeli nastaviti sedaj?"
 
-#: mail/mail-callbacks.c:145
+#: mail/mail-callbacks.c:211
+#, fuzzy
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"Nastaviti morate sovjo identiteto\n"
+"preden lahko skladate pošto."
+
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10677,7 +12325,7 @@ msgstr ""
 "Nastaviti morate sovjo identiteto\n"
 "preden lahko skladate pošto."
 
-#: mail/mail-callbacks.c:159
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10685,24 +12333,21 @@ msgstr ""
 "Nastaviti morate način prenosa pošte\n"
 "preden lahko skladate pošto."
 
-#: mail/mail-callbacks.c:189
-msgid "You have not set a mail transport method"
-msgstr "Niste nastavili postopka prenašanja pošte"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:224
+#: mail/mail-callbacks.c:254
+#, fuzzy
 msgid ""
-"You are sending an HTML-formatted message, but the following recipients do "
-"not want HTML-formatted mail:\n"
+"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 ""
 "Pošiljate pošto v obliki HTML, a naslednji prejemniki ne želijo prejemati "
 "takšne pošte:\n"
 
-#: mail/mail-callbacks.c:239
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "Vseeno pošlji?"
 
-#: mail/mail-callbacks.c:281
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10710,7 +12355,7 @@ msgstr ""
 "To poročilo nima 'zadeve'.\n"
 "Resnično pošlji?"
 
-#: mail/mail-callbacks.c:325
+#: 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."
@@ -10718,11 +12363,11 @@ msgstr ""
 "Ker je seznam kontaktov, ki mu pošiljate, nastavljen, da skrije seznam "
 "naslovov, bo to sporočilo vsebovalo le naslovnike bcc."
 
-#: mail/mail-callbacks.c:329
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr "To sporočilo vsebuje le prejemnike bcc"
 
-#: mail/mail-callbacks.c:333
+#: mail/mail-callbacks.c:322
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10732,15 +12377,11 @@ msgstr ""
 "To(očitno-za).\n"
 "Vseeno pošlji?"
 
-#: mail/mail-callbacks.c:438
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr "Navesti morate naslovnike, če želiti poslati sporočilo."
 
-#: mail/mail-callbacks.c:527
-msgid "You must configure an account before you can send this email."
-msgstr "Nastaviti morate račun preden lahko pošljete to e-pošto."
-
-#: mail/mail-callbacks.c:646
+#: 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?"
@@ -10748,28 +12389,28 @@ msgstr ""
 "Ni mogoče odpreti mape osnutkov za ta račun.\n"
 "Želite uporabiti privzeto mapo osnutkov?"
 
-#: mail/mail-callbacks.c:979
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "neznan pošiljatelj"
 
-#: mail/mail-callbacks.c:983
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Na %s, %Y-%m-%d ob %H:%M, je %%s napisal(a):"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr "Prestavi sporočilo(a) v"
 
-#: mail/mail-callbacks.c:1437 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr "Kopiraj sporočilo(a) v"
 
-#: mail/mail-callbacks.c:2085
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ste prepričani, da želite urediti vseh %d sporočil?"
 
-#: mail/mail-callbacks.c:2110
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10777,7 +12418,7 @@ msgstr ""
 "Urejate lahko le sporočila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:2149
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10785,39 +12426,46 @@ msgstr ""
 "Znova lahko pošljete le sporočila\n"
 " iz mape Poslano."
 
-#: mail/mail-callbacks.c:2163
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Ste prepričani, da želite znova poslati vseh %d sporočil?"
 
-#: mail/mail-callbacks.c:2189
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "Izbrano ni nilo nobeno sporočilo"
 
-#: mail/mail-callbacks.c:2288
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"Nisem mogel odpreti URIja `%s':\n"
+"%s"
+
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"%s že obstaja\n"
+"Jo želite prepisati?"
+
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "Shrani sporočilo kot..."
 
-#: mail/mail-callbacks.c:2290
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "Shrani sporočila kot..."
 
-#: mail/mail-callbacks.c:2352
-msgid "Go to next folder with unread messages?"
-msgstr "Pojdi v naslednjo mapo z neprebranimi sporočili?"
-
-#: mail/mail-callbacks.c:2359
-msgid ""
-"There are no more new messages in this folder.\n"
-"Would you like to go to the next folder?"
-msgstr ""
-"V tej mapi ni več novih sporočil.\n"
-"Želite iti v naslednjo mapo?"
-
-#: mail/mail-callbacks.c:2588
+#: 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 ""
@@ -10826,7 +12474,7 @@ msgstr ""
 " \n"
 "Resnično zbriši ta sporočila? "
 
-#: mail/mail-callbacks.c:2698
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10835,75 +12483,116 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2710
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2831
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stran %d od %d"
 
-#: mail/mail-callbacks.c:2835
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "Natisni sporočilo"
 
-#: mail/mail-callbacks.c:2862
-msgid "US-Letter"
-msgstr "ZDA-pismo"
-
-#: mail/mail-callbacks.c:2897
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "Tiskanje sporočila ni uspelo"
 
-#: mail/mail-callbacks.c:3063
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Ste prepričani, želite odpreti vseh %d sporočil v ločenih oknih?"
 
-#: mail/mail-config-druid.c:146
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
+msgid "Unnamed"
+msgstr "Neimenovan"
+
+#: mail/mail-composer-prefs.c:335
+msgid "You must specify a valid script name."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
+#, fuzzy
+msgid "[script]"
+msgstr "_Skripta"
+
+#: mail/mail-composer-prefs.c:864
+#, fuzzy
+msgid "Language(s)"
+msgstr "Jezik"
+
+#: mail/mail-composer-prefs.c:906
+#, fuzzy
+msgid "Add script signature"
+msgstr "Dodaj nov podpis"
+
+#: mail/mail-composer-prefs.c:926
+#, fuzzy
+msgid "Signature(s)"
+msgstr "Podpisi"
+
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr "Identiteta"
+
+#: mail/mail-config-druid.c:382
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Prosimo spodaj vpišite svoje ime in e-poštni naslov. Polj \"po želji\" ni "
 "potrebno izpolniti, razen, če ne želite vključiti te podatke v e-pošto, ki "
 "jo boste pošiljali."
 
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+msgid "Receiving Mail"
+msgstr "Sprejemanje pošte"
+
+#: mail/mail-config-druid.c:390
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Prosim, spodaj vpišite podatke o vašem strežniku dohodne pošte. Če jih ne "
 "veste se obrnite na vašega sistemskega administratorja ali ponudnika dostopa "
 "do interneta."
 
-#: mail/mail-config-druid.c:150
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Prosim, izberite med naslednjimi možnostmi"
 
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:400
+msgid "Sending Mail"
+msgstr "Pošiljanje pošte"
+
+#: mail/mail-config-druid.c:402
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Prosim, spodaj vpišite podatke o načinu odpošiljanja pošte. Če jih ne veste "
 "se obrnite na vašega sistemskega administratorja ali ponudnika dostopa do "
 "interneta."
 
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "Upravljanje z računom"
+
+#: mail/mail-config-druid.c:409
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "S procesom nastavljanja pošte ste skoraj pri koncu. Identiteta, strežnik "
 "prihajajoče pošte\n"
@@ -10912,163 +12601,137 @@ msgstr ""
 "Prosim, v prostor spodaj vpišite ime za ta račun. Ime bo uporabljeno le za "
 "prikaz."
 
-#. set window title
-#: mail/mail-config-druid.c:628
-msgid "Evolution Account Assistant"
-msgstr "Evolucijin druid za račune"
-
-#: mail/mail-config.c:612
-#, c-format
-msgid "Account %d"
-msgstr "Račun %d"
-
-#: mail/mail-config.c:2326
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
-"Nisem mogel dobiti vhodnega predala za novo hrambo pošte:\n"
-"%s\n"
-"Bližnjica ne bo ustvarjena."
-
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:2337
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Dohdona pošta"
-
-#: mail/mail-config.c:2587
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Preverjam storitev"
 
-#: mail/mail-config.c:2665 mail/mail-config.c:2669
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 msgid "Connecting to server..."
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
-#: mail/mail-config.c:2860
-msgid "Unnamed"
-msgstr "Neimenovan"
-
-#: mail/mail-config.c:3035
-msgid "Cannot execute signature script"
-msgstr "Nisem mogel izvesti skripte podpisa"
-
-#: mail/mail-config.glade.h:1
-msgid "                        "
-msgstr "                        "
-
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr "_Preveri za podprte vrste  "
 
-#: mail/mail-config.glade.h:3
-msgid " color"
-msgstr " barvo"
-
 #: mail/mail-config.glade.h:4
-msgid "&lt;&lt; S_imple"
-msgstr "&lt;&lt; _Enostavno"
-
-#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL v to zgradbi Evolucije ni vgrajen)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL v tej zgradbi Evolucije ni vgrajen)"
 
 #: mail/mail-config.glade.h:7
-msgid "/home/rodo/cvs/evolution/mail/"
-msgstr "/home/rodo/cvs/evolution/mail/"
-
-#: mail/mail-config.glade.h:8
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Kadar pošiljam šifrirano pošto, _vedno šifriraj sebi"
 
-#: mail/mail-config.glade.h:9
-msgid "Account"
-msgstr "Račun"
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Račun %d"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Podatki o računu"
 
-#: mail/mail-config.glade.h:11 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "Upravljanje z računom"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Add Sc_ript"
+msgstr "_Skripta"
 
 #: mail/mail-config.glade.h:12
-msgid "Accounts"
-msgstr "Računi"
+#, fuzzy
+msgid "Add new signature..."
+msgstr "Dodaj nov podpis"
 
 #: mail/mail-config.glade.h:13
-msgid "Ad_vanced &gt;&gt;"
-msgstr "Napredno &gt;&gt;"
+#, fuzzy
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "Kadar pošiljam šifrirano pošto, _vedno šifriraj sebi"
 
-#: mail/mail-config.glade.h:14
-msgid "Add new signature"
-msgstr "Dodaj nov podpis"
+#: mail/mail-config.glade.h:15
+#, fuzzy
+msgid "Alwa_ys sign outgoing messages when using this account"
+msgstr "Ob uporabi tega računa vedno _podpiši odhodno pošto"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Vedno pošlji _slepe kopije (Bcc) na:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Vedno pošlji _kopije (Cc) na:"
 
-#: mail/mail-config.glade.h:18
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr "Kadar pošiljam ši_frirano pošto, vedno šifriraj sebi"
-
 #: mail/mail-config.glade.h:19
-msgid "Always _sign outgoing messages when using this account"
-msgstr "Ob uporabi tega računa vedno _podpiši odhodno pošto"
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Attach original message"
+msgstr "Priloži datoteko k sporočilu"
+
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Priloga"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Avtentifikacija"
 
-#: mail/mail-config.glade.h:22
-msgid "Beep when new mail arrives"
-msgstr "Ob prihodu nove pošte zapiskaj"
-
 #: mail/mail-config.glade.h:23
-msgid "Checking for New Mail"
-msgstr "Preverjam za novo pošto"
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "_Samodejno preveri za novo pošto"
 
 #: mail/mail-config.glade.h:24
-msgid "Composer"
-msgstr "Skladatelj"
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
 
 #: mail/mail-config.glade.h:25
-msgid "Composing Messages"
-msgstr "Sestavljanje sporočil"
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
 
 #: mail/mail-config.glade.h:26
-msgid "Configuration"
-msgstr "Nastavitev"
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Neznan nabor znakov: %s"
 
 #: mail/mail-config.glade.h:27
-msgid "Confirm when Expunging a folder"
-msgstr "Potrdi ob uničevanju mape"
+#, fuzzy
+msgid "C_olors"
+msgstr "_Zapri"
 
 #: mail/mail-config.glade.h:28
+msgid "Check spelling while I _type"
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Checking for New Mail"
+msgstr "Preverjam za novo pošto"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Barva za opravila, ki so na vrsti danes"
+
+#: mail/mail-config.glade.h:31
+msgid "Composing Messages"
+msgstr "Sestavljanje sporočil"
+
+#: mail/mail-config.glade.h:32
+msgid "Configuration"
+msgstr "Nastavitev"
+
+#: 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 ""
 "Čestitke, nastavljanje vaše pošte je končano.\n"
 "\n"
@@ -11077,677 +12740,763 @@ msgstr ""
 "\n"
 "Kliknite \"Končaj\" za shranitev vaših nastavitev."
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Privzeto"
 
-#: mail/mail-config.glade.h:35
-msgid "Default Forward style is: "
-msgstr "Privzet način posredovanja naprej je: "
-
-#: mail/mail-config.glade.h:36
-msgid "Default character encoding: "
-msgstr "Privzet nabor znakov: "
-
-#: mail/mail-config.glade.h:37
-msgid "Defaults"
-msgstr "Privzeto"
-
-#: mail/mail-config.glade.h:38
-msgid "Delete selected signature"
-msgstr "Zbriši izbran podpis"
-
-#: mail/mail-config.glade.h:40
-msgid "Digital IDs..."
-msgstr "Digitalni IDji..."
-
 #: mail/mail-config.glade.h:41
-msgid "Display"
-msgstr "Prikaz"
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Privzeta prioriteta:"
 
 #: mail/mail-config.glade.h:42
-msgid "Do not notify me when new mail arrives"
-msgstr "Ob prihodu nove pošte me ne obvesti"
-
-#: mail/mail-config.glade.h:43 shell/glade/evolution-startup-wizard.glade.h:2
-msgid "Done"
-msgstr "Opravljeno"
+#, fuzzy
+msgid "Default character _encoding:"
+msgstr "Privzet nabor znakov: "
 
-#: mail/mail-config.glade.h:44 shell/e-local-storage.c:174
-msgid "Drafts"
-msgstr "Osnutki"
+#: mail/mail-config.glade.h:43
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Sprejemanje pošte"
 
 #: mail/mail-config.glade.h:45
-msgid "E_mail address:"
-msgstr "_E-poštni naslov:"
+msgid "Digital IDs..."
+msgstr "Digitalni IDji..."
 
 #: mail/mail-config.glade.h:46
-msgid "E_nable"
-msgstr "_Vključi"
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Ne morem dobiti sporočila"
 
 #: mail/mail-config.glade.h:47
-msgid "Ed_it..."
-msgstr "_Uredi..."
+msgid "Don't sign _meeting requests (for Outlook compatibility)"
+msgstr ""
 
-#: mail/mail-config.glade.h:48
-msgid "Edi_t..."
-msgstr "Ur_edi..."
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
+msgid "Done"
+msgstr "Opravljeno"
 
 #: mail/mail-config.glade.h:49
-msgid "Edit signature content in editor"
-msgstr "Uredi vsebino podpisa v urejevalniku"
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Mapa _osnutkov:"
 
 #: mail/mail-config.glade.h:50
-msgid "Enabled"
-msgstr "Vključeno"
+msgid "E_nable"
+msgstr "_Vključi"
 
 #: mail/mail-config.glade.h:51
-msgid "Execute Command..."
-msgstr "Izvrši ukaz..."
+#, fuzzy
+msgid "Emacs"
+msgstr "vzhod"
 
 #: mail/mail-config.glade.h:52
-msgid "File containing signature"
-msgstr "Datoteka, ki vsebuje podpis"
+#, fuzzy
+msgid "Email Accounts"
+msgstr "Poštni račun"
 
 #: mail/mail-config.glade.h:53
-msgid "Get Digital ID..."
-msgstr "Dobi digitalni ID..."
+#, fuzzy
+msgid "Email _address:"
+msgstr "_E-poštni naslov:"
 
 #: mail/mail-config.glade.h:54
-msgid "Hide advanced settings"
-msgstr "Skrij napredne nastavitve"
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "Ob izhodu _sprazni mapo smeti"
 
 #: mail/mail-config.glade.h:55
-msgid "IMAPv4 "
-msgstr "IMAPv4 "
+msgid "Evolution Account Assistant"
+msgstr "Evolucijin druid za račune"
 
-#: mail/mail-config.glade.h:56 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr "Identiteta"
+#: mail/mail-config.glade.h:56
+msgid "Execute Command..."
+msgstr "Izvrši ukaz..."
 
 #: mail/mail-config.glade.h:57
-msgid "If selected signature will be included in random signature list"
-msgstr "Če bo izbran podpis vključen v seznamu naključnih podpisov"
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "se konča z"
 
 #: mail/mail-config.glade.h:58
-msgid "In HTML mail"
-msgstr "V pošti HTML"
+#, fuzzy
+msgid "Font Properties"
+msgstr "Lastnosti računa"
 
 #: mail/mail-config.glade.h:59
-msgid "Include in _random signatures list"
-msgstr "Vključi v seznamu na_ključnih podpisov"
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Posredovana sporočila"
 
 #: mail/mail-config.glade.h:60
+msgid "Get Digital ID..."
+msgstr "Dobi digitalni ID..."
+
+#: mail/mail-config.glade.h:61
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "_Osvetli citiranja z"
+
+#: mail/mail-config.glade.h:62
+msgid "IMAPv4 "
+msgstr "IMAPv4 "
+
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Kot del sporočila"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:62
-msgid "List of signatures"
-msgstr "Seznam podpisov"
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "Shrani in zapri"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:69
+#, fuzzy
+msgid "Loading Images"
+msgstr "Naloži _slike"
+
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Nastavitev pošte"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Mesto poštnega predala"
 
-#: mail/mail-config.glade.h:66
-msgid "Make this my _default account"
-msgstr "Naj bo to moj p_rivzet račun"
-
-#: mail/mail-config.glade.h:67
-msgid "NNTP Server:"
-msgstr "Strežnik NNTP"
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Composer"
+msgstr "Sporočila"
 
-#: mail/mail-config.glade.h:68
-msgid "N_ew..."
-msgstr "N_ova..."
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Message Display"
+msgstr "Prikaz _sporočila"
 
-#: mail/mail-config.glade.h:69
-msgid "Name of selected signature"
-msgstr "Ime izbranega podpisa"
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Sporočilo vsebuje"
 
-#: mail/mail-config.glade.h:70
-msgid "Ne_w..."
-msgstr "No_va..."
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Microsoft"
+msgstr "Mikronezija"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Opozorilo o novi pošti"
 
-#: mail/mail-config.glade.h:73
-msgid "News"
-msgstr "Novice"
+#: 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:75
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Podatki po želji"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organi_zacija:"
+
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _ključa PGP/GPG:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Izberi barvo"
 
-#: mail/mail-config.glade.h:81
-msgid "Play sound file when new mail arrives"
-msgstr "Ob prihodu nove pošte zaigraj zvočno datoteko"
+#: mail/mail-config.glade.h:89
+#, fuzzy
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr "Zahtevaj potrditev ob pošiljanju sporočil, ki imajo le BCC prejemnike"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:90
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:83
-msgid "Prompt when sending HTML messages to contacts that don't want them"
-msgstr ""
-"Zahtevaj potrditev ob pošiljanju v obliki HTML tistim stikom, ki tega nočejo"
-
-#: mail/mail-config.glade.h:84
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Zahtevaj potrditev ob pošiljanju sporočil bre_z predmeta"
-
-#: mail/mail-config.glade.h:85
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "Zahtevaj potrditev ob pošiljanju sporočil, ki imajo le BCC prejemnike"
+#: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Natisni izbrane stike"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr "Poštni imenik Qmail"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "Quote original message"
+msgstr "Ne morem dobiti sporočila"
+
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr "Citirano"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr "Zapo_mni si to geslo"
 
-#: mail/mail-config.glade.h:90 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:96
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Odgovori-na:"
+
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr "Sprejemam e-pošto"
 
-#: mail/mail-config.glade.h:91
-msgid "Receiving Mail"
-msgstr "Sprejemanje pošte"
-
-#: mail/mail-config.glade.h:92
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Možnosti sprejema"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Zapomni si geslo"
+
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "Potrebni podatki"
 
-#: mail/mail-config.glade.h:95
-msgid "Same as text"
-msgstr "Enako kot besedilo"
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Privzeto"
 
-#: mail/mail-config.glade.h:96
-msgid "Script which is run before signature loading from specified filename"
-msgstr "Skripta, ki se požene pred nalaganjem podpisa iz navedene datoteke"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+msgstr "Varnost"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "Varni MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:98
-msgid "Security"
-msgstr "Varnost"
+#: mail/mail-config.glade.h:105
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:99
-msgid "Select Filter Log file..."
-msgstr "Izberi datoteko za dnevnik filtra..."
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:100
-msgid "Select PGP binary"
-msgstr "Izberi datoteko PGP"
+#: mail/mail-config.glade.h:107
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:101 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
 msgstr "Pošiljam e-pošto"
 
-#: mail/mail-config.glade.h:102
-msgid "Sending Mail"
-msgstr "Pošiljanje pošte"
-
-#: mail/mail-config.glade.h:104 mail/message-list.etspec.h:9
-#: shell/e-local-storage.c:177
-msgid "Sent"
-msgstr "Poslano"
-
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "Mapa _poslanih sporočil:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "Poslana sporočila in osnutki"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr "St_režnik zahteva avtentifikacijo"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Nastavitev strežnika"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "Vrs_ta strežnika:"
 
-#: mail/mail-config.glade.h:110
-msgid "Show advanced settings"
-msgstr "Kaži napredne nastavitve"
-
-#: mail/mail-config.glade.h:111
-msgid "Signatures"
-msgstr "Podpisi"
-
-#: mail/mail-config.glade.h:112
-msgid "Source"
-msgstr "Izvorna koda"
-
-#: mail/mail-config.glade.h:113
-msgid "Source Information"
-msgstr "Podatki o izvorni kodi"
-
-#: mail/mail-config.glade.h:114
-msgid "Sources"
-msgstr "Viri"
+#: mail/mail-config.glade.h:116
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Bližnjice"
 
-#: mail/mail-config.glade.h:115
-msgid "Specify filename:"
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Specify _filename:"
 msgstr "Navedite ime datoteke:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Običajnen Unix poštni predal"
 
-#: mail/mail-config.glade.h:117
-msgid "Text _Signature:"
-msgstr "Besedilo _podpisa:"
+#: 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:119
+#: 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:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
-"Vpišite ime s katerimi želite imenovati ta račun. Na primer:\"službeni\" "
-"ali \"domači\"."
+"Vpišite ime s katerimi želite imenovati ta račun. Na primer:\"službeni\" ali "
+"\"domači\"."
 
-#: mail/mail-config.glade.h:121
-msgid "Use s_ecure connection (SSL):"
-msgstr "Uporabi _varno povezavo (SSL)"
+#: mail/mail-config.glade.h:128
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Spremenljivo"
 
-#: mail/mail-config.glade.h:122
+#: 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 ""
 "Dobrodošli v Evolucijinem druidu za nastavitev pošte.\n"
 "\n"
 "Kliknite \"Naprej\" za začetek. "
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "XEmacs"
+msgstr "vzhod"
+
+#: mail/mail-config.glade.h:136
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_Podpisi"
+
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Vedno naloži slike s spleta"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Ob uporabi tega računa _vedno podpiši odhodno pošto"
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Način _avtentifikacije: "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "Način _avtentifikacije: "
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "_Samodejno preveri za novo pošto"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "_Samodejno preveri za novo pošto"
+
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "_Beep when new mail arrives"
+msgstr "Ob prihodu nove pošte zapiskaj"
+
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "ID _certifikata:"
 
-#: mail/mail-config.glade.h:134
-msgid "_Drafts folder:"
-msgstr "Mapa _osnutkov:"
+#: mail/mail-config.glade.h:145
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "Potrdi ob uničevanju mape"
 
-#: mail/mail-config.glade.h:136
-msgid "_Edit..."
-msgstr "_Uredi..."
+#: mail/mail-config.glade.h:146
+#, fuzzy
+msgid "_Default signature:"
+msgstr "Zbriši vse razen podpisa"
 
-#: mail/mail-config.glade.h:137
-msgid "_Empty trash folders on exit"
-msgstr "Ob izhodu _sprazni mapo smeti"
+#: mail/mail-config.glade.h:147
+#, fuzzy
+msgid "_Defaults"
+msgstr "Privzeto"
 
-#: mail/mail-config.glade.h:138
-msgid "_Filename"
-msgstr "_Ime datoteke:"
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Do not notify me when new mail arrives"
+msgstr "Ob prihodu nove pošte me ne obvesti"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:151
+#, fuzzy
+msgid "_Enable"
+msgstr "Vključi"
+
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Posreduj naprej kot"
+
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "_Polno ime:"
 
-#: mail/mail-config.glade.h:140
-msgid "_HTML Signature:"
-msgstr "Podpis _HTML:"
-
-#: mail/mail-config.glade.h:141
-msgid "_Highlight citations with"
-msgstr "_Osvetli citiranja z"
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "V pošti HTML"
 
-#: mail/mail-config.glade.h:142
-msgid "_Host:"
-msgstr "_Gostitelj:"
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Identity"
+msgstr "Identiteta"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "_Naloži slike, če je pošiljatelj v adresarju"
 
-#: mail/mail-config.glade.h:144
-msgid "_Log filter actions to:"
-msgstr "Zapisuj dejanja filtra v:"
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Naj bo to moj p_rivzet račun"
 
-#: mail/mail-config.glade.h:145
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:160
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "_Označi sporočila kot prebrana po:"
 
-#: mail/mail-config.glade.h:146
-msgid "_Name"
-msgstr "_Ime"
-
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "_Nikoli ne naloži slik s spleta"
 
-#: mail/mail-config.glade.h:149
-msgid "_Organization:"
-msgstr "_Organizacija:"
+#: mail/mail-config.glade.h:164
+#, fuzzy
+msgid "_Play sound file when new mail arrives"
+msgstr "Ob prihodu nove pošte zaigraj zvočno datoteko"
 
-#: mail/mail-config.glade.h:150
-msgid "_PGP binary path:"
-msgstr "Pot do izvršljive datoteke _PGP"
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgstr ""
+"Zahtevaj potrditev ob pošiljanju v obliki HTML tistim stikom, ki tega nočejo"
 
-#: mail/mail-config.glade.h:151
-msgid "_Path:"
-msgstr "_Pot:"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr "Zahtevaj potrditev ob pošiljanju sporočil bre_z predmeta"
 
-#: mail/mail-config.glade.h:152
-msgid "_Remember this password"
-msgstr "_Zapomni si to geslo"
+#: mail/mail-config.glade.h:167
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Sprejemanje pošte"
 
-#: mail/mail-config.glade.h:153
-msgid "_Script"
+#: mail/mail-config.glade.h:168
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Odgovori vsem"
+
+#: mail/mail-config.glade.h:169
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:170
+#, fuzzy
+msgid "_Script:"
 msgstr "_Skripta"
 
-#: mail/mail-config.glade.h:154
-msgid "_Send mail in HTML format by default."
-msgstr "Privzeto pošiljaj pošto v _HTML obliki."
+#: mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Pošiljanje pošte"
 
-#: mail/mail-config.glade.h:155
-msgid "_Server type: "
-msgstr "Vrsta _strežnika: "
+#: mail/mail-config.glade.h:172
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Kaži čas kot"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Podpisi"
 
-#: mail/mail-config.glade.h:157
-msgid "_Username:"
-msgstr "_Uporabniško ime:"
-
-#: mail/mail-config.glade.h:158
-msgid "_every"
-msgstr "_vsakih"
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "Običajnen Unix poštni predal"
 
-#: mail/mail-config.glade.h:159
-msgid "description"
-msgstr "opis"
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "Prvotni stik:"
 
-#: mail/mail-config.glade.h:161
-msgid "newswindow1"
-msgstr "oknonovic1"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Use secure connection (SSL):"
+msgstr "Uporabi _varno povezavo (SSL)"
 
-#: mail/mail-config.glade.h:162
-msgid "placeholder"
-msgstr "držalec mesta"
+#: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
 
-#: mail/mail-config.glade.h:163
-msgid "seconds."
-msgstr "sekund."
+#: mail/mail-config.glade.h:178
+msgid "_every"
+msgstr "_vsakih"
 
-#: mail/mail-config.glade.h:164
-msgid "use _HTML for this signature"
-msgstr "za ta podpis uporabi _HTML"
+#: mail/mail-config.glade.h:179
+#, fuzzy
+msgid "color"
+msgstr " barvo"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "Nisem mogel ustvariti konteksta podpisovanja PGP."
+#: mail/mail-config.glade.h:180
+msgid "description"
+msgstr "opis"
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "Nisem mogel ustvariti konteksta preverjanja PGP."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "Nisem mogel ustvariti konteksta šifiranja PGP."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "Nisem mogel ustvariti konteksta dešifriranja PGP."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Nisem mogel ustvariti konteksta podpisa S/MIME"
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Nisem mogel ustvariti konteksta certifikatov S/MIME."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "Nisem mogel ustvariti konteksta šifriranja S/MIME."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "Nisem mogel ustvariti konteksta ovojnice S/MIME."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "Nisem mogel ustvariti konteksta dešifriranja S/MIME."
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:193
+#, fuzzy, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Datoteka z enakim imenom že obstaja.\n"
+"Naj jo prepišem?"
+
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:310
+#: mail/mail-display.c:406
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Nisem mogel ustvariti začasne datoteke '%s': %s"
 
-#: mail/mail-display.c:356
-msgid "Save to Disk..."
-msgstr "Shrani na disk..."
+#: mail/mail-display.c:454
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:358
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr "Poglej vsebino"
 
-#: mail/mail-display.c:360
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Poglej vsebino (z %s)"
 
-#: mail/mail-display.c:425
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "Skrij"
 
-#: mail/mail-display.c:446
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "zunanjem pregledovalniku"
 
-#: mail/mail-display.c:1231
+#: mail/mail-display.c:1365
+#, fuzzy
+msgid "Downloading images"
+msgstr "_Omejitev prenosov"
+
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "Nalagam vsebino sporočila"
 
-#: mail/mail-display.c:1723
+#: mail/mail-display.c:1879
+#, fuzzy
+msgid "Overdue:"
+msgstr "Naloge s prekoračenim rokom:"
+
+#: mail/mail-display.c:1883
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%d %b %l:%M %p"
+
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Odpri povezavo v brskalniku"
 
-#: mail/mail-display.c:1725
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Kopiraj lokacijo povezave"
 
-#: mail/mail-display.c:1728
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Shrani povezavo kot"
 
-#: mail/mail-display.c:1731
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Shrani sliko kot..."
 
-#: mail/mail-format.c:647
+#: mail/mail-folder-cache.c:744
+#, fuzzy, c-format
+msgid "Pinging %s"
+msgstr "Pregledujem %s"
+
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr "priloga %s"
 
-#: mail/mail-format.c:693
+#: 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 "Nisem mogel razčleniti sporočila MIME. Kažem izvorno besedilo."
 
-#: mail/mail-format.c:776
+#: mail/mail-format.c:759 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:868
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr "Slab naslov"
 
-#: mail/mail-format.c:911 mail/message-list.etspec.h:6
+#: 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 "Od"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Odgovori-na:"
 
-#: mail/mail-format.c:920 mail/message-list.etspec.h:13
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Za"
 
-#: mail/mail-format.c:925
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:930
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:1785
+#: mail/mail-format.c:1451
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "To sporočilo ima elektronski podpis. Za več podatkov kliknite na ikono "
 "ključavnice."
 
-#: mail/mail-format.c:1808
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Evolucija ne pozna te vrste podpisa sporočila"
+#: mail/mail-format.c:1479
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Nisem mogel ustvariti konteksta preverjanja PGP."
 
-#: mail/mail-format.c:1816
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "To sporočilo ima elektronski podpis in je ugotovljeno za avtentično."
 
-#: mail/mail-format.c:1824
+#: mail/mail-format.c:1494
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "To sporočilo ima elektronski podpis, a se ne da dokazati, da je avtentično."
 
-#: mail/mail-format.c:2067
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:2081
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Kazalec na krajevno datoteko (%s) veljaven na strežniku \"%s\""
 
-#: mail/mail-format.c:2086
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:2115
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Kazalec na oddaljen podatek (%s)"
 
-#: mail/mail-format.c:2123
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (vrsta \"%s\")"
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr "Napačno oblikovano dodatno telo sporočila."
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:537 mail/mail-local.c:539
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Krajevne mape"
+
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr "Prenastavljam mapo"
 
-#: mail/mail-local.c:707
-#, c-format
+#: mail/mail-local.c:748
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "Ne morem shraniti meta podatkov mape; verjetno te mape ne boste mogli več "
 "odpreti: %s: %s"
 
-#: mail/mail-local.c:763
+#: mail/mail-local.c:804
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Ne morem shraniti meta podatkov mape v %s: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ne morem zbrisati meta podatkov mape %s: %s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Spreminjam obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:1296
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr "%s se ne da nasatviti, saj ni krajevna mapa"
-
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1354
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -11755,16 +13504,16 @@ msgstr ""
 "Če ne morete več odpreti tega poštnega predala, potem\n"
 "ga boste morda morali popraviti ročno."
 
-#: mail/mail-local.c:1407
-msgid "You cannot change the format of a non-local folder."
-msgstr "Ne morete spremeniti oblike zapisa map, ki niso krajevne."
-
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1454
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Znova nastavi /%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-local.c:1518
+msgid "You cannot change the format of a non-local folder."
+msgstr "Ne morete spremeniti oblike zapisa map, ki niso krajevne."
+
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -11773,7 +13522,7 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -11782,121 +13531,108 @@ msgstr ""
 "Napaka ob opravljanju dejanja:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Delam"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Mapa filtrov"
 
-#: mail/mail-ops.c:259
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-ops.c:535 mail/mail-ops.c:564
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
 msgid "However, the message was successfully sent."
 msgstr "Sporočilo je bilo vseeno uspešno poslano."
 
-#: mail/mail-ops.c:600
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Pošiljam \"%s\""
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Pošiljam sporočilo %d od %d"
 
-#: mail/mail-ops.c:739
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
 
-#: mail/mail-ops.c:741 mail/mail-send-recv.c:545
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:569
 msgid "Complete."
 msgstr "Končano."
 
-#: mail/mail-ops.c:834
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Shranjujem sporočilo v mapo"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Prestavljam sporočila v %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram sporočila v %s"
 
-#: mail/mail-ops.c:941
-msgid "Moving"
-msgstr "Prestavljam"
-
-#: mail/mail-ops.c:944
-msgid "Copying"
-msgstr "Kopiram"
-
-#: mail/mail-ops.c:1054
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pregledujem mape v \"%s\""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1104 shell/e-local-storage.c:179
-msgid "Trash"
-msgstr "Smeti"
-
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Posredovana sporočila"
 
-#: mail/mail-ops.c:1280
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/mail-ops.c:1352
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "Odpiram shrambo %s"
 
-#: mail/mail-ops.c:1421
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1515
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1566
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Osvežujem mapo"
 
-#: mail/mail-ops.c:1602
+#: mail/mail-ops.c:1594
 msgid "Expunging folder"
 msgstr "Uničujem mapo"
 
-#: mail/mail-ops.c:1651
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Prenašam sporočilo %s"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Prenašam %d sporočil"
 
-#: mail/mail-ops.c:1804
+#: mail/mail-ops.c:1801
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Shranjujem %d sporočil"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11905,7 +13641,7 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11914,11 +13650,11 @@ msgstr ""
 "Napaka ob shranjevanju sporočil v: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "Shranjujem prilogo"
 
-#: mail/mail-ops.c:2034
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -11927,146 +13663,177 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odklapljam se od %s"
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znova se povezujem z %s"
 
-#: mail/mail-ops.c:2234
-#, c-format
-msgid "Executing shell command: %s"
-msgstr "Izvajam ukaz lupine: %s"
-
-#: mail/mail-search-dialogue.c:113 ui/evolution-mail-message.xml.h:126
-msgid "_Search"
-msgstr "I_skanje"
-
-#: mail/mail-search.c:137
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(Neimenovano sporočilo)"
 
-#: mail/mail-search.c:240
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "Neimenovano sporočilo"
 
-#: mail/mail-search.c:244
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "Prazno sporočilo"
 
-#: mail/mail-search.c:291
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "Poišči v sporočilu"
 
-#: mail/mail-search.c:321
+#: mail/mail-search.c:285
+msgid "Search"
+msgstr "Iskanje"
+
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "Razlikuj velike in male črke"
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr "Išči naprej"
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "Poišči"
 
-#: mail/mail-search.c:346
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "Ustreza:"
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Preklicujem..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Strežnik: %s, vrsta: %s:"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Pot: %s, vrsta: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:252
 #, c-format
 msgid "Type: %s"
 msgstr "Vrsta: %s"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:297
 msgid "Send & Receive Mail"
 msgstr "Pošlji in spreji pošto"
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:299
 msgid "Cancel All"
 msgstr "Prekliči vse"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:378
 msgid "Updating..."
 msgstr "Posodabljam..."
 
-#: mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
+#: mail/mail-send-recv.c:379 mail/mail-send-recv.c:434
 msgid "Waiting..."
 msgstr "Čakam..."
 
-#: mail/mail-send-recv.c:541
-msgid "Cancelled."
-msgstr "Preklicano."
-
-#: mail/mail-session.c:222
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr "Uporabnik je dejanje preklical."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:258
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Vpišite geslo za %s"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:260
 msgid "Enter Password"
 msgstr "Vpišite geslo"
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
-msgstr "V cev je bilo zapisano nepopolno sporočilo!"
+#: mail/mail-session.c:280
+msgid "_Remember this password"
+msgstr "_Zapomni si to geslo"
 
-#: mail/mail-summary.c:467
-msgid "Mail Summary"
-msgstr "Povzetek pošte"
+#: mail/mail-session.c:281
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Pomni geslo do konca seje"
 
-#: mail/mail-tools.c:256
+#: mail/mail-signature-editor.c:80
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "Nisem mogel shraniti datoteke s podpisom."
+
+#: 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 ""
+"Podpis je bil spremenjen, a ni bil shranjen.\n"
+"\n"
+"Želite shraniti spremembe?"
+
+#: mail/mail-signature-editor.c:229
+#, fuzzy
+msgid "_Discard changes"
+msgstr "Zavrzi to sporočilo"
+
+#: mail/mail-signature-editor.c:233
+#, fuzzy
+msgid "Save signature"
+msgstr "Podpisi"
+
+#: mail/mail-signature-editor.c:389
+#, fuzzy
+msgid "Edit signature"
+msgstr "Seznam podpisov"
+
+#: mail/mail-signature-editor.c:429
+#, fuzzy
+msgid "Enter a name for this signature."
+msgstr "za ta podpis uporabi _HTML"
+
+#: mail/mail-signature-editor.c:432 my-evolution/e-summary-preferences.c:625
+msgid "Name:"
+msgstr "Ime:"
+
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Posredovano sporočilo %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "Posredovano sporočilo"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "Posredovano sporočilo"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Nastavljam vMapo: %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Posodabljam vmape za uri: %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12079,176 +13846,260 @@ msgstr ""
 "    '%s'\n"
 "in so bile posodobljene."
 
-#: mail/mail-vfolder.c:728
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Uredi VMapo"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Poskus ureditve vmape '%s', ki ne obstaja."
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Nova vMapa"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(brez zadeve)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - sporočilo"
 
-#: mail/message-list.c:638
+#: mail/message-list.c:740
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:741
 msgid "Seen"
 msgstr "Videno"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:743
 msgid "Multiple Unseen Messages"
 msgstr "več nevidenih sporočil"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:744
 msgid "Multiple Messages"
 msgstr "Več sporočil"
 
-#: mail/message-list.c:646
+#: mail/message-list.c:748
 msgid "Lowest"
 msgstr "najnižja"
 
-#: mail/message-list.c:647
+#: mail/message-list.c:749
 msgid "Lower"
 msgstr "nizka"
 
-#: mail/message-list.c:651
+#: mail/message-list.c:753
 msgid "Higher"
 msgstr "visoka"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:754
 msgid "Highest"
 msgstr "najvišja"
 
-#: mail/message-list.c:957
+#: mail/message-list.c:1080
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:964
+#: mail/message-list.c:1087
 msgid "Today %l:%M %p"
 msgstr "Danes %l:%M %p"
 
-#: mail/message-list.c:973
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Včeraj %l:%M %p"
 
-#: mail/message-list.c:985
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:995
+#: mail/message-list.c:1116
+msgid "%b %d %l:%M %p"
+msgstr "%d %b %l:%M %p"
+
+#: mail/message-list.c:1118
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2362
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "Ustvarjam seznam sporočil"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Rok do"
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.etspec.h:4
 msgid "Flag Status"
 msgstr "Stanje zastavice"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Označeno"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr "Zastavica navezave"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Prvotni stik:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Sprejeto"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Velikost"
 
-#: mail/subscribe-dialog.c:219
+#: mail/message-tag-followup.c:62
+#, fuzzy
+msgid "Call"
+msgstr "Povratni klic"
+
+#: mail/message-tag-followup.c:63
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Posreduj naprej"
+
+#: mail/message-tag-followup.c:64
+#, fuzzy
+msgid "Follow-Up"
+msgstr "Navezava"
+
+#: mail/message-tag-followup.c:65
+#, fuzzy
+msgid "For Your Information"
+msgstr "Podatki o izvorni kodi"
+
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Posreduj naprej"
+
+#: mail/message-tag-followup.c:67
+msgid "No Response Necessary"
+msgstr ""
+
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
+msgid "Reply"
+msgstr "Odgovori"
+
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
+msgid "Reply to All"
+msgstr "Odgovori vsem"
+
+#: mail/message-tag-followup.c:71
+#, fuzzy
+msgid "Review"
+msgstr "Predogled"
+
+#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:2
+#, fuzzy
+msgid "Flag to Follow Up"
+msgstr "FIXME: _Zastavica za nadaljevanje..."
+
+#: mail/message-tags.glade.h:1
+#, fuzzy
+msgid "C_ompleted"
+msgstr "končano"
+
+#: mail/message-tags.glade.h:5
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: mail/message-tags.glade.h:7
+#, fuzzy
+msgid "_Clear Flag"
+msgstr "Zb_riši zastavico"
+
+#: mail/message-tags.glade.h:8
+#, fuzzy
+msgid "_Due by:"
+msgstr "Rok do"
+
+#: mail/message-tags.glade.h:9
+#, fuzzy
+msgid "_Flag:"
+msgstr "Označeno"
+
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Pregledujem mape pod %s na \"%s\""
 
-#: mail/subscribe-dialog.c:221
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Pregledujem korenske mape na \"%s\""
 
-#: mail/subscribe-dialog.c:318
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Naročam se na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Preklicujem naročnino na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.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 "Mapa"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1389
+#, fuzzy
+msgid "Scanning folders..."
+msgstr "Shrani v mapo..."
+
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Strežnik ni bil izbran"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Prosimo izberite strežnik."
 
-#: mail/subscribe-dialog.glade.h:1
-msgid " _Refresh List "
-msgstr " _Osveži seznam"
-
-#: mail/subscribe-dialog.glade.h:2
-msgid "All folders"
-msgstr "Vse mape"
-
-#: mail/subscribe-dialog.glade.h:3
-msgid "Display options"
-msgstr "Pokaži možnosti"
+#: 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
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:5
+msgid "Close"
+msgstr "Zapri"
 
 #: mail/subscribe-dialog.glade.h:4
-msgid "Folders whose names begin with:"
-msgstr "Mape, katerih ime se začno z:"
-
-#: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
 msgstr "Uredi naročnine"
 
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-subscribe.xml.h:3
+msgid "Refresh List"
+msgstr "Osveži seznam"
+
 #: mail/subscribe-dialog.glade.h:6
-msgid "Show _folders from server: "
-msgstr "Kaži _mape s strežnika: "
+#, fuzzy
+msgid "S_elect server: "
+msgstr "Izberi storitev"
 
 #: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
@@ -12258,6 +14109,31 @@ msgstr "_Naroči se"
 msgid "_Unsubscribe"
 msgstr "_Prekliči naročnino"
 
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
+#, fuzzy
+msgid "Configure the appearance of the Evolution Summary here"
+msgstr "Mapa, ki vsebuje povzetek Evolucije"
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Summary"
+msgstr "Alarm Evolucije"
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Summary component"
+msgstr "Evolucijin setavljalnik pošte."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Nastavitev Evolucijine pošte"
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Nastavitve"
+
 #: my-evolution/Locations.h:1
 msgid "Aarhus"
 msgstr ""
@@ -15655,7 +17531,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 "Toča"
 
@@ -16656,11 +18532,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -16827,6517 +18703,6512 @@ msgstr ""
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr ""
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr ""
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr ""
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr ""
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr ""
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr ""
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr ""
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr ""
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr ""
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "Lexington"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr ""
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "Libija"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr ""
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr ""
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr ""
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr ""
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr ""
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr ""
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr "Lisbona"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr ""
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "Livingston"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr ""
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "London"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "London/City"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "London/Gatwick"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "London/Heathrow"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "London/Stansted"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr ""
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr ""
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr ""
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr ""
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr ""
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr ""
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "Maastricht"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr ""
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr ""
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr ""
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr ""
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr "Medina"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr ""
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr ""
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr ""
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr ""
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr ""
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr ""
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr ""
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr ""
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr ""
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr ""
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "Mancheser"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr ""
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr ""
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr ""
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr ""
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr ""
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr ""
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr ""
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr ""
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr ""
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr ""
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr ""
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
-msgid "Marquette"
-msgstr ""
-
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1325
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1326
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1327
 msgid "Marshall"
 msgstr ""
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1328
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1329
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1330
 msgid "Marte"
 msgstr ""
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1331
 msgid "Marthas Vineyard"
 msgstr ""
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1332
 msgid "Martinsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1333
 msgid "Martinsville"
 msgstr ""
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1334
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1335
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1336
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1337
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1338
 msgid "Masirah"
 msgstr ""
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1339
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1340
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1341
 msgid "Massena"
 msgstr ""
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1342
 msgid "Matamoros"
 msgstr ""
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1343
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1344
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1345
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1346
 msgid "Mattoon"
 msgstr ""
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1347
 msgid "Mayaguez"
 msgstr ""
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1348
 msgid "Mayport"
 msgstr ""
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1349
 msgid "Mazatlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1350
 msgid "Mazu"
 msgstr ""
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1351
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1352
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1353
 msgid "McCall"
 msgstr ""
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1354
 msgid "McCarthy"
 msgstr ""
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1355
 msgid "McClellan"
 msgstr ""
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1356
 msgid "McComb"
 msgstr ""
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1357
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1358
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1359
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1360
 msgid "Meacham"
 msgstr ""
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1361
 msgid "Medford"
 msgstr ""
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1362
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1363
 msgid "Mehamn"
 msgstr ""
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1364
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1365
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1366
 msgid "Melfa"
 msgstr ""
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1367
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1368
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1369
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1370
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1371
 msgid "Mendoza"
 msgstr ""
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1372
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1373
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1374
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1375
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1376
 msgid "Merida"
 msgstr ""
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1377
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1378
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1379
 msgid "Merril Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1380
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1381
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1382
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1383
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1384
 msgid "Mexicali"
 msgstr ""
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1386
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1387
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1388
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1389
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1390
 msgid "Middle East"
 msgstr "Srednji vzhod"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1391
 msgid "Middleton Island"
 msgstr "Solomonovi otoki"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1392
 msgid "Middletown"
 msgstr ""
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1393
 msgid "Midland"
 msgstr ""
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1394
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1395
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1396
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1397
 msgid "Miles City"
 msgstr ""
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1398
 msgid "Milford"
 msgstr ""
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1399
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1400
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1401
 msgid "Milton"
 msgstr ""
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1402
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1404
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1405
 msgid "Minatitlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1406
 msgid "Minchumina"
 msgstr ""
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1407
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1408
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1409
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1412
 msgid "Minnesota"
 msgstr ""
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1413
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1414
 msgid "Minot"
 msgstr ""
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1415
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1416
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1417
 msgid "Mississippi"
 msgstr "Misisipi"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1418
 msgid "Missoula"
 msgstr ""
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1419
 msgid "Missouri"
 msgstr ""
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1420
 msgid "Mitchell"
 msgstr ""
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1421
 msgid "Mitilini"
 msgstr ""
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1422
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1423
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1424
 msgid "Moa"
 msgstr ""
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1425
 msgid "Mobile Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1426
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1427
 msgid "Mobridge"
 msgstr ""
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1428
 msgid "Modesto"
 msgstr ""
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1429
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1430
 msgid "Mojave"
 msgstr ""
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1431
 msgid "Molde"
 msgstr ""
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1432
 msgid "Moldova"
 msgstr "Moldavija"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1433
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1434
 msgid "Molokai"
 msgstr ""
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1435
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1436
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1437
 msgid "Monclova"
 msgstr ""
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1438
 msgid "Moncton"
 msgstr ""
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1439
 msgid "Monida"
 msgstr ""
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1440
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1441
 msgid "Monroe"
 msgstr ""
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1442
 msgid "Montague"
 msgstr ""
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1443
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1444
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1445
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1446
 msgid "Monte Bisbino"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1447
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1448
 msgid "Monte Cimone"
 msgstr ""
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1449
 msgid "Montego Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1450
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1451
 msgid "Monterey"
 msgstr ""
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1452
 msgid "Monterrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1453
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1454
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1455
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1456
 msgid "Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1457
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1458
 msgid "Monticello"
 msgstr ""
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1459
 msgid "Montpelier"
 msgstr ""
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1460
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1461
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1462
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1463
 msgid "Montrose"
 msgstr ""
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1464
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1465
 msgid "Morelia"
 msgstr ""
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1466
 msgid "Morgantown"
 msgstr ""
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1467
 msgid "Moriarty"
 msgstr ""
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1469
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1470
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1471
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1472
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1473
 msgid "Mosinee"
 msgstr ""
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1474
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1475
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1476
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1477
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1478
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1479
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1480
 msgid "Mount Shasta"
 msgstr ""
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1481
 msgid "Mount Vernon"
 msgstr ""
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1482
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1483
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1484
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1485
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1486
 msgid "Mullan"
 msgstr ""
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1487
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1488
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1489
 msgid "Muncie"
 msgstr ""
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1490
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1491
 msgid "Murcia"
 msgstr ""
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1492
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1493
 msgid "Mus"
 msgstr ""
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1494
 msgid "Muscatine"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1495
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1496
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1497
 msgid "Mykonos"
 msgstr ""
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1498
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1499
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1500
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1501
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1502
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1503
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1504
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1505
 msgid "Najran"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1506
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1507
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1508
 msgid "Namsos"
 msgstr ""
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1509
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1511
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1512
 msgid "Nanning"
 msgstr ""
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1513
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1514
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1515
 msgid "Napa"
 msgstr ""
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1516
 msgid "Naples"
 msgstr ""
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1517
 msgid "Napoli"
 msgstr "Neapelj"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1518
 msgid "Narvik"
 msgstr ""
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1519
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1520
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1521
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1522
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1523
 msgid "Natal"
 msgstr ""
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1524
 msgid "Natchez"
 msgstr ""
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1525
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1526
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1527
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1528
 msgid "Nenana"
 msgstr ""
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1530
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1531
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1532
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1533
 msgid "New Bedford"
 msgstr ""
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1534
 msgid "New Bern"
 msgstr ""
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1535
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1536
 msgid "New Brunswick"
 msgstr "Novi Brunswick"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1537
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1538
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1539
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1540
 msgid "Newfoundland"
 msgstr "Nova Fundlandija"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1541
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1542
 msgid "New Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1543
 msgid "New Iberia"
 msgstr ""
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1544
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1545
 msgid "New Mexico"
 msgstr "Nova Mehika"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1546
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1547
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1548
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1549
 msgid "Newport"
 msgstr ""
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1550
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1551
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1552
 msgid "New River"
 msgstr ""
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1553
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1554
 msgid "Newton"
 msgstr ""
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1555
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1556
 msgid "New York-JFK Arpt"
 msgstr "New York-Letališče JFK"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1557
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1559
 msgid "Niagara Falls"
 msgstr "Niagarski slapovi"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1561
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1562
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1563
 msgid "Nimes-Garons"
 msgstr ""
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1564
 msgid "Nipawin"
 msgstr ""
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1565
 msgid "Nis"
 msgstr ""
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1566
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1567
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1568
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1569
 msgid "Nogales"
 msgstr ""
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1570
 msgid "Nome"
 msgstr ""
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1571
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1573
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1574
 msgid "Norrkoping"
 msgstr ""
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1575
 msgid "North Adams"
 msgstr ""
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1576
 msgid "North Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1577
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1578
 msgid "North Conway"
 msgstr "Norveška"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1579
 msgid "North Dakota"
 msgstr "Severna Dakota"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1580
 msgid "Northeast Philadelphia"
 msgstr "Severovzhodna Filadelfija"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1581
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1582
 msgid "North Platte"
 msgstr ""
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1583
 msgid "Northway"
 msgstr ""
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1584
 msgid "Northwest Territories"
 msgstr "Severozahodni teritoriji"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1586
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1587
 msgid "Norwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1588
 msgid "Notodden"
 msgstr ""
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1589
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1590
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1591
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1592
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1593
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1594
 msgid "Nuevo Laredo"
 msgstr ""
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1595
 msgid "Nurnberg"
 msgstr "Nurnberg"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1596
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1597
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1598
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1599
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1600
 msgid "Oaxaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1601
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1602
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1603
 msgid "Ocala"
 msgstr ""
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1604
 msgid "Oceanside"
 msgstr ""
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1605
 msgid "Odense"
 msgstr ""
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1606
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1607
 msgid "Oelwen"
 msgstr ""
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1608
 msgid "Ogden"
 msgstr ""
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1609
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1610
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1611
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1612
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1613
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1614
 msgid "Ojika Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1615
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1616
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1617
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1618
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1622
 msgid "Okushiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1623
 msgid "Olathe"
 msgstr ""
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1624
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1625
 msgid "Olbia"
 msgstr ""
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1626
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1627
 msgid "Omaha"
 msgstr ""
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1628
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1629
 msgid "Omak"
 msgstr ""
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1631
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1632
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1633
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1634
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1635
 msgid "Oostende"
 msgstr ""
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1636
 msgid "Oran"
 msgstr ""
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1637
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1638
 msgid "Orange"
 msgstr ""
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1639
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1640
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1641
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1642
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1643
 msgid "Orland"
 msgstr ""
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1644
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1645
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1646
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1647
 msgid "Oruro"
 msgstr ""
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1648
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1649
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1650
 msgid "Oscoda"
 msgstr ""
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1651
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1652
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1653
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1654
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1655
 msgid "Ostrava"
 msgstr ""
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1656
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1657
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1658
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1659
 msgid "Owyhee"
 msgstr ""
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1660
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1661
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1662
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1663
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1664
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1665
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1666
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1667
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1668
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1669
 msgid "Paganella"
 msgstr ""
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1672
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1673
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1674
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1675
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1676
 msgid "Palmdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1677
 msgid "Palmer"
 msgstr ""
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1678
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1679
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1680
 msgid "Pamplona"
 msgstr ""
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1682
 msgid "Panama City"
 msgstr ""
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1683
 msgid "Pantelleria"
 msgstr ""
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1684
 msgid "Papa"
 msgstr ""
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1685
 msgid "Paphos"
 msgstr ""
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1687
 msgid "Paris"
 msgstr "Pariz"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1688
 msgid "Paris/Charles De Gaulle"
 msgstr "Pariz/Charles de Gaulle"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1689
 msgid "Paris/Le Bourget"
 msgstr "Pariz/Le Bourget"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1690
 msgid "Paris/Orly"
 msgstr "Pariz/Orly"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1691
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1692
 msgid "Pasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1693
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1694
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1695
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1696
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1697
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1698
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1699
 msgid "Patna"
 msgstr ""
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1700
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1701
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1702
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1703
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1704
 msgid "Paysandu"
 msgstr ""
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1705
 msgid "Payson"
 msgstr ""
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1706
 msgid "Pellston"
 msgstr ""
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1707
 msgid "Pelotas"
 msgstr ""
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1708
 msgid "Pendleton"
 msgstr ""
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1709
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1710
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1711
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1712
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1713
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1714
 msgid "Peoria"
 msgstr ""
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1715
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1716
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1717
 msgid "Perm"
 msgstr ""
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1718
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1719
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1720
 msgid "Perth"
 msgstr ""
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1722
 msgid "Perugia"
 msgstr ""
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1723
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1724
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1725
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1726
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1727
 msgid "Philadelphia"
 msgstr "Filadelfija"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1728
 msgid "Philip"
 msgstr ""
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1729
 msgid "Philipsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1730
 msgid "Phillips"
 msgstr ""
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1731
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1732
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1735
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1736
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1737
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1738
 msgid "Pierre"
 msgstr ""
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1739
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1740
 msgid "Pikeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1741
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1742
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1743
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1744
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1745
 msgid "Pisa"
 msgstr "Pizza"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1746
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1747
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1749
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1750
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1751
 msgid "Plymouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1752
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1753
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1754
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1755
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1756
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1757
 msgid "Point Hope"
 msgstr ""
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1758
 msgid "Point Lay"
 msgstr ""
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1759
 msgid "Point Mugu"
 msgstr ""
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1760
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1761
 msgid "Poitiers"
 msgstr ""
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1763
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1764
 msgid "Ponca City"
 msgstr ""
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1765
 msgid "Ponce"
 msgstr ""
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1766
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1767
 msgid "Pontiac"
 msgstr ""
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1768
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1769
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1770
 msgid "Poprad"
 msgstr ""
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1771
 msgid "Port Alexander"
 msgstr ""
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1772
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1773
 msgid "Port Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1774
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1775
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1776
 msgid "Porterville"
 msgstr ""
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1777
 msgid "Port Hardy"
 msgstr ""
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1778
 msgid "Port Hedland"
 msgstr ""
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1779
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1780
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1781
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1782
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1784
 msgid "Portoroz"
 msgstr "Portorož"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1785
 msgid "Porto Santo"
 msgstr ""
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1786
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1787
 msgid "Port Said"
 msgstr ""
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1788
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1790
 msgid "Posadas"
 msgstr ""
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1791
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1792
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1793
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1794
 msgid "Poza Rica"
 msgstr ""
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1795
 msgid "Poznan"
 msgstr ""
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1796
 msgid "Praha"
 msgstr "Praga"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1797
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1798
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1799
 msgid "Presidente Prudente"
 msgstr ""
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1800
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1801
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1802
 msgid "Pretoria"
 msgstr ""
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1803
 msgid "Preveza"
 msgstr ""
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1804
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1805
 msgid "Pristina"
 msgstr "Priština"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1806
 msgid "Providence"
 msgstr ""
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1807
 msgid "Provincetown"
 msgstr ""
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1808
 msgid "Provo"
 msgstr ""
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1809
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1810
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1811
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1812
 msgid "Puebla"
 msgstr ""
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1813
 msgid "Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1814
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1815
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1816
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1817
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1818
 msgid "Puerto Limon"
 msgstr ""
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1819
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1820
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1821
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1823
 msgid "Puerto Suarez"
 msgstr ""
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1824
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1825
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1826
 msgid "Pullman"
 msgstr ""
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1827
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1828
 msgid "Punta Cana"
 msgstr ""
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1829
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1830
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1831
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1832
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1833
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1835
 msgid "Quantico"
 msgstr ""
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1836
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1837
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1838
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1839
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1840
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1841
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1842
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1843
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1844
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1845
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1846
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1847
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1848
 msgid "Rapid City"
 msgstr ""
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1849
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1850
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1851
 msgid "Rawlins"
 msgstr ""
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1852
 msgid "Reading"
 msgstr ""
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1853
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1854
 msgid "Recife"
 msgstr ""
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1855
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1856
 msgid "Redding"
 msgstr ""
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1857
 msgid "Redig"
 msgstr ""
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1858
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1859
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1860
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1861
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1862
 msgid "Regina"
 msgstr ""
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1863
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1864
 msgid "Rennes"
 msgstr ""
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1865
 msgid "Reno"
 msgstr ""
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1866
 msgid "Renton"
 msgstr ""
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1867
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1868
 msgid "Reus"
 msgstr ""
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1869
 msgid "Reyes"
 msgstr ""
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1870
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1871
 msgid "Reynosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1872
 msgid "Rhinelander"
 msgstr ""
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1873
 msgid "Rhode Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1874
 msgid "Riberalta"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1875
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1876
 msgid "Rickenbacker"
 msgstr ""
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1877
 msgid "Rieti"
 msgstr ""
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1878
 msgid "Rifle"
 msgstr ""
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr ""
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1879
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1880
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1881
 msgid "Rio De Janeiro"
 msgstr "Rio de Jeneiro"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1882
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1883
 msgid "Rio Grande"
 msgstr "Rio grande"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1884
 msgid "Rioja"
 msgstr ""
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1885
 msgid "Rio / Jacarepagua"
 msgstr ""
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1886
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1887
 msgid "Rishiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1888
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1889
 msgid "Rivera"
 msgstr ""
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1890
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1891
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1892
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1893
 msgid "Rivne"
 msgstr ""
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1894
 msgid "Rivolto"
 msgstr ""
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1895
 msgid "Riyadh"
 msgstr ""
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1896
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1897
 msgid "Roatan"
 msgstr ""
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1898
 msgid "Robore"
 msgstr ""
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1899
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1900
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1901
 msgid "Rockland"
 msgstr ""
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1902
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1903
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1904
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1905
 msgid "Rodos"
 msgstr ""
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1906
 msgid "Rogers"
 msgstr ""
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1907
 msgid "Roma/Ciampino"
 msgstr ""
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1908
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1910
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1911
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1912
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1913
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1914
 msgid "Roosevelt"
 msgstr "Roosvelt"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1915
 msgid "Roros"
 msgstr ""
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1916
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1917
 msgid "Rosario"
 msgstr ""
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1918
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1919
 msgid "Roseglen"
 msgstr ""
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1920
 msgid "Rost"
 msgstr ""
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1921
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1922
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1923
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1924
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1925
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1926
 msgid "Rurrenabaque"
 msgstr ""
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1927
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1928
 msgid "Russia"
 msgstr "Rusija"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1929
 msgid "Rutland"
 msgstr ""
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1930
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1931
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1932
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1933
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1934
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1935
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1936
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1937
 msgid "Saginaw"
 msgstr ""
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1938
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1939
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1940
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1941
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1942
 msgid "Saint Mary's"
 msgstr ""
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1943
 msgid "Saint Mawgan"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1944
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1945
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1946
 msgid "Saiq"
 msgstr ""
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1947
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1948
 msgid "Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1949
 msgid "Salida"
 msgstr ""
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1950
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1951
 msgid "Salina"
 msgstr ""
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1952
 msgid "Salinas"
 msgstr ""
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1953
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1954
 msgid "Salmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1955
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1956
 msgid "Salta"
 msgstr ""
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1957
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1958
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1959
 msgid "Salto"
 msgstr ""
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1960
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1961
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1962
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1963
 msgid "Samara"
 msgstr ""
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1964
 msgid "Samos"
 msgstr ""
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1965
 msgid "Samsun"
 msgstr ""
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1966
 msgid "Sana'A"
 msgstr ""
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1967
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1968
 msgid "San Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1969
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1970
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1971
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1973
 msgid "San Carlos"
 msgstr ""
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1974
 msgid "Sandane"
 msgstr ""
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1975
 msgid "Sandberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1976
 msgid "Sanderson"
 msgstr ""
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1977
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1978
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1981
 msgid "San Diego-North Island"
 msgstr "San Diego-Severni otok"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1982
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1983
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1984
 msgid "Sand Point"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1985
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1986
 msgid "Sanford"
 msgstr ""
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1987
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1988
 msgid "Sangju"
 msgstr ""
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1989
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1990
 msgid "San Joaquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1991
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1992
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1993
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1994
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1995
 msgid "San Juan"
 msgstr ""
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1996
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1997
 msgid "Sanliurfa"
 msgstr ""
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1998
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:1999
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2000
 msgid "San Miguel"
 msgstr ""
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2001
 msgid "San Nicholas Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2002
 msgid "San Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2003
 msgid "San Sebastian"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2004
 msgid "Santa Ana"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2005
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2006
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2007
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2008
 msgid "Santa Maria"
 msgstr ""
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2009
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2010
 msgid "Santa Monica"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2011
 msgid "Santander"
 msgstr ""
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2012
 msgid "Santarem"
 msgstr ""
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2013
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2015
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2016
 msgid "Santiago de Cuba"
 msgstr "Santiago na Kubi"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2017
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2018
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2019
 msgid "Santos"
 msgstr ""
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2020
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2021
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2022
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2023
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2024
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2025
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2026
 msgid "Sarasota"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2027
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2028
 msgid "Sarzana"
 msgstr ""
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2029
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2030
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2031
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2033
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2034
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2035
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2036
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2037
 msgid "Sayun"
 msgstr ""
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2038
 msgid "Scatsta"
 msgstr ""
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2039
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2040
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2041
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2042
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2043
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2044
 msgid "Scranton"
 msgstr ""
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2045
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2046
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2047
 msgid "Sedalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2048
 msgid "Seeb"
 msgstr ""
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2049
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2050
 msgid "Sendai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2051
 msgid "Seoul E Ab"
 msgstr "Seul E Ab"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2052
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seul/Mednarodno letališče Kimp'O"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2054
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2055
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2056
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2057
 msgid "Seward"
 msgstr ""
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2058
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2059
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2060
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2061
 msgid "Sharjah"
 msgstr ""
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2062
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2063
 msgid "Sharurah"
 msgstr ""
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2064
 msgid "Shawbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2065
 msgid "Shearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2066
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2067
 msgid "Sheldon"
 msgstr ""
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2068
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2069
 msgid "Shelton"
 msgstr ""
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2070
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2071
 msgid "Sheridan"
 msgstr ""
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2072
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2073
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2074
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2075
 msgid "Shiraz"
 msgstr ""
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2076
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2077
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2078
 msgid "Shoreham"
 msgstr ""
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2079
 msgid "Show Low"
 msgstr ""
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2080
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2082
 msgid "Sidney"
 msgstr ""
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2083
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2084
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2085
 msgid "Silver City"
 msgstr ""
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2086
 msgid "Sindal"
 msgstr ""
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2088
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2089
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2090
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2091
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2092
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2093
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2094
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2095
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2096
 msgid "Skive"
 msgstr ""
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2097
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2098
 msgid "Skwentna"
 msgstr ""
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2099
 msgid "Slana"
 msgstr ""
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2102
 msgid "Smithers"
 msgstr ""
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2103
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2104
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2105
 msgid "Sochi"
 msgstr ""
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2106
 msgid "Socorro"
 msgstr ""
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2107
 msgid "Socotra"
 msgstr ""
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2108
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2109
 msgid "Sofia"
 msgstr ""
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2110
 msgid "Sogndal"
 msgstr ""
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2111
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2112
 msgid "Somerset"
 msgstr ""
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2113
 msgid "Sonderborg"
 msgstr ""
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2114
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2115
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2117
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2118
 msgid "South Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2119
 msgid "South Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2120
 msgid "South Dakota"
 msgstr "Južna Dakota"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2121
 msgid "Southend"
 msgstr ""
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2122
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2123
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2125
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2126
 msgid "Spencer"
 msgstr ""
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2127
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2128
 msgid "Split"
 msgstr ""
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2129
 msgid "Spokane"
 msgstr ""
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2130
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2131
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2132
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2133
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2134
 msgid "State College"
 msgstr ""
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2135
 msgid "Stauning"
 msgstr ""
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2136
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2137
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2138
 msgid "Staverton"
 msgstr ""
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2139
 msgid "Stavropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2140
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2141
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2142
 msgid "Stephenville"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2143
 msgid "St. George"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2144
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2145
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2146
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2147
 msgid "St Joseph"
 msgstr ""
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2148
 msgid "St Louis"
 msgstr "St. Louis"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2149
 msgid "St Louis-Spirit"
 msgstr "St. Lousi-Spirit"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2150
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2152
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2153
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2154
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2155
 msgid "Storm Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2156
 msgid "Stornoway"
 msgstr ""
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2157
 msgid "St Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2158
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2160
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2161
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2162
 msgid "St Simon's Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2163
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2164
 msgid "Sturgeon Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2165
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2166
 msgid "Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2167
 msgid "Sumburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2168
 msgid "Sumter"
 msgstr ""
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2169
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2170
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2171
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2172
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2174
 msgid "Sutton"
 msgstr ""
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2175
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2176
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2177
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2179
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2181
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2182
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2183
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2184
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2185
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2186
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2187
 msgid "Tabatinga"
 msgstr ""
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2188
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2189
 msgid "Tabuk"
 msgstr ""
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2190
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2191
 msgid "Tacna"
 msgstr ""
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2192
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2193
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2194
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2195
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2196
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2197
 msgid "Taejon"
 msgstr ""
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2198
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2199
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2200
 msgid "Taif"
 msgstr ""
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2201
 msgid "Tainan"
 msgstr ""
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2203
 msgid "Taiyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2204
 msgid "Taiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2205
 msgid "Tajima"
 msgstr ""
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2206
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2207
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr ""
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2208
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2209
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2210
+#, fuzzy
+msgid "Tallinn"
+msgstr "Evropa/Tallinn"
+
+#: my-evolution/Locations.h:2211
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2213
 msgid "Tampa"
 msgstr ""
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2214
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2215
 msgid "Tampere"
 msgstr ""
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2216
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2217
 msgid "Tanana"
 msgstr ""
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2218
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2219
 msgid "Taos"
 msgstr ""
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2220
 msgid "Taoyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2221
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2222
 msgid "Taranto"
 msgstr ""
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2223
 msgid "Tarbes"
 msgstr ""
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2224
 msgid "Tarija"
 msgstr ""
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2225
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2226
 msgid "Tatalina"
 msgstr ""
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2227
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2228
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2229
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2230
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2231
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2232
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2233
 msgid "Tela"
 msgstr ""
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2234
 msgid "Temple"
 msgstr ""
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2235
 msgid "Tennessee"
 msgstr "Tennesee"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2236
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2237
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2238
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2239
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2240
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2241
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2242
 msgid "Texas"
 msgstr "Teksas"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2243
 msgid "The Dalles"
 msgstr ""
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2244
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2245
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2246
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2247
 msgid "Thisted"
 msgstr ""
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2248
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2249
 msgid "Thumrait"
 msgstr ""
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2250
 msgid "Tianjin"
 msgstr ""
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2251
 msgid "Tijuana"
 msgstr ""
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2252
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2253
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2254
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2255
 msgid "Tiree"
 msgstr ""
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2256
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2257
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2258
 msgid "Titusville"
 msgstr ""
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2259
 msgid "Tivat"
 msgstr ""
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2260
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2261
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2262
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2263
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2264
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2265
 msgid "Tokunoshima Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2266
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2267
 msgid "Tokyo Heliport"
 msgstr "Tokijo heliport"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2268
 msgid "Tokyo International Airport"
 msgstr "Tokijo - mednarodno letališče"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2269
 msgid "Tokyo New International Airport"
 msgstr "Tokijo - novo mednarodno letališče"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2270
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2271
 msgid "Toluca"
 msgstr ""
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2272
 msgid "Tonopah"
 msgstr ""
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2273
 msgid "Topeka"
 msgstr ""
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2274
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2275
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2276
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2277
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2278
 msgid "Torp"
 msgstr ""
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2279
 msgid "Torrance"
 msgstr ""
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2280
 msgid "Torreon"
 msgstr ""
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2281
 msgid "Tottori Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2282
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2283
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2284
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2285
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2286
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2287
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2288
 msgid "Trabzon"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2289
 msgid "Trapani"
 msgstr ""
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2290
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2291
 msgid "Trelew"
 msgstr ""
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2292
 msgid "Trenton"
 msgstr ""
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2293
 msgid "Trevico"
 msgstr ""
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2294
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2295
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2296
 msgid "Trieste"
 msgstr "Trst"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2297
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2298
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2299
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2300
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2301
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2302
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2303
 msgid "Truckee"
 msgstr ""
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2304
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2305
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2306
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2307
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2308
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2309
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2310
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2311
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2312
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2313
 msgid "Tulcea"
 msgstr ""
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2314
 msgid "Tulsa"
 msgstr ""
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2315
 msgid "Tupelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2316
 msgid "Turaif"
 msgstr ""
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2317
 msgid "Turin"
 msgstr ""
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2319
 msgid "Turku"
 msgstr ""
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2320
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2321
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2322
 msgid "Twenthe"
 msgstr ""
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2323
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2324
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2325
 msgid "Tyler"
 msgstr ""
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2326
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2327
 msgid "Tyumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2328
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2329
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2330
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2332
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2333
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2334
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2335
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2336
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2337
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2338
 msgid "United Arab Emirates "
 msgstr "Združeni arabski emirati "
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2341
 msgid "Unst"
 msgstr ""
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2342
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2343
 msgid "Uruapan"
 msgstr ""
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2344
 msgid "Uruguaiana"
 msgstr ""
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2346
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2347
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2348
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2349
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2350
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2351
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2352
 msgid "Vadso"
 msgstr "Radijo"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2353
 msgid "Vaerlose"
 msgstr ""
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2354
 msgid "Vagar"
 msgstr ""
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2355
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2356
 msgid "Valdosta"
 msgstr ""
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2357
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2358
 msgid "Valencia"
 msgstr ""
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2359
 msgid "Valentine"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2360
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2361
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2362
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2363
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2365
 msgid "Van"
 msgstr ""
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2366
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2367
 msgid "Vandel"
 msgstr ""
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2368
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2370
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2371
 msgid "Varadero"
 msgstr ""
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2372
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2373
 msgid "Varna"
 msgstr ""
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2374
 msgid "Vasteras"
 msgstr ""
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2375
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2376
 msgid "Venezia"
 msgstr "Benetke"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2378
 msgid "Venice"
 msgstr ""
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2379
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2380
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2381
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2382
 msgid "Vernal"
 msgstr ""
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2383
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2384
 msgid "Vicenza"
 msgstr ""
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2385
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2387
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2388
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2390
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2391
 msgid "Vilhena"
 msgstr ""
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2392
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2393
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2394
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2395
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2396
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2397
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2398
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2399
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2400
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2401
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2402
 msgid "Visalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2403
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2404
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2405
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2406
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2407
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2408
 msgid "Vlieland"
 msgstr ""
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2409
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2410
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2411
 msgid "Volkel"
 msgstr ""
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2412
 msgid "Volk Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2413
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2414
 msgid "Voslau"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2415
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2416
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2417
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2418
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2419
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2420
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2421
 msgid "Wallops Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2422
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2423
 msgid "Warner Robins"
 msgstr ""
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2424
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2425
 msgid "Warszawa"
 msgstr "Varšava"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2426
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2427
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2428
 msgid "Waterbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2429
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2430
 msgid "Watertown"
 msgstr ""
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2431
 msgid "Waterville"
 msgstr ""
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2432
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2433
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2434
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2435
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2436
 msgid "Webster City"
 msgstr ""
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2437
 msgid "Wejh"
 msgstr ""
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2438
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2439
 msgid "Wenatchee"
 msgstr ""
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2440
 msgid "Wendover"
 msgstr ""
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2441
 msgid "West Atlanta"
 msgstr "Zahodna Atlanta"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2442
 msgid "West Burke"
 msgstr ""
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2443
 msgid "Westerland"
 msgstr ""
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2444
 msgid "Westfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2445
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2446
 msgid "West Palm Beach"
 msgstr "Zahodni Palm Beach"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2447
 msgid "West Virginia"
 msgstr "Zahodna Virginija"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2448
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2450
 msgid "Wheeling"
 msgstr ""
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2451
 msgid "Whidbey Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2452
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2453
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2454
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2455
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2456
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2457
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2458
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2459
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2460
 msgid "Wick"
 msgstr ""
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2461
 msgid "Wien"
 msgstr "Dunaj"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2462
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2463
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2464
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2465
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2466
 msgid "Williston"
 msgstr ""
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2467
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2468
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2469
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2470
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2471
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2472
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2473
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2474
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2475
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2476
 msgid "Winslow"
 msgstr ""
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2477
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2478
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2479
 msgid "Winter Park"
 msgstr ""
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2480
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2481
 msgid "Wisconsin"
 msgstr ""
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2483
 msgid "Wise"
 msgstr ""
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2484
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2485
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2486
 msgid "Woong Cheon"
 msgstr ""
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2487
 msgid "Wooster"
 msgstr ""
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2488
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2489
 msgid "Worland"
 msgstr ""
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2490
 msgid "Worthington"
 msgstr ""
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2491
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2492
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2493
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2494
 msgid "Wyoming"
 msgstr ""
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2495
 msgid "Xiamen"
 msgstr ""
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2496
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2497
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2498
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2499
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2500
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2501
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2502
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2503
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2504
 msgid "Yao Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2505
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2506
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2507
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2508
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2510
 msgid "Yenbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2511
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2512
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2513
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2514
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2515
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2516
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2517
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2518
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2519
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2520
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2522
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2523
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2524
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2525
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2526
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2527
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2528
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2529
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2530
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2531
 msgid "Zanesville"
 msgstr ""
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2532
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2533
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2534
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2535
 msgid "Zurich"
 msgstr "Zurich"
 
-#: my-evolution/component-factory.c:44
+#: my-evolution/component-factory.c:56
 msgid "Folder containing the Evolution Summary"
 msgstr "Mapa, ki vsebuje povzetek Evolucije"
 
-#: my-evolution/component-factory.c:153
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Ne morem inicializirati Evolucijine komponente za povzetek."
-
-#: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
+#: my-evolution/e-summary-calendar.c:380
 msgid "Appointments"
 msgstr "Sestanki"
 
-#: my-evolution/e-summary-calendar.c:366
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
 msgstr "Ni sestankovov"
 
-#: my-evolution/e-summary-calendar.c:400
+#: my-evolution/e-summary-calendar.c:405
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:402
-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:420
+#: my-evolution/e-summary-calendar.c:425
 msgid "No description"
 msgstr "Brez opisa"
 
-#: my-evolution/e-summary-mail.c:120
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "Povzetek pošte"
 
-#. 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:82
-#: my-evolution/e-summary-weather.c:603
-msgid "KBOS"
-msgstr "LJLJ:LJMB:LJPZ"
+#: my-evolution/e-summary-mail.c:443 shell/e-local-storage.c:1151
+msgid "Local Folders"
+msgstr "Krajevne mape"
 
-#: my-evolution/e-summary-preferences.c:453
+#: my-evolution/e-summary-preferences.c:356
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com beseda dneva"
 
-#: my-evolution/e-summary-preferences.c:474
+#: my-evolution/e-summary-preferences.c:374
 msgid "Quotes of the Day"
 msgstr "Citati dneva"
 
-#: my-evolution/e-summary-preferences.c:735
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr "Dodaj vir novic"
 
-#: my-evolution/e-summary-preferences.c:743
+#: my-evolution/e-summary-preferences.c:621
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Vpišite vir novic, ki ga želite dodati"
 
-#: my-evolution/e-summary-preferences.c:747
-msgid "Name:"
-msgstr "Ime:"
-
-#: my-evolution/e-summary-preferences.c:1225
-msgid "Summary Settings"
-msgstr "Nastavitev povzetka"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr "Napaka ob prenašanju RDF"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr "Viri novic"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-shown.c:518
+msgid "All"
+msgstr ""
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:530
+msgid "Add"
+msgstr "Dodaj"
+
+#: my-evolution/e-summary-shown.c:543 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Sneži"
+
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "Brez nalog"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(ni opisa)"
 
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:73
 msgid "My Weather"
 msgstr "Moje vreme"
 
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:262
 msgid "There was an error downloading data for"
 msgstr "Napaka ob prenašanju podatkov za"
 
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr "Vreme"
 
-#: my-evolution/e-summary.c:190
+#. 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 "LJLJ:LJMB:LJPZ"
+
+#: my-evolution/e-summary.c:198
 msgid "%A, %B %e %Y"
 msgstr "%A, %e %B %Y"
 
-#: my-evolution/e-summary.c:475
+#: my-evolution/e-summary.c:523
 msgid "Please wait..."
 msgstr "Prosim pokačajte..."
 
-#: my-evolution/e-summary.c:566 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Natisni povzetek"
 
-#: my-evolution/e-summary.c:612
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Tiskanje povzetka ni uspelo"
 
-#: my-evolution/main.c:65
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "Komponenta povzetka ni mogla inicializirati Bonoba.\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 "vozlov"
 
-#: 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 "milje"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "kilometers"
 msgstr "kilometrov"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Clear sky"
 msgstr "Jasno"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Broken clouds"
 msgstr "Pretežno oblačno"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Scattered clouds"
 msgstr "Delno oblačno"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Few clouds"
 msgstr "Pretežno jasno"
 
-#: my-evolution/metar.c:48
+#: my-evolution/metar.c:49
 msgid "Overcast"
 msgstr "Oblačno"
 
-#: 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 "Neveljavno"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Variable"
 msgstr "Spremenljivo"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North"
 msgstr "sever"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North - NorthEast"
 msgstr "sever - severovzhod"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Northeast"
 msgstr "severovzhod"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - NorthEast"
 msgstr "vzhod - severovzhod"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East"
 msgstr "vzhod"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East - Southeast"
 msgstr "vzhod - jugovzhod"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southeast"
 msgstr "jugovzhod"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southeast"
 msgstr "jug - jugovzhod"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South"
 msgstr "jug"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South - Southwest"
 msgstr "jug - jugozahod"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Southwest"
 msgstr "jugozahod"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Southwest"
 msgstr "zahod - jugozahod"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West"
 msgstr "zahod"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West - Northwest"
 msgstr "zahod - severozahod"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "Northwest"
 msgstr "severozahod"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "North - Northwest"
 msgstr "sever - severozahod"
 
 #. DRIZZLE
-#: my-evolution/metar.c:127
+#: my-evolution/metar.c:128
 msgid "Drizzle"
 msgstr "Pršenje"
 
-#: my-evolution/metar.c:128
+#: my-evolution/metar.c:129
 msgid "Drizzle in the vicinity"
 msgstr "Pršenje v okolici"
 
-#: my-evolution/metar.c:129
+#: my-evolution/metar.c:130
 msgid "Light drizzle"
 msgstr "Rahlo pršenje"
 
-#: my-evolution/metar.c:130
+#: my-evolution/metar.c:131
 msgid "Moderate drizzle"
 msgstr "Zmerno pršenje"
 
 # @ Hmmm...
-#: my-evolution/metar.c:131
+#: my-evolution/metar.c:132
 msgid "Heavy drizzle"
 msgstr "Močno pršenje"
 
-#: my-evolution/metar.c:132
+#: my-evolution/metar.c:133
 msgid "Shallow drizzle"
 msgstr "Plitvo pršenje"
 
-#: my-evolution/metar.c:133
+#: my-evolution/metar.c:134
 msgid "Patches of drizzle"
 msgstr "Ponekod prši"
 
-#: my-evolution/metar.c:134
+#: my-evolution/metar.c:135
 msgid "Partial drizzle"
 msgstr "Prši s presledki"
 
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
 msgid "Thunderstorm"
 msgstr "Nevihta"
 
-#: my-evolution/metar.c:136
+#: my-evolution/metar.c:137
 msgid "Windy drizzle"
 msgstr "Pršenje z vetrom"
 
-#: my-evolution/metar.c:137
+#: my-evolution/metar.c:138
 msgid "Showers"
 msgstr "Plohe"
 
-#: my-evolution/metar.c:138
+#: my-evolution/metar.c:139
 msgid "Drifting drizzle"
 msgstr "Pršenje v pasovih"
 
-#: my-evolution/metar.c:139
+#: my-evolution/metar.c:140
 msgid "Freezing drizzle"
 msgstr "Zmrzujoče pršenje"
 
 #. RAIN
-#: my-evolution/metar.c:142
+#: my-evolution/metar.c:143
 msgid "Rain"
 msgstr "Dež"
 
-#: my-evolution/metar.c:143
+#: my-evolution/metar.c:144
 msgid "Rain in the vicinity"
 msgstr "Dež v okolici"
 
-#: my-evolution/metar.c:144
+#: my-evolution/metar.c:145
 msgid "Light rain"
 msgstr "Rahel dež"
 
-#: my-evolution/metar.c:145
+#: my-evolution/metar.c:146
 msgid "Moderate rain"
 msgstr "Zmeren dež"
 
-#: my-evolution/metar.c:146
+#: my-evolution/metar.c:147
 msgid "Heavy rain"
 msgstr "Močan dež"
 
-#: my-evolution/metar.c:147
+#: my-evolution/metar.c:148
 msgid "Shallow rain"
 msgstr "Plitev dež"
 
-#: my-evolution/metar.c:148
+#: my-evolution/metar.c:149
 msgid "Patches of rain"
 msgstr "Ponekod dežuje"
 
-#: my-evolution/metar.c:149
+#: my-evolution/metar.c:150
 msgid "Partial rainfall"
 msgstr "Dežuje s presledki"
 
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:152
 msgid "Blowing rainfall"
 msgstr "Dež z vetrom"
 
 # @ Hmmm....
-#: my-evolution/metar.c:152
+#: my-evolution/metar.c:153
 msgid "Rain showers"
 msgstr "Plohe"
 
-#: my-evolution/metar.c:153
+#: my-evolution/metar.c:154
 msgid "Drifting rain"
 msgstr "Dež v pasovih"
 
-#: my-evolution/metar.c:154
+#: my-evolution/metar.c:155
 msgid "Freezing rain"
 msgstr "Zmrzujoč dež"
 
 #. SNOW
-#: my-evolution/metar.c:157
+#: my-evolution/metar.c:158
 msgid "Snow"
 msgstr "Sneži"
 
-#: my-evolution/metar.c:158
+#: my-evolution/metar.c:159
 msgid "Snow in the vicinity"
 msgstr "Sneži v okolici"
 
-#: my-evolution/metar.c:159
+#: my-evolution/metar.c:160
 msgid "Light snow"
 msgstr "Rahlo sneži"
 
-#: my-evolution/metar.c:160
+#: my-evolution/metar.c:161
 msgid "Moderate snow"
 msgstr "Zmerno sneži"
 
-#: my-evolution/metar.c:161
+#: my-evolution/metar.c:162
 msgid "Heavy snow"
 msgstr "Močno sneži"
 
-#: my-evolution/metar.c:162
+#: my-evolution/metar.c:163
 msgid "Shallow snow"
 msgstr "Plitvo sneži"
 
-#: my-evolution/metar.c:163
+#: my-evolution/metar.c:164
 msgid "Patches of snow"
 msgstr "Ponekod sneži"
 
-#: my-evolution/metar.c:164
+#: my-evolution/metar.c:165
 msgid "Partial snowfall"
 msgstr "Sneži s presledki"
 
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr "Snežna nevihta"
 
-#: my-evolution/metar.c:166
+#: my-evolution/metar.c:167
 msgid "Blowing snowfall"
 msgstr "Sneži z vetrom"
 
-#: my-evolution/metar.c:167
+#: my-evolution/metar.c:168
 msgid "Snow showers"
 msgstr "Snežne plohe"
 
-#: my-evolution/metar.c:168
+#: my-evolution/metar.c:169
 msgid "Drifting snow"
 msgstr "Sneži v pasovih"
 
-#: my-evolution/metar.c:169
+#: my-evolution/metar.c:170
 msgid "Freezing snow"
 msgstr "Zmrzujoče sneži"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:172
+#: my-evolution/metar.c:173
 msgid "Snow grains"
 msgstr "Zrnat sneg"
 
-#: my-evolution/metar.c:173
+#: my-evolution/metar.c:174
 msgid "Snow grains in the vicinity"
 msgstr "Zrnato sneži v okolici"
 
-#: my-evolution/metar.c:174
+#: my-evolution/metar.c:175
 msgid "Light snow grains"
 msgstr "Rahlo zrnato sneži"
 
-#: my-evolution/metar.c:175
+#: my-evolution/metar.c:176
 msgid "Moderate snow grains"
 msgstr "Zmerno zrnato sneži"
 
-#: my-evolution/metar.c:176
+#: my-evolution/metar.c:177
 msgid "Heavy snow grains"
 msgstr "Močno zrnato sneži"
 
-#: my-evolution/metar.c:177
+#: my-evolution/metar.c:178
 msgid "Shallow snow grains"
 msgstr "Plitvo zrnato sneži"
 
-#: my-evolution/metar.c:178
+#: my-evolution/metar.c:179
 msgid "Patches of snow grains"
 msgstr "Ponekod zrnato sneži"
 
-#: my-evolution/metar.c:179
+#: my-evolution/metar.c:180
 msgid "Partial snow grains"
 msgstr "Zrnato sneži s presledki"
 
-#: my-evolution/metar.c:181
+#: my-evolution/metar.c:182
 msgid "Blowing snow grains"
 msgstr "Zrnato sneži z vetrom"
 
-#: my-evolution/metar.c:182
+#: my-evolution/metar.c:183
 msgid "Snow grain showers"
 msgstr "Plohe zrnatega snega"
 
-#: my-evolution/metar.c:183
+#: my-evolution/metar.c:184
 msgid "Drifting snow grains"
 msgstr "Zrnato sneži v pasovih"
 
-#: my-evolution/metar.c:184
+#: my-evolution/metar.c:185
 msgid "Freezing snow grains"
 msgstr "Zmrzujoče zrnato sneži"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:187
+#: my-evolution/metar.c:188
 msgid "Ice crystals"
 msgstr "Ledene iglice"
 
-#: my-evolution/metar.c:188
+#: my-evolution/metar.c:189
 msgid "Ice crystals in the vicinity"
 msgstr "Ledene iglice v okolici"
 
-#: my-evolution/metar.c:189
+#: my-evolution/metar.c:190
 msgid "Few ice crystals"
 msgstr "Malo ledenih iglic"
 
-#: my-evolution/metar.c:190
+#: my-evolution/metar.c:191
 msgid "Moderate ice crystals"
 msgstr "Zmerne ledene iglice"
 
-#: my-evolution/metar.c:191
+#: my-evolution/metar.c:192
 msgid "Heavy ice crystals"
 msgstr "Močne ledene iglice"
 
-#: my-evolution/metar.c:193
+#: my-evolution/metar.c:194
 msgid "Patches of ice crystals"
 msgstr "Ponekod ledene iglice"
 
-#: my-evolution/metar.c:194
+#: my-evolution/metar.c:195
 msgid "Partial ice crystals"
 msgstr "Ledene iglice s presledki"
 
-#: my-evolution/metar.c:195
+#: my-evolution/metar.c:196
 msgid "Ice crystal storm"
 msgstr "Nevihta ledenih iglic"
 
-#: my-evolution/metar.c:196
+#: my-evolution/metar.c:197
 msgid "Blowing ice crystals"
 msgstr "Ledene iglice z vetrom"
 
-#: my-evolution/metar.c:197
+#: my-evolution/metar.c:198
 msgid "Showers of ice crystals"
 msgstr "Plohe ledenih iglic"
 
-#: my-evolution/metar.c:198
+#: my-evolution/metar.c:199
 msgid "Drifting ice crystals"
 msgstr "Ledene iglice v pasovih"
 
-#: my-evolution/metar.c:199
+#: my-evolution/metar.c:200
 msgid "Freezing ice crystals"
 msgstr "Zmrzujoče ledene iglice"
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:202
+#: my-evolution/metar.c:203
 msgid "Ice pellets"
 msgstr "Babje pšeno"
 
-#: my-evolution/metar.c:203
+#: my-evolution/metar.c:204
 msgid "Ice pellets in the vicinity"
 msgstr "Babje pšeno v okolici"
 
-#: my-evolution/metar.c:204
+#: my-evolution/metar.c:205
 msgid "Few ice pellets"
 msgstr "Nekaj babjega pšena"
 
-#: my-evolution/metar.c:205
+#: my-evolution/metar.c:206
 msgid "Moderate ice pellets"
 msgstr "Zmerno babje pšeno"
 
-#: my-evolution/metar.c:206
+#: my-evolution/metar.c:207
 msgid "Heavy ice pellets"
 msgstr "Močno babje pšeno"
 
-#: my-evolution/metar.c:207
+#: my-evolution/metar.c:208
 msgid "Shallow ice pellets"
 msgstr "Plitvo babje pšeno"
 
-#: my-evolution/metar.c:208
+#: my-evolution/metar.c:209
 msgid "Patches of ice pellets"
 msgstr "Ponekod babje pšeno"
 
-#: my-evolution/metar.c:209
+#: my-evolution/metar.c:210
 msgid "Partial ice pellets"
 msgstr "Babje pšeno s presledki"
 
-#: my-evolution/metar.c:210
+#: my-evolution/metar.c:211
 msgid "Ice pellet storm"
 msgstr "Nevihta babjega pšena"
 
-#: my-evolution/metar.c:211
+#: my-evolution/metar.c:212
 msgid "Blowing ice pellets"
 msgstr "Babje pšeno z vetrom"
 
-#: my-evolution/metar.c:212
+#: my-evolution/metar.c:213
 msgid "Showers of ice pellets"
 msgstr "Plohe babjega pšena"
 
-#: my-evolution/metar.c:213
+#: my-evolution/metar.c:214
 msgid "Drifting ice pellets"
 msgstr "Babje pšeno v pasovih"
 
-#: my-evolution/metar.c:214
+#: my-evolution/metar.c:215
 msgid "Freezing ice pellets"
 msgstr "Zmrzujoče babje pšeno"
 
-#: my-evolution/metar.c:218
+#: my-evolution/metar.c:219
 msgid "Hail in the vicinity"
 msgstr "Toča v okolici"
 
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
+#: my-evolution/metar.c:220 my-evolution/metar.c:235
 msgid "Light hail"
 msgstr "Rahla toča"
 
-#: my-evolution/metar.c:220
+#: my-evolution/metar.c:221
 msgid "Moderate hail"
 msgstr "Zmerna toča"
 
-#: my-evolution/metar.c:221
+#: my-evolution/metar.c:222
 msgid "Heavy hail"
 msgstr "Močna toča"
 
-#: my-evolution/metar.c:222
+#: my-evolution/metar.c:223
 msgid "Shallow hail"
 msgstr "Plitva toča"
 
-#: my-evolution/metar.c:223
+#: my-evolution/metar.c:224
 msgid "Patches of hail"
 msgstr "Ponekod toča"
 
-#: my-evolution/metar.c:224
+#: my-evolution/metar.c:225
 msgid "Partial hail"
 msgstr "Toča s presledki"
 
-#: my-evolution/metar.c:225
+#: my-evolution/metar.c:226
 msgid "Hailstorm"
 msgstr "Nevihta toče"
 
-#: my-evolution/metar.c:226
+#: my-evolution/metar.c:227
 msgid "Blowing hail"
 msgstr "Toča z vetrom"
 
-#: my-evolution/metar.c:227
+#: my-evolution/metar.c:228
 msgid "Hail showers"
 msgstr "Ploha toče"
 
-#: my-evolution/metar.c:228
+#: my-evolution/metar.c:229
 msgid "Drifting hail"
 msgstr "Toča v pasovih"
 
-#: my-evolution/metar.c:229
+#: my-evolution/metar.c:230
 msgid "Freezing hail"
 msgstr "Zmrzujoča toča"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:232
+#: my-evolution/metar.c:233
 msgid "Small hail"
 msgstr "Sodra"
 
-#: my-evolution/metar.c:233
+#: my-evolution/metar.c:234
 msgid "Small hail in the vicinity"
 msgstr "Sodra v okolici"
 
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:236
 msgid "Moderate small hail"
 msgstr "Zmerna sodra"
 
-#: my-evolution/metar.c:236
+#: my-evolution/metar.c:237
 msgid "Heavy small hail"
 msgstr "Močna sodra"
 
-#: my-evolution/metar.c:237
+#: my-evolution/metar.c:238
 msgid "Shallow small hail"
 msgstr "Plitva sodra"
 
-#: my-evolution/metar.c:238
+#: my-evolution/metar.c:239
 msgid "Patches of small hail"
 msgstr "Ponekod sodra"
 
-#: my-evolution/metar.c:239
+#: my-evolution/metar.c:240
 msgid "Partial small hail"
 msgstr "Sodra s presledki"
 
-#: my-evolution/metar.c:240
+#: my-evolution/metar.c:241
 msgid "Small hailstorm"
 msgstr "Nevihta sodre"
 
-#: my-evolution/metar.c:241
+#: my-evolution/metar.c:242
 msgid "Blowing small hail"
 msgstr "Sodra z vetrom"
 
-#: my-evolution/metar.c:242
+#: my-evolution/metar.c:243
 msgid "Showers of small hail"
 msgstr "Ploha sodre"
 
-#: my-evolution/metar.c:243
+#: my-evolution/metar.c:244
 msgid "Drifting small hail"
 msgstr "Sodra v pasovih"
 
-#: my-evolution/metar.c:244
+#: my-evolution/metar.c:245
 msgid "Freezing small hail"
 msgstr "Zmrzujoča sodra"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:247
+#: my-evolution/metar.c:248
 msgid "Unknown precipitation"
 msgstr "Neznane padavine"
 
-#: my-evolution/metar.c:248
+#: my-evolution/metar.c:249
 msgid "Precipitation in the vicinity"
 msgstr "Padavine v okolici"
 
-#: my-evolution/metar.c:249
+#: my-evolution/metar.c:250
 msgid "Light precipitation"
 msgstr "Rahle padavine"
 
-#: my-evolution/metar.c:250
+#: my-evolution/metar.c:251
 msgid "Moderate precipitation"
 msgstr "Zmerne padavine"
 
-#: my-evolution/metar.c:251
+#: my-evolution/metar.c:252
 msgid "Heavy precipitation"
 msgstr "Močne padavine"
 
-#: my-evolution/metar.c:252
+#: my-evolution/metar.c:253
 msgid "Shallow precipitation"
 msgstr "Plitve padavine"
 
-#: my-evolution/metar.c:253
+#: my-evolution/metar.c:254
 msgid "Patches of precipitation"
 msgstr "Ponekod padavine"
 
-#: my-evolution/metar.c:254
+#: my-evolution/metar.c:255
 msgid "Partial precipitation"
 msgstr "Padavine s presledki"
 
-#: my-evolution/metar.c:255
+#: my-evolution/metar.c:256
 msgid "Unknown thunderstorm"
 msgstr "Nevihta neznanih padavin"
 
-#: my-evolution/metar.c:256
+#: my-evolution/metar.c:257
 msgid "Blowing precipitation"
 msgstr "Padavine z vetrom"
 
-#: my-evolution/metar.c:257
+#: my-evolution/metar.c:258
 msgid "Showers, type unknown"
 msgstr "Ploha neznanih padavin"
 
-#: my-evolution/metar.c:258
+#: my-evolution/metar.c:259
 msgid "Drifting precipitation"
 msgstr "Padavine v pasovih"
 
-#: my-evolution/metar.c:259
+#: my-evolution/metar.c:260
 msgid "Freezing precipitation"
 msgstr "Zmrzujoče padavine"
 
 #. MIST
-#: my-evolution/metar.c:262
+#: my-evolution/metar.c:263
 msgid "Mist"
 msgstr "Meglice"
 
-#: my-evolution/metar.c:263
+#: my-evolution/metar.c:264
 msgid "Mist in the vicinity"
 msgstr "Meglice v okolici"
 
-#: my-evolution/metar.c:264
+#: my-evolution/metar.c:265
 msgid "Light mist"
 msgstr "Rahle meglice"
 
-#: my-evolution/metar.c:265
+#: my-evolution/metar.c:266
 msgid "Moderate mist"
 msgstr "Zmerne meglice"
 
-#: my-evolution/metar.c:266
+#: my-evolution/metar.c:267
 msgid "Thick mist"
 msgstr "Goste meglice"
 
-#: my-evolution/metar.c:267
+#: my-evolution/metar.c:268
 msgid "Shallow mist"
 msgstr "Plitve meglice"
 
-#: my-evolution/metar.c:268
+#: my-evolution/metar.c:269
 msgid "Patches of mist"
 msgstr "Ponekod meglice"
 
-#: my-evolution/metar.c:269
+#: my-evolution/metar.c:270
 msgid "Partial mist"
 msgstr "Meglice s presledki"
 
-#: my-evolution/metar.c:271
+#: my-evolution/metar.c:272
 msgid "Mist with wind"
 msgstr "Meglice z vetrom"
 
-#: my-evolution/metar.c:273
+#: my-evolution/metar.c:274
 msgid "Drifting mist"
 msgstr "Meglice v pasovih"
 
-#: my-evolution/metar.c:274
+#: my-evolution/metar.c:275
 msgid "Freezing mist"
 msgstr "Zmrzujoče meglice"
 
 #. FOG
-#: my-evolution/metar.c:277
+#: my-evolution/metar.c:278
 msgid "Fog"
 msgstr "Megla"
 
-#: my-evolution/metar.c:278
+#: my-evolution/metar.c:279
 msgid "Fog in the vicinity"
 msgstr "Megla v okolici"
 
-#: my-evolution/metar.c:279
+#: my-evolution/metar.c:280
 msgid "Light fog"
 msgstr "Rahla megla"
 
-#: my-evolution/metar.c:280
+#: my-evolution/metar.c:281
 msgid "Moderate fog"
 msgstr "Zmerna megla"
 
-#: my-evolution/metar.c:281
+#: my-evolution/metar.c:282
 msgid "Thick fog"
 msgstr "Gosta megla"
 
-#: my-evolution/metar.c:282
+#: my-evolution/metar.c:283
 msgid "Shallow fog"
 msgstr "Plitva megla"
 
-#: my-evolution/metar.c:283
+#: my-evolution/metar.c:284
 msgid "Patches of fog"
 msgstr "Ponekod megla"
 
-#: my-evolution/metar.c:284
+#: my-evolution/metar.c:285
 msgid "Partial fog"
 msgstr "Megla s presledki"
 
-#: my-evolution/metar.c:286
+#: my-evolution/metar.c:287
 msgid "Fog with wind"
 msgstr "Megla z vetrom"
 
-#: my-evolution/metar.c:288
+#: my-evolution/metar.c:289
 msgid "Drifting fog"
 msgstr "Megla v pasovih"
 
-#: my-evolution/metar.c:289
+#: my-evolution/metar.c:290
 msgid "Freezing fog"
 msgstr "Zmrzujoča megla"
 
 #. SMOKE
-#: my-evolution/metar.c:292
+#: my-evolution/metar.c:293
 msgid "Smoke"
 msgstr "Dim"
 
-#: my-evolution/metar.c:293
+#: my-evolution/metar.c:294
 msgid "Smoke in the vicinity"
 msgstr "Dim v okolici"
 
-#: my-evolution/metar.c:294
+#: my-evolution/metar.c:295
 msgid "Thin smoke"
 msgstr "Redek dim"
 
-#: my-evolution/metar.c:295
+#: my-evolution/metar.c:296
 msgid "Moderate smoke"
 msgstr "Zmeren dim"
 
-#: my-evolution/metar.c:296
+#: my-evolution/metar.c:297
 msgid "Thick smoke"
 msgstr "Gost dim"
 
-#: my-evolution/metar.c:297
+#: my-evolution/metar.c:298
 msgid "Shallow smoke"
 msgstr "Plitev dim"
 
-#: my-evolution/metar.c:298
+#: my-evolution/metar.c:299
 msgid "Patches of smoke"
 msgstr "Ponekod dim"
 
-#: my-evolution/metar.c:299
+#: my-evolution/metar.c:300
 msgid "Partial smoke"
 msgstr "Dim s presledki"
 
-#: my-evolution/metar.c:300
+#: my-evolution/metar.c:301
 msgid "Thunderous smoke"
 msgstr "Nevihtni dim"
 
-#: my-evolution/metar.c:301
+#: my-evolution/metar.c:302
 msgid "Smoke with wind"
 msgstr "Dim z vetrom"
 
-#: my-evolution/metar.c:303
+#: my-evolution/metar.c:304
 msgid "Drifting smoke"
 msgstr "Dim v pasovih"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:307
+#: my-evolution/metar.c:308
 msgid "Volcanic ash"
 msgstr "Vulkanski pepel"
 
-#: my-evolution/metar.c:308
+#: my-evolution/metar.c:309
 msgid "Volcanic ash in the vicinity"
 msgstr "Vulkanski pepel v okolici"
 
-#: my-evolution/metar.c:310
+#: my-evolution/metar.c:311
 msgid "Moderate volcanic ash"
 msgstr "Zmeren vulkanski pepel"
 
-#: my-evolution/metar.c:311
+#: my-evolution/metar.c:312
 msgid "Thick volcanic ash"
 msgstr "Gost vulkanski pepel"
 
-#: my-evolution/metar.c:312
+#: my-evolution/metar.c:313
 msgid "Shallow volcanic ash"
 msgstr "Plitev vulkanski pepel"
 
-#: my-evolution/metar.c:313
+#: my-evolution/metar.c:314
 msgid "Patches of volcanic ash"
 msgstr "Ponekod vulkanski dim"
 
-#: my-evolution/metar.c:314
+#: my-evolution/metar.c:315
 msgid "Partial volcanic ash"
 msgstr "Vulkanski dim s presledki"
 
-#: my-evolution/metar.c:315
+#: my-evolution/metar.c:316
 msgid "Thunderous volcanic ash"
 msgstr "Nevihtni vulkanski pepel"
 
-#: my-evolution/metar.c:316
+#: my-evolution/metar.c:317
 msgid "Blowing volcanic ash"
 msgstr "Vulkanski dim z vetrom"
 
-#: my-evolution/metar.c:317
+#: my-evolution/metar.c:318
 msgid "Showers of volcanic ash"
 msgstr "Plohe vulkanskega pepela"
 
-#: my-evolution/metar.c:318
+#: my-evolution/metar.c:319
 msgid "Drifting volcanic ash"
 msgstr "Vulkanski dim v pasovih"
 
-#: my-evolution/metar.c:319
+#: my-evolution/metar.c:320
 msgid "Freezing volcanic ash"
 msgstr "Zmrzujoč vulkanski dim"
 
 #. SAND
-#: my-evolution/metar.c:322
+#: my-evolution/metar.c:323
 msgid "Sand"
 msgstr "Pesek"
 
-#: my-evolution/metar.c:323
+#: my-evolution/metar.c:324
 msgid "Sand in the vicinity"
 msgstr "Pesek v okolici"
 
-#: my-evolution/metar.c:324
+#: my-evolution/metar.c:325
 msgid "Light sand"
 msgstr "Rahel pesek"
 
-#: my-evolution/metar.c:325
+#: my-evolution/metar.c:326
 msgid "Moderate sand"
 msgstr "Zmeren pesek"
 
-#: my-evolution/metar.c:326
+#: my-evolution/metar.c:327
 msgid "Heavy sand"
 msgstr "Močan pesek"
 
-#: my-evolution/metar.c:328
+#: my-evolution/metar.c:329
 msgid "Patches of sand"
 msgstr "Ponekod pesek"
 
-#: my-evolution/metar.c:329
+#: my-evolution/metar.c:330
 msgid "Partial sand"
 msgstr "Pesek s presledki"
 
-#: my-evolution/metar.c:331
+#: my-evolution/metar.c:332
 msgid "Blowing sand"
 msgstr "Pesek z vetrom"
 
-#: my-evolution/metar.c:333
+#: my-evolution/metar.c:334
 msgid "Drifting sand"
 msgstr "Pesek v pasovih"
 
 #. HAZE
-#: my-evolution/metar.c:337
+#: my-evolution/metar.c:338
 msgid "Haze"
 msgstr "Suha motnost"
 
-#: my-evolution/metar.c:338
+#: my-evolution/metar.c:339
 msgid "Haze in the vicinity"
 msgstr "Suha motnost v okolici"
 
-#: my-evolution/metar.c:339
+#: my-evolution/metar.c:340
 msgid "Light haze"
 msgstr "Rahla suha motnost"
 
-#: my-evolution/metar.c:340
+#: my-evolution/metar.c:341
 msgid "Moderate haze"
 msgstr "Zmerna suha motnost"
 
-#: my-evolution/metar.c:341
+#: my-evolution/metar.c:342
 msgid "Thick haze"
 msgstr "Gosta suha motnost"
 
-#: my-evolution/metar.c:342
+#: my-evolution/metar.c:343
 msgid "Shallow haze"
 msgstr "Plitva suha motnost"
 
-#: my-evolution/metar.c:343
+#: my-evolution/metar.c:344
 msgid "Patches of haze"
 msgstr "Ponekod suha motnost"
 
-#: my-evolution/metar.c:344
+#: my-evolution/metar.c:345
 msgid "Partial haze"
 msgstr "Suha motnost s presledki"
 
-#: my-evolution/metar.c:346
+#: my-evolution/metar.c:347
 msgid "Haze with wind"
 msgstr "Suha motnost z vetrom"
 
-#: my-evolution/metar.c:348
+#: my-evolution/metar.c:349
 msgid "Drifting haze"
 msgstr "Suhta motnost v pasovih"
 
-#: my-evolution/metar.c:349
+#: my-evolution/metar.c:350
 msgid "Freezing haze"
 msgstr "Zmrzujoča suha motnost"
 
 #. SPRAY
-#: my-evolution/metar.c:352
+#: my-evolution/metar.c:353
 msgid "Spray"
 msgstr "Pršec"
 
-#: my-evolution/metar.c:353
+#: my-evolution/metar.c:354
 msgid "Spray in the vicinity"
 msgstr "Pršec v okolici"
 
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
 msgid "Light spray"
 msgstr "Rahel pršec"
 
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
 msgid "Moderate spray"
 msgstr "Zmeren pršec"
 
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
 msgid "Heavy spray"
 msgstr "Močan pršec"
 
-#: my-evolution/metar.c:357
+#: my-evolution/metar.c:358
 msgid "Shallow spray"
 msgstr "Plitev pršec"
 
-#: my-evolution/metar.c:358
+#: my-evolution/metar.c:359
 msgid "Patches of spray"
 msgstr "Ponekod pršec"
 
-#: my-evolution/metar.c:359
+#: my-evolution/metar.c:360
 msgid "Partial spray"
 msgstr "Pršec s presledki"
 
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
 msgid "Blowing spray"
 msgstr "Pršec z vetrom"
 
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
 msgid "Drifting spray"
 msgstr "Pršec v pasovih"
 
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
 msgid "Freezing spray"
 msgstr "Zmrzujoč pršec"
 
 #. DUST
-#: my-evolution/metar.c:367
+#: my-evolution/metar.c:368
 msgid "Dust"
 msgstr "Prah"
 
-#: my-evolution/metar.c:368
+#: my-evolution/metar.c:369
 msgid "Dust in the vicinity"
 msgstr "Prah v okolici"
 
-#: my-evolution/metar.c:369
+#: my-evolution/metar.c:370
 msgid "Light dust"
 msgstr "Rahel prah"
 
-#: my-evolution/metar.c:370
+#: my-evolution/metar.c:371
 msgid "Moderate dust"
 msgstr "Zmeren prah"
 
-#: my-evolution/metar.c:371
+#: my-evolution/metar.c:372
 msgid "Heavy dust"
 msgstr "Gost prah"
 
-#: my-evolution/metar.c:373
+#: my-evolution/metar.c:374
 msgid "Patches of dust"
 msgstr "Ponekod prah"
 
-#: my-evolution/metar.c:374
+#: my-evolution/metar.c:375
 msgid "Partial dust"
 msgstr "Prah s presledki"
 
-#: my-evolution/metar.c:376
+#: my-evolution/metar.c:377
 msgid "Blowing dust"
 msgstr "Prah z vetrom"
 
-#: my-evolution/metar.c:378
+#: my-evolution/metar.c:379
 msgid "Drifting dust"
 msgstr "Prah v pasovih"
 
 #. SQUALL
-#: my-evolution/metar.c:382
+#: my-evolution/metar.c:383
 msgid "Squall"
 msgstr "Piš vetra"
 
-#: my-evolution/metar.c:383
+#: my-evolution/metar.c:384
 msgid "Squall in the vicinity"
 msgstr "Piš vetra v okolici"
 
-#: my-evolution/metar.c:384
+#: my-evolution/metar.c:385
 msgid "Light squall"
 msgstr "Rahel piš vetra"
 
-#: my-evolution/metar.c:385
+#: my-evolution/metar.c:386
 msgid "Moderate squall"
 msgstr "Zmeren piš vetra"
 
-#: my-evolution/metar.c:386
+#: my-evolution/metar.c:387
 msgid "Heavy squall"
 msgstr "Močan piš vetra"
 
-#: my-evolution/metar.c:389
+#: my-evolution/metar.c:390
 msgid "Partial squall"
 msgstr "Piš vetra s presledki"
 
-#: my-evolution/metar.c:390
+#: my-evolution/metar.c:391
 msgid "Thunderous squall"
 msgstr "Piš vetra z grmenjem"
 
-#: my-evolution/metar.c:391
+#: my-evolution/metar.c:392
 msgid "Blowing squall"
 msgstr "Nôšen piš vetra"
 
-#: my-evolution/metar.c:393
+#: my-evolution/metar.c:394
 msgid "Drifting squall"
 msgstr "Piš vetra v pasovih"
 
-#: my-evolution/metar.c:394
+#: my-evolution/metar.c:395
 msgid "Freezing squall"
 msgstr "Zmrzujoč piš vetra"
 
 #. SANDSTORM
-#: my-evolution/metar.c:397
+#: my-evolution/metar.c:398
 msgid "Sandstorm"
 msgstr "Peščeni vihar"
 
-#: my-evolution/metar.c:398
+#: my-evolution/metar.c:399
 msgid "Sandstorm in the vicinity"
 msgstr "Peščeni vihar v okolici"
 
-#: my-evolution/metar.c:399
+#: my-evolution/metar.c:400
 msgid "Light standstorm"
 msgstr "Rahel peščeni vihar"
 
-#: my-evolution/metar.c:400
+#: my-evolution/metar.c:401
 msgid "Moderate sandstorm"
 msgstr "Zmeren peščeni vihar"
 
-#: my-evolution/metar.c:401
+#: my-evolution/metar.c:402
 msgid "Heavy sandstorm"
 msgstr "Močan peščeni vihar"
 
-#: my-evolution/metar.c:402
+#: my-evolution/metar.c:403
 msgid "Shallow sandstorm"
 msgstr "Plitev peščeni vihar"
 
-#: my-evolution/metar.c:404
+#: my-evolution/metar.c:405
 msgid "Partial sandstorm"
 msgstr "Peščeni vihar s presledki"
 
-#: my-evolution/metar.c:405
+#: my-evolution/metar.c:406
 msgid "Thunderous sandstorm"
 msgstr "Peščeni vihar z grmenjem"
 
-#: my-evolution/metar.c:406
+#: my-evolution/metar.c:407
 msgid "Blowing sandstorm"
 msgstr "Nôsen peščeni vihar"
 
-#: my-evolution/metar.c:408
+#: my-evolution/metar.c:409
 msgid "Drifting sandstorm"
 msgstr "Peščeni vihar v pasovih"
 
-#: my-evolution/metar.c:409
+#: my-evolution/metar.c:410
 msgid "Freezing sandstorm"
 msgstr "Zmrzujoč peščeni vihar"
 
 #. DUSTSTORM
-#: my-evolution/metar.c:412
+#: my-evolution/metar.c:413
 msgid "Duststorm"
 msgstr "Prašni vihar"
 
-#: my-evolution/metar.c:413
+#: my-evolution/metar.c:414
 msgid "Duststorm in the vicinity"
 msgstr "Prašni vihar v okolici"
 
-#: my-evolution/metar.c:414
+#: my-evolution/metar.c:415
 msgid "Light duststorm"
 msgstr "Rahel prašni vihar"
 
-#: my-evolution/metar.c:415
+#: my-evolution/metar.c:416
 msgid "Moderate duststorm"
 msgstr "Zmeren prašni vihar"
 
-#: my-evolution/metar.c:416
+#: my-evolution/metar.c:417
 msgid "Heavy duststorm"
 msgstr "Močan prašni vihar"
 
-#: my-evolution/metar.c:417
+#: my-evolution/metar.c:418
 msgid "Shallow duststorm"
 msgstr "Plitev prašni vihar"
 
-#: my-evolution/metar.c:419
+#: my-evolution/metar.c:420
 msgid "Partial duststorm"
 msgstr "Prašni vihar s presledki"
 
-#: my-evolution/metar.c:420
+#: my-evolution/metar.c:421
 msgid "Thunderous duststorm"
 msgstr "Prašni vihar z grmenjem"
 
-#: my-evolution/metar.c:421
+#: my-evolution/metar.c:422
 msgid "Blowing duststorm"
 msgstr "Nôsen prašni vihar"
 
-#: my-evolution/metar.c:423
+#: my-evolution/metar.c:424
 msgid "Drifting duststorm"
 msgstr "Prašni vihar v pasovih"
 
-#: my-evolution/metar.c:424
+#: my-evolution/metar.c:425
 msgid "Freezing duststorm"
 msgstr "Zmrzujoč prašni vihar"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
+#: my-evolution/metar.c:428
 msgid "Funnel cloud"
 msgstr "Tromba"
 
-#: my-evolution/metar.c:428
+#: my-evolution/metar.c:429
 msgid "Funnel cloud in the vicinity"
 msgstr "Tromba v okolici"
 
-#: my-evolution/metar.c:429
+#: my-evolution/metar.c:430
 msgid "Light funnel cloud"
 msgstr "Rahla tromba"
 
-#: my-evolution/metar.c:430
+#: my-evolution/metar.c:431
 msgid "Moderate funnel cloud"
 msgstr "Zmerna tromba"
 
-#: my-evolution/metar.c:431
+#: my-evolution/metar.c:432
 msgid "Thick funnel cloud"
 msgstr "Gosta tromba"
 
-#: my-evolution/metar.c:432
+#: my-evolution/metar.c:433
 msgid "Shallow funnel cloud"
 msgstr "Plitva tromba"
 
-#: my-evolution/metar.c:433
+#: my-evolution/metar.c:434
 msgid "Patches of funnel clouds"
 msgstr "Ponekod trombe"
 
-#: my-evolution/metar.c:434
+#: my-evolution/metar.c:435
 msgid "Partial funnel clouds"
 msgstr "Trombe s presledki"
 
-#: my-evolution/metar.c:436
+#: my-evolution/metar.c:437
 msgid "Funnel cloud w/ wind"
 msgstr "Tromba z vetrom"
 
-#: my-evolution/metar.c:438
+#: my-evolution/metar.c:439
 msgid "Drifting funnel cloud"
 msgstr "Tromba v pasovih"
 
 #. 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 "Tornado v okolici"
 
-#: my-evolution/metar.c:445
+#: my-evolution/metar.c:446
 msgid "Moderate tornado"
 msgstr "Zmeren tornado"
 
-#: my-evolution/metar.c:446
+#: my-evolution/metar.c:447
 msgid "Raging tornado"
 msgstr "Hud tornado"
 
-#: my-evolution/metar.c:449
+#: my-evolution/metar.c:450
 msgid "Partial tornado"
 msgstr "Tornado s presledki"
 
-#: my-evolution/metar.c:450
+#: my-evolution/metar.c:451
 msgid "Thunderous tornado"
 msgstr "Tornado z grmenjem"
 
-#: my-evolution/metar.c:453
+#: my-evolution/metar.c:454
 msgid "Drifting tornado"
 msgstr "Tornado v pasovih"
 
-#: my-evolution/metar.c:454
+#: my-evolution/metar.c:455
 msgid "Freezing tornado"
 msgstr "Zmrzujoč tornado"
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:457
+#: my-evolution/metar.c:458
 msgid "Dust whirls"
 msgstr "Prašni vrtinec"
 
-#: my-evolution/metar.c:458
+#: my-evolution/metar.c:459
 msgid "Dust whirls in the vicinity"
 msgstr "Prašni vrtinci v okolici"
 
-#: my-evolution/metar.c:459
+#: my-evolution/metar.c:460
 msgid "Light dust whirls"
 msgstr "Rahli prašni vrtinci"
 
-#: my-evolution/metar.c:460
+#: my-evolution/metar.c:461
 msgid "Moderate dust whirls"
 msgstr "Zmerni prašni vrtinci"
 
-#: my-evolution/metar.c:461
+#: my-evolution/metar.c:462
 msgid "Heavy dust whirls"
 msgstr "Močni prašni vrtinci"
 
-#: my-evolution/metar.c:462
+#: my-evolution/metar.c:463
 msgid "Shallow dust whirls"
 msgstr "Plitvi prašni vrtinci"
 
-#: my-evolution/metar.c:463
+#: my-evolution/metar.c:464
 msgid "Patches of dust whirls"
 msgstr "Ponekod prašni vrtinci"
 
-#: my-evolution/metar.c:464
+#: my-evolution/metar.c:465
 msgid "Partial dust whirls"
 msgstr "Prašni vrtinci s presledki"
 
-#: my-evolution/metar.c:466
+#: my-evolution/metar.c:467
 msgid "Blowing dust whirls"
 msgstr "Prašni vrtinci z vetrom"
 
-#: my-evolution/metar.c:468
+#: my-evolution/metar.c:469
 msgid "Drifting dust whirls"
 msgstr "Prašni vrtinci v pasovih"
 
@@ -23350,140 +25221,159 @@ msgid "C_elsius"
 msgstr "_Stopinjah"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Vsi viri _novic:"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "Koliko dni naj koledar pokaže hkrati?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "Na_jvečje število prikazanih predmetov:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Nastavitve virov novic"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "En _mesec"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "En _teden"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "Čas _osvežitve (sekund):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "Čas _osvežitve (sekund):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "_Kaži celotne poti map"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "Kaži _vse naloge"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "Kaži _današnje naloge"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Kaži temperaturo v:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Naloge "
 
-#: my-evolution/my-evolution.glade.h:16
-msgid "Weather settings"
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Nastavitve vremena"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Fahrenheitih"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_pet dni"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_Pošta"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "_Viri novic"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_En dan"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "_Načrtuj"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_Vreme"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-msgid "Factory for the Evolution notes component."
-msgstr "Tovarna komponent Evolucije zaznamkov."
-
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
-msgid "Factory for the Notes control"
-msgstr "Tovarna za kontrolo zaznamkov"
+#: 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:1
-msgid "The Evolution shell."
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
 msgstr "Evolucijina lupina."
 
-#: shell/e-activity-handler.c:162
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Nastavitev Evolucijine pošte"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Nastavitev pošte"
+
+#: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr "Kaži podrobnosti"
 
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
 msgid "Cancel Operation"
 msgstr "Prekliči operacijo"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-folder-dnd-bridge.c:55
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Nisem mogel prenesti mape:\n"
+"%s"
+
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "%s ob %s"
+
+#: shell/e-folder-list.c:338
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Dodaj pravilo vMape"
+
+#: shell/e-local-storage.c:179
+msgid "Drafts"
+msgstr "Osnutki"
+
+#: 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 "Dohodna pošta"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:181
 msgid "Outbox"
 msgstr "Odhodna pošta"
 
-#: shell/e-local-storage.c:1022
-msgid "Local Folders"
-msgstr "Krajevne mape"
-
-#: shell/e-setup.c:124
-msgid "Evolution installation"
-msgstr "Namestitev Evolucije"
-
-#: shell/e-setup.c:128
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Ta različica Evolucije mora namestiti dodatne datoteke\n"
-"v vaš osebni imenik Evolucije"
-
-#: shell/e-setup.c:129
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Prosim kliknite \"V redu\" za namestitev datotek ali \"Prekliči\" za izhod."
+#: shell/e-local-storage.c:182
+msgid "Sent"
+msgstr "Poslano"
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "Nisem mogel pravilno posodobiti datotek"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -23494,7 +25384,7 @@ msgstr ""
 "%s\n"
 "Napaka: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -23504,40 +25394,7 @@ msgstr ""
 "`%s'\n"
 " se je zgodila napaka."
 
-#: shell/e-setup.c:280
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Evolucija ni mogla ustvariti imenika:\n"
-"%s:\n"
-"%s"
-
-#: shell/e-setup.c:298
-#, c-format
-msgid ""
-"Directory %s\n"
-"does not have the right permissions. Please make it\n"
-"readable and executable and restart Evolution."
-msgstr ""
-"Imenik %s\n"
-"nima pravilnih dovoljenj. Prosim naredite ga\n"
-"berljivega in pisljivega ter znova poženite Evolucijo."
-
-#: shell/e-setup.c:304
-#, c-format
-msgid ""
-"File %s\n"
-"should be removed to allow Evolution to work correctly.\n"
-"Please remove this file and restart Evolution."
-msgstr ""
-"Datoteka %s\n"
-"mora biti odstranjena, da bi Evolucija delovala pravilno.\n"
-"Prosim, odstranite to datoteko ter znova poženite Evolucijo."
-
-#: shell/e-setup.c:327
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -23548,21 +25405,7 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabniških datotek nadaljuje."
 
-#: shell/e-setup.c:341
-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 ""
-"Evolucija je zaznala star imenik\n"
-"povzetka.\n"
-"Ta mora biti odstranjen preden se\n"
-"lahko Evolucija požene.\n"
-"Želite, da odstranim ta imenik?"
-
-#: shell/e-setup.c:366
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -23577,46 +25420,72 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "K vam prinešeno od"
 
+#: shell/e-shell-config-autocompletion.c:110
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Datum zaključka"
+
+#: shell/e-shell-config-default-folders.c:149
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Izberi mapo"
+
+#: shell/e-shell-config-folder-settings.c:70
+#, fuzzy
+msgid "Default Folders"
+msgstr "Izberi mapo"
+
+#: shell/e-shell-config-folder-settings.c:73
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Mapa filtrov"
+
+#: shell/e-shell-config-folder-settings.c:76
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Krajevne mape"
+
 #: shell/e-shell-folder-commands.c:140
+#, c-format
 msgid "Cannot copy folder: %s"
 msgstr "Ne morem kopirati mape: %s"
 
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
+#, c-format
 msgid "Cannot move folder: %s"
-msgstr ""
-"Ne morem prestaviti mape: %s"
+msgstr "Ne morem prestaviti mape: %s"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr "Ne morem prestaviti mape nase."
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr "Ne morem kopirati mape nase."
 
-#: 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 "Ne morem kopirati mape v eno od naslednic."
 
-#: 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 "Navedite mapo kamor naj se skopira mapa \"%s\":"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr "Kopiraj mapo"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:363
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Navedite mapo, kamor naj se prestavi mapa \"%s\":"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "Prestavi mapo"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -23625,18 +25494,17 @@ msgstr ""
 "Nisem mogel zbrisati mape:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:405
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr "Zbriši mapo '%s'"
+
+#: shell/e-shell-folder-commands.c:412
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Zbriši \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Ste prepričani, da želite zbrisati mapo \"%s\"?"
-
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -23645,55 +25513,57 @@ msgstr ""
 "Nisem mogel preimenovati mape:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj mapo \"%s\" v:"
 
-#: shell/e-shell-folder-commands.c:559
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr "Preimenuj mapo"
 
-#: shell/e-shell-folder-commands.c:569
-#: shell/e-shell-folder-creation-dialog.c:168
+#: 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 "Izbrano ime mape ni veljavno: %s"
 
-#: shell/e-shell-folder-creation-dialog.c:125
-#, c-format
+#: shell/e-shell-folder-commands.c:583
+msgid "Selected folder does not belong to another user"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:586
+#, fuzzy, c-format
 msgid ""
-"Cannot create the specified folder:\n"
+"Cannot remove folder:\n"
 "%s"
 msgstr ""
-"Ne morem ustvariti izbrane mape:\n"
+"Nisem mogel preimenovati mape:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolucija - Ustvar novo mapo"
-
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-creation-dialog.c:127
+#, c-format
 msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
+"Cannot create the specified folder:\n"
+"%s"
 msgstr ""
-"Vrsta izbrane mape ni veljavna za zahtevano\n"
-"operacijo."
+"Ne morem ustvariti izbrane mape:\n"
+"%s"
 
-#: shell/e-shell-folder-selection-dialog.c:376
-msgid "New..."
-msgstr "Nova..."
+#: shell/e-shell-folder-creation-dialog.c:308
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Ustvari _novo mapo..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Neimenovana)"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid "Choose the type of importer to run:"
 msgstr "Izberite  vrsto uvoznika, ki naj se požene:"
 
-#: 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"
@@ -23707,24 +25577,11 @@ msgstr ""
 "Če ne veste, lahko izberete \"Samodejno\" in Evolucija bo poskusila "
 "ugotoviti."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: 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 "Prosim, izberite podatke, ki jih želite uvoziti:"
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:243
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Uvažam %s\n"
-"Uvoznik ni pripravljen.\n"
-"Čakam 5 sekund na nov poskus."
-
-#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
+#: shell/e-shell-importer.c:247 shell/e-shell-importer.c:278
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -23733,21 +25590,22 @@ msgstr ""
 "Uvažam %s\n"
 "Uvažam predmet %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:351
+#, fuzzy
+msgid "Select importer"
+msgstr "Izberi mapo"
+
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "Mapa %s ne obstaja"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:493 shell/e-shell-importer.c:510
+#: shell/e-shell-importer.c:552
 msgid "Evolution Error"
 msgstr "Napaka Evolucije"
 
-#: shell/e-shell-importer.c:420
-msgid "You may only import to local folders"
-msgstr "Uvažate lahko le v krajevne mape"
-
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -23756,11 +25614,11 @@ msgstr ""
 "Ni uvoznika, ki bi lahko obravnaval\n"
 " %s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "Uvažam"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -23769,17 +25627,17 @@ msgstr ""
 "Uvažam %s.\n"
 "Pričenjam %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "Napaka ob zagonu %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Napaka ob nalaganju %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -23788,31 +25646,31 @@ msgstr ""
 "Uvažam %s\n"
 "Uvažam predmet 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Ime datoteke:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Izberi datoteko"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Vrsta datoteke:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "Uvozi podatke in nastavitve iz starejših programov"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "Uvozi eno samo datoteko"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -23820,151 +25678,216 @@ msgstr ""
 "Prosim počakajte...\n"
 "Iščem že obstoječe namestitve"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Poganjam pametne uvoznike"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "Od: %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Izberite ciljno mapo za uvoz teh podatkov"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1212 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr "Uvozi"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "Prekinjam povezave..."
 
-#: shell/e-shell-startup-wizard.c:159
-#, c-format
+#: shell/e-shell-offline-sync.c:163
+#, fuzzy, c-format
 msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-"Nisem mogel pognati Evolucijinega vmesnika za pomoč pri pošti\n"
-"(%s)"
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr "Uskladi \"%s\""
+
+#: shell/e-shell-offline-sync.c:232
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Uskljajujem mapo"
 
-#: shell/e-shell-startup-wizard.c:169
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "Nisem mogel pognati Evolucijinega vmesnika za pomoč pri pošti\n"
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:311
+#, fuzzy, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr "Uskladi \"%s\""
+
+#: shell/e-shell-settings-dialog.c:345
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolucija "
+
+#. 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 "Prosimo izberite strežnik."
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
-#: widgets/misc/e-charset-picker.c:104
+#: shell/e-shell-shared-folder-picker-dialog.c:374
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Odpiram mapo %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:380
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Odpiram mapo %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:385
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Odpri v %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:465
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Nisem mogel preimenovati mape: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:518
+#, fuzzy
+msgid "Cannot find the specified shared folder."
+msgstr ""
+"Ne morem ustvariti izbrane mape:\n"
+"%s"
+
+#: 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 "Nov"
 
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Ime mape ni navedeno."
 
-#: shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr "Ime mape ne more vsebovati znaka return"
 
-#: shell/e-shell-utils.c:127
-msgid "Folder name cannot contain slashes."
-msgstr "Ime mape ne more vsebovati poševnic"
+#: shell/e-shell-utils.c:129
+#, fuzzy
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "Ime mape ne more vsebovati znaka return"
+
+#: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "Ime mape ne more vsebovati znaka return"
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' in '..' sta rezervirana za imena map."
 
-#: shell/e-shell-view-menu.c:170
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Program 'Bug buddy' ni bil najden v vaši poti ($PATH)."
+#: shell/e-shell-view-menu.c:89
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr "Orodja GNOME Pilot niso nameščena na vašem sistemu."
 
-#: shell/e-shell-view-menu.c:178
+#: shell/e-shell-view-menu.c:97
+#, c-format
+msgid "Error executing %s."
+msgstr "Napaka ob izvajanju %s."
+
+#: shell/e-shell-view-menu.c:193
+#, fuzzy
+msgid "Bug buddy is not installed."
+msgstr "Programa 'Bug buddy' ni bilo mogoče pognati."
+
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
 msgstr "Programa 'Bug buddy' ni bilo mogoče pognati."
 
-#: shell/e-shell-view-menu.c:220
+#: shell/e-shell-view-menu.c:247
 msgid "About Ximian Evolution"
 msgstr "_O Ximian Evoluciji..."
 
-#: shell/e-shell-view-menu.c:432
+#: shell/e-shell-view-menu.c:502
 msgid "Go to folder..."
 msgstr "Pojdi v mapo..."
 
-#: shell/e-shell-view-menu.c:433
+#: shell/e-shell-view-menu.c:503
 msgid "Select the folder that you want to open"
 msgstr "Izberite mapo, ki jo želite odpreti"
 
-#: shell/e-shell-view-menu.c:553
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:617
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Ustvari novo bližnjico"
 
-#: shell/e-shell-view-menu.c:554
+#: shell/e-shell-view-menu.c:618
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Izberite mapo na katero naj kaže bližnjica:"
 
-#: shell/e-shell-view-menu.c:602
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "Orodja GNOME Pilot niso nameščena na vašem sistemu."
-
-#: shell/e-shell-view-menu.c:610
-#, c-format
-msgid "Error executing %s."
-msgstr "Napaka ob izvajanju %s."
-
-#: shell/e-shell-view-menu.c:715
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr "Delaj na _mreži"
 
-#: shell/e-shell-view-menu.c:728 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
 msgid "_Work Offline"
 msgstr "Delaj _brez mreže"
 
-#: shell/e-shell-view-menu.c:741 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:40
 msgid "Work Offline"
 msgstr "Delaj brez mreže"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "(Nobena mapa ni prikazana)"
 
-#: shell/e-shell-view.c:1802
+#: shell/e-shell-view.c:2045
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1804
+#: shell/e-shell-view.c:2047
 msgid "(None)"
 msgstr "(brez)"
 
-#: shell/e-shell-view.c:1851
+#: shell/e-shell-view.c:2091
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolucija je trenutno na mreži.  Kliknite na ta gumb za delo brez "
 "mreže."
 
-#: shell/e-shell-view.c:1858
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolucija je v procesu odklapljanja od mreže."
 
-#: shell/e-shell-view.c:1864
+#: shell/e-shell-view.c:2104
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolucija trenutno ni na mreži.  Kliknite ta gumb za delo z mrežo."
 
-#: shell/e-shell.c:652
+#: shell/e-shell.c:175
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Napaka iz aktivacijskega sistema je:\n"
+"%s"
+
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
 
-#: shell/e-shell.c:1710
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -23975,214 +25898,221 @@ msgstr ""
 "je nepričakovano zaključila. Morali boste zapreti in znova\n"
 "pognati Evolucijo, če želite dostopati do teh podatkov."
 
-#: shell/e-shell.c:1937
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Neveljavni argumenti"
 
-#: shell/e-shell.c:1939
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "Ne morem se registrirati pri OAF"
 
-#: shell/e-shell.c:1941
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "Podatkovna zbirka nastavitev ni bila najdena"
 
-#: shell/e-shell.c:1943 shell/e-storage.c:440
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Generična napaka"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:80
 msgid "Create new shortcut group"
 msgstr "Ustvari novo skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
 msgstr "Ime skupine:"
 
-#: shell/e-shortcuts-view.c:175
-#, 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 ""
 "Zares želite odstraniti skupino\n"
 "`%s' iz vrstice bližnjic?"
 
-#: shell/e-shortcuts-view.c:180
-msgid "Don't remove"
-msgstr "Ne odstrani"
-
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr "Preimenuj skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr "Preimenuj izbrano skupino bližnjic v:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "_Majhne ikone"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr "Kaži bližnjice kot majhne ikone"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr "_Velike ikone"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr "Kaži bližnjice kot velike ikone"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr "_Nova skupina..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr "Ustvari novo skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
 msgstr "_Odstrani to skupino..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr "Odstrani to skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
 msgstr "_Preimenuj to skupino..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr "Preimenuj to skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr "_Skrij vrstico z bližnjicami"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr "Skrij vrstico z bližnjicami"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:281
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Ustvari novo bližnjico"
+
+#: shell/e-shortcuts-view.c:282
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Ustvari novo bližnjico"
+
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr "Preimenuj bližnjico"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr "Preimenuj izbrano bližnjico v:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr "Odpri mapo povezano s to bližnjico"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:417 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Odpri v novem _oknu"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:417
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Odpri mapo povezano s to bližnjico v novem oknu"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr "P_reimenuj"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr "Preimenuj to bližnjico"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:422
 msgid "Re_move"
 msgstr "_Odstrani"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrani to bližnjico iz vrstice bližnjic"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr "Napaka ob shranjevanju bližnjic."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr "Bližnjice"
 
-#: shell/e-storage-set-view.c:648
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
 msgstr ""
-"Nisem mogel prenesti mape:\n"
-"%s"
 
-#: shell/e-storage.c:438
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "Brez napak"
 
-#: shell/e-storage.c:442
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr "Mapa z enakim imenom že obstaja"
 
-#: shell/e-storage.c:444
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr "Izbrana vrsta mape ni veljavna"
 
-#: shell/e-storage.c:446
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "V/I napaka"
 
-#: shell/e-storage.c:448
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr "Ni dovolj prostora za ustvaritev mape"
 
-#: shell/e-storage.c:450
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr "Mapa ni prazna"
 
-#: shell/e-storage.c:452
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr "Izbrana mapa ni bila najdena"
 
-#: shell/e-storage.c:454
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ni implementirana v tem hranilniku"
 
-#: shell/e-storage.c:458
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr "Operacija ni podprta"
 
-#: shell/e-storage.c:460
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr "Izbrana vrsta ni podprta v tem hranilniku"
 
-#: shell/e-storage.c:462
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr "Izbrane mape ni možno spremeniti ali odstraniti"
 
-#: shell/e-storage.c:464
+#: shell/e-storage.c:596
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Mapa ne more postati otrok svojih potomcev"
 
-#: shell/e-storage.c:466
+#: shell/e-storage.c:598
 msgid "Cannot create a folder with that name"
 msgstr "Ne morem ustvariti mape s takšnim imenom"
 
-#: shell/e-task-widget.c:191
+#: shell/e-storage.c:600
+msgid "This operation cannot be performed in off-line mode"
+msgstr ""
+
+#: 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%% končano)"
 
+#: shell/evolution-folder-selector-button.c:100
+msgid "<click here to select a folder>"
+msgstr "<kliknite tukaj za izbiro mape>"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -24220,121 +26150,158 @@ msgstr ""
 "Napaka iz aktivacijskega sistema je:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1022
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "Napaka CORBA"
 
-#: shell/evolution-shell-component.c:1024
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Prekinjen"
 
-#: shell/evolution-shell-component.c:1026
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Neveljaven argument"
 
-#: shell/evolution-shell-component.c:1028
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "Že ima lastnika"
 
-#: shell/evolution-shell-component.c:1030
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Brez lastnika"
 
-#: shell/evolution-shell-component.c:1032
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Ni bil(a) najden(a)"
 
-#: shell/evolution-shell-component.c:1034
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Nepodprta vrsta"
 
-#: shell/evolution-shell-component.c:1036
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Nepodprta shema"
 
-#: shell/evolution-shell-component.c:1038
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Nepodprto dejanje"
 
-#: shell/evolution-shell-component.c:1040
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Notranja napaka"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Obstaja"
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "Neveljaven URI"
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Ima podmape"
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Ni več prostora"
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "Star lastnik je umru"
 
-#: shell/evolution-test-component.c:44
+#: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Preveri vrsto"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr "Aktivne povezave"
+#: shell/evolution-test-component.c:703
+#, fuzzy
+msgid "Evolution Test Component"
+msgstr "Evolucijin veznik opravil"
 
-#: 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 "Kliknite \"V redu\" za zaprtje povezav in nadalnje delo brez mreže"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "Gostitelj"
-
-#: 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 "Sledeče povezave so trenutno aktivne:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Koledar"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Stiki: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Pošta"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Naloge"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder name:"
 msgstr "Ime mape:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder type:"
 msgstr "Vrsta mape:"
 
-#: 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 "Navedi kje naj se ustvarimapa:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+#, fuzzy
+msgid "_Account:"
+msgstr "Račun"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Ime mape:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_User:"
+msgstr "_Uporabniško ime:"
+
+#: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolucijin druid za nastavitev"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Uvažam datoteke"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Časovni pas "
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Dobrodošli"
 
-#: 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 ""
 "Dobrodošli v Evolucijo. Naslednjih nekaj zaslonov bo\n"
 "omogočilo Evoluciji, da se poveže z vašimi računi e-pošte\n"
@@ -24342,12 +26309,13 @@ msgstr ""
 "\n"
 "Prosim, za nadaljevanje kliknite gumb \"Naprej\". "
 
-#: 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 setup Evolution. \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 ""
 "Uspešno ste vnesli vse podatke potrebne za \n"
 "nastavitev Evolucije. \n"
@@ -24362,26 +26330,22 @@ msgid "Evolution Import Assistant"
 msgstr "Evolucijin uvozni druid"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr "Evolucijin uvozni druid"
-
-#: shell/importer/import.glade.h:4
 msgid "Import File (step 3 of 3)"
 msgstr "Uvozi datoteko (korak 3 od 3)"
 
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
 msgid "Importer Type (step 1 of 3)"
 msgstr "Vrsta uvoznika (korak 1 od 3)"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
 msgid "Select Importers (step 2 of 3)"
 msgstr "Izberite uvoznike (korak 2 od 3)"
 
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
 msgid "Select a File (step 2 of 3)"
 msgstr "Izberi datoteko (korak 2 od 3)"
 
-#: shell/importer/import.glade.h:8
+#: shell/importer/import.glade.h:7
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -24391,56 +26355,112 @@ msgstr ""
 "S tem druidom boste vodeni skozi proces uvoza\n"
 "zunanjih datotek v Evolucijo."
 
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
 msgid "Importers"
 msgstr "Uvozniki"
 
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Ne uvozi"
 
-#: shell/importer/intelligent.c:198
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Ne sprašuj me več"
 
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
 msgstr "Evolucija lahko uvozi podatke iz sledečih datotek:"
 
-#: shell/main.c:88
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr "Evolucija"
 
-#: shell/main.c:94
+#: shell/main.c:118
 msgid "Evolution is now exiting ..."
 msgstr "Evolucije se sedaj zapira..."
 
-#: shell/main.c:223
+#. 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 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 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"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+"Pozdrav.  Hvala, ker ste si vzeli čas za prenos te predogledne izdaje\n"
+"programja za delovne skupine Evolucija.\n"
+"\n"
+"Evolucija še ni končana. Še vedno so kraji, kjer funkcionalnost manjka ali\n"
+"deluje le polovično.\n"
+"\n"
+"Če najdete hrošča, ga prosimo sporočite na bugzilla.ximian.com.\n"
+"Ta izdelek prihaja brez kakršnihkoli zagotovil in ni primeren za\n"
+"osebe, ki doživljajo nasilne napade jeze.\n"
+"\n"
+"Upamo, da boste uživali sadove našega trdega dela in nestrpno\n"
+"pričakujemo vaše prispevke!\n"
+
+#: shell/main.c:290
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr ""
+"Hvala,\n"
+"skupina Evolucije\n"
+
+#: shell/main.c:298
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Ne sprašuj me več"
+
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ne morem dostopati do lupine Ximian Evolucije."
 
-#: shell/main.c:232
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ne morem inicializirati lupine Ximian Evolucije: %s"
 
-#: shell/main.c:302
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Izključi začetni zaslon"
 
-#: shell/main.c:303
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "Začni v ne-mrežnem načinu"
 
-#: shell/main.c:304
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "Začni v mrežnem načinu"
 
-#: shell/main.c:305
+#: shell/main.c:535
+#, fuzzy
+msgid "Forcibly shut down all evolution components"
+msgstr "Tovarna komponent Evolucije zaznamkov."
+
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr "Pošlji razhroščevalna sporočila vseh komponent v datoteko."
 
-#: shell/main.c:323
+#: shell/main.c:541
+msgid "Force upgrading of configuration files from Evolution 1.0.x"
+msgstr ""
+
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -24449,34 +26469,65 @@ msgstr ""
 "%s: --online in --ofline ne moreta biti uporabljena skupaj.\n"
 "  Uporabite %s --help za več podatkov.\n"
 
-#: shell/main.c:353
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Ne morem inicializirati komponentnega sistema 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 "Napaka ob nalaganju privzetega adresarja."
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Vhodna datoteka"
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "Izhodna datoteka"
-
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Ime datoteke ni navedeno."
 
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "Dodaj prilogo..."
+
+#: 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 "Opis vsebuje"
+
+#: 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 "Zbriši to sporčilo"
+
+#. 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 "Nisem mogel izvršiti %s: %s\n"
+
+#: 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 "Kopiraj stik(e) v drugo mapo..."
 
-#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kopiraj izbrano"
 
@@ -24484,267 +26535,178 @@ msgstr "Kopiraj izbrano"
 msgid "Copy to Folder..."
 msgstr "Kopiraj v mapo..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Ustvari nov stik"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Ustvari nov seznam stikov"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:12
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Izreži izbrano"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Zbriši izbrane stike"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "Dump"
-msgstr "Shrani"
-
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Prestavi stik(e) v drugo mapo..."
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Prestavi v mapo..."
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:23
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Prilepi odložišče"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Predogled stikov, ki bodo natisnjeni"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Predogled _tiskanja"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Natisni izbrane stike"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Shrani izbrane kontakte kot vVizitke"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Izberi vse"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Izberi vse stike"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Pošlji poročilo izbranim stikom."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Stiku pošlji sporočilo"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Pošlji izbrane stike drugi osebi."
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Ustavi"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Ustavi nalaganje"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:28
 msgid "View the current contact"
 msgstr "Poglej trenutni stik"
 
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: 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:9
-#: ui/evolution-mail-global.xml.h:17 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:101
+#: 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-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:43
 msgid "_Actions"
 msgstr "_Dejanja"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Addressbook Sources..."
-msgstr "Viri _adresarja..."
-
-#: ui/evolution-addressbook.xml.h:35
-msgid "_Contact List"
-msgstr "Seznam _stikov"
-
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Posreduj stik..."
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "Prestavi v _mapo..."
 
-#: ui/evolution-addressbook.xml.h:43 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:121
-#: ui/evolution-tasks.xml.h:24 ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "Na_tisni..."
-
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "_Shrani kot vVizitko"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "_Išči po kontaktih"
 
-#: ui/evolution-addressbook.xml.h:46
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "_Izberi vse"
 
-#: ui/evolution-addressbook.xml.h:47
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Send Message to Contact..."
 msgstr "Pošlji _sporočilo stiku..."
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "Nastavi pogled koledarja"
-
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "Ustvari nov celodnevni _dogodek"
-
-#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-msgid "Create a New _Task"
-msgstr "Ustvari novo _nalogo"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Ustvari _nov sestanek"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a _New Meeting"
-msgstr "Ustvari _nov sestanek"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
-msgstr "Ustvari nov sestanek"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create a new meeting request"
-msgstr "Ustvari nov zahtevek za sestanek"
-
-#: ui/evolution-calendar.xml.h:10 ui/evolution-tasks.xml.h:6
-msgid "Create a new task"
-msgstr "Ustvari nov posel"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Create an event for the whole day"
-msgstr "Ustvari sestanek, ki zavzame cel dan"
-
-#: ui/evolution-calendar.xml.h:13
 msgid "Day"
 msgstr "Dan"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "Zbriši ta sestanek"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Pojdi na"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Pojdi nazaj"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "Pojdi naprej"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "Pojdi na _datum"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Pojdi na določen datum"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "Pojdi na danes"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Mesec"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Predogled koledarja, ki bo natisnjen"
 
-#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "Predogled _tiskanja"
-
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Natisni ta koledar"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Objavi podatek o zasedenosti za ta koledar"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Kaži en dan"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Kaži en mesec"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Kaži en teden"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Pokaži delavni teden"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Teden"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "_Sestanek..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "_Nastavitve pošte..."
-
-#: ui/evolution-calendar.xml.h:40
-msgid "_Meeting..."
-msgstr "_Sestanek..."
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Publish Free/Busy Information"
-msgstr "_Objavi podatek o zasedenosti"
-
-#: ui/evolution-calendar.xml.h:44
-msgid "_Task..."
-msgstr "_Naloga..."
-
-#: 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
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
-msgid "Close"
-msgstr "Zapri"
-
 #: ui/evolution-comp-editor.xml.h:3
 msgid "Close this item"
 msgstr "Zapri ta predmet"
@@ -24753,8 +26715,8 @@ msgstr "Zapri ta predmet"
 msgid "Delete this item"
 msgstr "Zbriši ta predmet"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Glavna orodjarna"
 
@@ -24766,15 +26728,15 @@ msgstr "Predogled natisnjenega predmeta"
 msgid "Print this item"
 msgstr "Natisni ta predmet"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Natisni..."
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:240
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save"
 msgstr "Shrani"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Shrani kot..."
+
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-signature-editor.xml.h:6
@@ -24792,9 +26754,9 @@ msgstr "Shrani ta predmet na disk"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:36
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_Datoteka"
 
@@ -24804,7 +26766,7 @@ msgstr "Natisni kuverto..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Shrani _kot..."
 
@@ -24818,8 +26780,8 @@ msgstr "Pošlji _sporočilo stiku..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Shrani"
 
@@ -24859,24 +26821,25 @@ msgstr "Posreduj naprej kot i_Koledar"
 msgid "Forward this item via email"
 msgstr "Posreduj naprej preko e-pošte"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Dobi osvežene podatke o sestanku"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "Osveži sestanek"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "_Načrtuj sestanek"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "Načrtuj sestanek za ta predmet"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+#, fuzzy
+msgid "Customize My Evolution"
 msgstr "Prikroji Mojo Evolucijo"
 
 #: ui/evolution-mail-global.xml.h:2
@@ -24888,44 +26851,47 @@ msgid "Compose _New Message"
 msgstr "Sestavi _novo sporočilo"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Ustvari ali uredi poštne račune in ostale nastavitve"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Ustvari ali uredi pravila za filtriranje nove pošte"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Ustvari ali uredi določitve navideznih map"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Sprazni _smeti"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Pozabi _gesla"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Pozabi pomnjena gesla tako, da boste zanje znova vprašani"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "Odpri okno za sestavljanje novega poštnega sporočila"
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trajno odstrani vsa zbrisana sporočila iz vseh map"
 
+#: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Novo sporočilo"
+
 #: ui/evolution-mail-global.xml.h:12
-msgid "Send / Receive"
-msgstr "Oddaja / sprejem"
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Prestavi sporočilo v novo mapo"
 
 #: ui/evolution-mail-global.xml.h:13
-msgid "Send queued mail and retrieve new mail"
-msgstr "Pošlji pošto v vrsti in sprejmi novo pošto"
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "_Naroči se na mape..."
 
 #: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
@@ -24943,37 +26909,27 @@ msgstr "Urejevalnik _virtualnih map..."
 msgid "_Filters..."
 msgstr "_Filtri..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Settings..."
-msgstr "_Nastavitve pošte..."
-
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Preview Pane"
 msgstr "Pano _predogleda"
 
-#: ui/evolution-mail-global.xml.h:22
-msgid "_Send / Receive"
-msgstr "_Oddaja / sprejem"
-
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Subscribe to Folders..."
-msgstr "_Naroči se na mape..."
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Spremeni lastnosti te mape"
 
 #: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
-msgstr "Kopiraj izbrana sporočila"
+#, fuzzy
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Kopiraj izbrana sporočila v drugo mapo"
 
 #: ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "_Izreži"
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
-msgstr "Izreži izbrana sporočila"
+#, fuzzy
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Izreži izbran predmet na odložišče"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -25001,7 +26957,8 @@ msgid "Mark all visible messages as read"
 msgstr "Označi vsa vidna sporočila kot prebrana"
 
 #: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
 msgstr "Prilepi sporočilo na odložišče"
 
 #: ui/evolution-mail-list.xml.h:12
@@ -25048,11 +27005,11 @@ msgstr "Začasno skrij vsa izbrana sporočila"
 msgid "Threaded Message list"
 msgstr "Niten seznam sporočil"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:22
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "_Uniči"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "_Mapa"
 
@@ -25105,439 +27062,382 @@ msgid "Create _Virtual Folder From Message"
 msgstr "Iz sporočila ustvari na_videzno mapo"
 
 #: ui/evolution-mail-message.xml.h:11
-msgid "Create _Virtual Folder From Search..."
-msgstr "Iz iskanja ustvari na_videzno mapo..."
-
-#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages from this sender"
 msgstr "Ustvari pravilo za filtriranje sporočil tega pošiljatelja"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Ustvari pravilo za filtriranje sporočil tem prejemnikom"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Ustvari pravilo za filtriranje spročil temu dopisnemu seznamu"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "Ustvari pravilo za filtriranje sporočil s tem predmetom"
 
-#: ui/evolution-mail-message.xml.h:16
-msgid "Create a virtual folder based on this search"
-msgstr "Ustvari navidezno mapo za to iskanje"
-
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Ustvari navidezno mapo za te prejemnike"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Ustvari navidezno mapo za ta dopisni seznam"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Ustvari navidezno mapo za tega pošiljatelja"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Ustvari navidezno mapo za ta predmet"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Zmanjšaj velikost besedila"
 
-#: ui/evolution-mail-message.xml.h:23
-msgid "Design an advanced search to run on the messages in this folder"
-msgstr "Oblikuj napredno iskanje, ki naj poteče na sporočilih te mape"
-
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Kaži naslednje pomembno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Kaži naslednje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Kaži naslednje neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Kaži naslednjo neprebrano nit"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Kaži prejšnje pomembno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Kaži prejšnje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Kaži prejšnje neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:31
-msgid "Edit Saved Searches"
-msgstr "Uredi shranjena iskanja"
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Erase the current search"
-msgstr "Zbriši trenutno iskanje"
-
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:28
 msgid "F_orward"
 msgstr "P_osreduj naprej"
 
-#: ui/evolution-mail-message.xml.h:34
-msgid "Family Mail"
-msgstr "Družinska pošta"
-
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Filter glede na p_oštni seznam..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Filter glede na pošilja_telja"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Filter glede na preje_mnike..."
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Filter glede na za_devo..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:33
 msgid "Flag selected message(s) for follow-up"
 msgstr "Označi izbrana sporočila za navezavo"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:34
 msgid "Follow _Up..."
 msgstr "Nadal_jevanje..."
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:35
 msgid "Force images in HTML mail to be loaded"
 msgstr "Prisili, da bodo slike v HTML pošti naložene"
 
-#: ui/evolution-mail-message.xml.h:42
-msgid "Forward"
-msgstr "Posreduj naprej"
-
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Posreduj naprej izbrano sporočilo v telesu novega sporočila"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Posreduj izbrano sporočilo citirano kot odgovor"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Nekomu posreduj izbrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Nekomu posreduj izbrano sporočilo kot prilogo"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Povečaj velikost besedila"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "Naloži _slike"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Označi kot po_membno"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as U_nread"
 msgstr "Označi kot _neprebrano"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Označi kot _nepomembno"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected message(s) as having been read"
 msgstr "Označi izbrana sporočila kot prebrana"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected message(s) as important"
 msgstr "Označi izbrana sporočila kot pomembna"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Označi izbrana sporočila kot neprebrana"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Označi izbrana sporočila kot nepomembna"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Označi izbrana sporočila za brisanje"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Prestavi"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:53
 msgid "Move selected message(s) to another folder"
 msgstr "Prestavi izbrana sporočila v drugo mapo"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Naslednje"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next _Important Message"
 msgstr "Naslednje po_membno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next _Thread"
 msgstr "Naslednja _nit"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next _Unread Message"
 msgstr "Naslednje _neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Odpri izbrano sporočilo v novem oknu"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Odpri izbrano sporočilo v skladatelju za vnovično pošiljanje"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "Izvorna _velikost"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:61
 msgid "P_revious Unread Message"
 msgstr "P_rejšnje neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Post a Reply"
+msgstr "Odgovor na nalogo"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message in a Public folder"
+msgstr "Shrani sporočilo v izbrano mapo"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Pr_evious Important Message"
 msgstr "Pr_ejšnje pomembno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Predogled sporočila, ki bo natisnjeno"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Prejšnje"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Natisni to sporočilo"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr "_Preusmeri"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Izbrano sporočilo nekomu posreduj"
 
 #: ui/evolution-mail-message.xml.h:76
-msgid "Reply"
-msgstr "Odgovori"
-
-#: ui/evolution-mail-message.xml.h:77
-msgid "Reply to All"
-msgstr "Odgovori vsem"
-
-#: ui/evolution-mail-message.xml.h:80
 msgid "Reset the text to its original size"
 msgstr "Ponastavi besedilo na njegovo izvorno velikost"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "_Išči v sporočilu..."
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_Manjša"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Shrani sporočilo kot datoteko z besedilom"
 
-#: ui/evolution-mail-message.xml.h:84
-msgid "Save this search"
-msgstr "Shrani to iskanje"
-
-#: ui/evolution-mail-message.xml.h:85
-msgid "Saved Searches"
-msgstr "Shranjena iskanja"
-
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Išči besedilo v telesu prikazanega sporočila"
 
-#: ui/evolution-mail-message.xml.h:87
-msgid "Search through the messages in this folder"
-msgstr "Išči skozi sporočila v tej mapi"
-
-#: ui/evolution-mail-message.xml.h:88
-msgid "Setup the page settings for your current printer"
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "Set up the page settings for your current printer"
 msgstr "Nastavi lastnosti strani za vaš trenutni tiskalnik"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Kaži _izvorno kodo pošte"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Kaži celotne _glave"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Kaži sporočila v običajnem slogu"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Kaži sporočila s celotnimi glavami"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Kaži neposredno izvorno kodo sporočila"
 
-#: ui/evolution-mail-message.xml.h:94
-msgid "Sue's Phone"
-msgstr "Suein telefon"
-
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "_Velikost besedila"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Odbriši izbrana sporočila"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "vMapa glede na poštni se_znam..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "vMapa glede na _pošiljatelja..."
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "vMapa glede na pre_jemnike..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "vMapa glede na p_redmet"
 
-#: ui/evolution-mail-message.xml.h:102
-msgid "_Advanced Search..."
-msgstr "N_apredno iskanje..."
-
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
 msgstr "_Priloženo"
 
-#: ui/evolution-mail-message.xml.h:104
-msgid "_Clear Search"
-msgstr "_Počisti iskanje"
-
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Kopiraj v mapo"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "Iz sporočila _ustvari filter"
 
-#: ui/evolution-mail-message.xml.h:108
-msgid "_Edit Saved Searches..."
-msgstr "_Uredi shranjena iskanja..."
-
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Find Now"
-msgstr "_Išči sedaj"
-
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "Sporočilo _posreduj naprej"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Go To"
 msgstr "Po_jdi na"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Inline"
 msgstr "Kot _del sporočila"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Večje"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "Prikaz _sporočila"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Prestavi v mapo"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Next Message"
 msgstr "_Naslednje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Običajen prikaz"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Odpri sporočilo"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Previous Message"
 msgstr "_Prejšnje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ui/evolution-mail-message.xml.h:125
-msgid "_Save Search..."
-msgstr "_Shrani iskanje..."
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "_Preimenuj..."
 
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Orodja"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "O_dbriši"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Zapri to okno"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:33
+#: 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 "_Zapri"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
 msgid "_View"
 msgstr "Po_gled"
 
@@ -25545,6 +27445,10 @@ msgstr "Po_gled"
 msgid "Attach"
 msgstr "Priloži"
 
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Priloži datoteko"
+
 #: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Zapri trenutno datoteko"
@@ -25565,169 +27469,165 @@ msgstr "Šifriraj to sporočilo z S/MIME šifrirnim certifikatom"
 msgid "For_mat"
 msgstr "O_blika"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "Vstavi _datoteko z besedilom..."
+msgid "Open"
+msgstr "Odpri"
 
 #: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Vstavi datoteko v sporočilo kot besedilo"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Vstavi datoteko z besedilom..."
-
-#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Odpri datoteko"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Šifriraj s PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "Podpis s PGP"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "Šifriraj s S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "Podpis s S/MIME"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Shrani kot"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Shrani _osnutek"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Shrani v mapo..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Shrani trenutno datoteko"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Shrani trenutno datoteko pod drugim imenom"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Shrani sporočilo v izbrano mapo"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Pošlji"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Pošilji _kaseneje"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Pošlji _kasneje"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Pošlji pošto v HTML obliki"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Pošlji sporočilo kasneje"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Takoj pošlji to sporočilo"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Kaži / skrij priloge"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Kaži priloge"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Kaži priloge"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Podpiši to sporočilo s svojim PGP ključem"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Podpiši to sporočilo s svojim S/MIME podpisnim certifikatom"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Preklopi prikaz polja BCC"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Preklopi prikaz polja CC"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Preklopi prikaz izbirnika Od"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Preklopi prikaz polja Odgovori na"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Priloga..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "Polje _bcc"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "Polje _cc"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "_Zbriši vse"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "Polje _od"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Vstavi"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Odpri..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "Polje o_dgovori-na:"
 
-#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Varnost"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Shrani predmet in zapri dialog"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:52
 msgid "_Help"
 msgstr "_Pomoč"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "_Podpisi"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Dodaj mapo na seznam naročenih map"
@@ -25736,10 +27636,6 @@ msgstr "Dodaj mapo na seznam naročenih map"
 msgid "F_older"
 msgstr "_Mapa"
 
-#: ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Osveži seznam"
-
 #: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Osveži seznam map"
@@ -25780,46 +27676,38 @@ msgstr "Dobi osvežene podatke o nalogi"
 msgid "Re_fresh Task"
 msgstr "Osveži opravilo"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "Nastavi pogled nalog"
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopiraj izbrano opravilo"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Izreži izbrano opravilo"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete completed tasks"
 msgstr "Zbriši izbrana opravila"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Zbriši izbrana opravila"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:8
 msgid "Mar_k as Complete"
 msgstr "_Označi kot opravljeno"
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Prilepi opravilo z odložišča"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:11
 msgid "Previews the list of tasks to be printed"
 msgstr "Predogled nalog, ki bodo natisnjene"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:13
 msgid "Print the list of tasks"
 msgstr "Natisni seznam nalog"
 
-#: ui/evolution-tasks.xml.h:17
-msgid "Tasks Settings..."
-msgstr "Nastavitve nalog..."
-
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
 msgstr "O Ximian Evoluciji..."
@@ -25829,181 +27717,253 @@ msgid "Add to _Shortcut Bar"
 msgstr "Dodaj v vrstico z _bližnjicami"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolucijina lupina."
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Spremeni ime te mape"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Kopiraj mapo"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Ustvari _novo mapo..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Ustvari bližnjico na to mapo v vrstici bližnjic"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Ustvari novo mapo"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Ustvari novo bližnjico"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Ustvari novo mapo"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Zbriši to mapo"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Pokaži drugo mapo"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "Iz_hod"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "_Okno Evolucije"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Izhod iz programa"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Uvozi podatke iz drugih programov"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Prestavi to mapo na drugo mesto"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Ustvari _novo mapo..."
+
+#: ui/evolution.xml.h:22
+msgid "Open a folder belonging to some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Odpri v novem oknu"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Odpri to mapo v drugem oknu"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "_Nastavitve pilota..."
+
+#: ui/evolution.xml.h:27
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr ""
+
+#: ui/evolution.xml.h:28
+msgid "Send / Receive"
+msgstr "Oddaja / sprejem"
+
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Pošlji pošto v vrsti in sprejmi novo pošto"
+
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Nastavitev pošte"
+
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr "Kaži podatke o Ximian Evoluciji"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "_Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Pošlji poročilo o hrošču z uporabo progama Bug buddy"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "Preklopi"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "Preklopi prikaz vrstice z mapami"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Preklopi prikaz vrstice z bližnjicami"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr "Preklopi delo z mrežo"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "Poglej izbrane mape"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:41
 msgid "Ximian Evolution _FAQ"
 msgstr "_Pogosto zastavljena vprašanja"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:42
 msgid "_About Ximian Evolution..."
 msgstr "_O Ximian Evoluciji..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "_Kopiraj..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Vrstica map"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:50
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Mapa"
+
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr "_Uvozi..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "_Prestavi..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "_Nova"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "_Nova mapa"
 
-#: ui/evolution.xml.h:45
-msgid "_Pilot Settings..."
-msgstr "_Nastavitve pilota..."
+#: ui/evolution.xml.h:57
+#, fuzzy
+msgid "_Remove Other User's Folder"
+msgstr "_Prestavi v mapo"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ui/evolution.xml.h:47
-msgid "_Shortcut"
-msgstr "_Bližnjica"
+#: ui/evolution.xml.h:59
+msgid "_Send / Receive"
+msgstr "_Oddaja / sprejem"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "_Vrstica z bližnjicami"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "Spremeni nastavitve povzetka"
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Bližnjica"
 
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Natisni povzetek"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Znova naloži"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "Znova naloži ta pogled"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "Nastaviteve _povzetka..."
-
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Vizitke"
+#, fuzzy
+msgid "By _Company"
+msgstr "Po podjetju"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Po podjetju"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Vizitke"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Seznam telefonov"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Tedenski pogled"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Dnevni pogled"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Mesečni pogled"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Pogled delavnega tedna"
+
 #: views/mail/galview.xml.h:1
 msgid "As Sent Folder"
 msgstr "Kot mapa poslanih"
@@ -26028,13 +27988,18 @@ msgstr "Po zadevi"
 msgid "Messages"
 msgstr "Sporočila"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "S kategorijo"
 
-#. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Naloga"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
 msgid "UTC"
 msgstr "UTC"
 
@@ -26060,20 +28025,20 @@ msgstr ""
 "pasu.\n"
 " Uporabite desni miškin gumb za pomanjšavo."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr "_Trenutni pogled"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Pogled po meri"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View"
 msgstr "Shrani pogled po meri"
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr "Določi poglede"
 
@@ -26084,19 +28049,19 @@ msgid "MTWTFSS"
 msgstr "PTSČPSN"
 
 #. 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 "Sedaj"
 
-#: 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 "Danes"
 
-#: 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 "Datum mora biti v obliki: %s"
@@ -26105,80 +28070,80 @@ msgstr "Datum mora biti v obliki: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Vrednost v procentih mora biti med vključno 0 in 100"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "Baltski"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "Srednjeevropski"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "Kitajski"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "Cirilični"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr "Grški"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr "Hebrejski"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr "Japonski"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "Korejski"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "Turški"
 
-#: 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 "Zahodnoevropski"
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "Tradicionalen"
 
-#: 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 "Poenostavljen"
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "Ukrajinski"
 
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:97
 msgid "Visual"
 msgstr "Vidno"
 
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Neznan nabor znakov: %s"
 
-#: widgets/misc/e-charset-picker.c:204
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr "Vpišite nabor znakov, ki naj se uporablja"
 
-#: widgets/misc/e-charset-picker.c:279
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "Drugo..."
 
-#: widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr "Nabor znakov"
 
@@ -26186,82 +28151,1280 @@ msgstr "Nabor znakov"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr "Urejevalnik iskanja"
 
-#: widgets/misc/e-filter-bar.c:169
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "Shrani iskanje"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "Dodaj med shranjena iskanja"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "Počisti"
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
+msgid "_Save Search..."
+msgstr "_Shrani iskanje..."
 
-#: widgets/misc/e-filter-bar.h:96 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Uredi..."
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+msgid "_Edit Saved Searches..."
+msgstr "_Uredi shranjena iskanja..."
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Kaži vse"
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Napredno..."
 
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
 msgid "Information"
 msgstr "Podatki"
 
-#: widgets/misc/e-messagebox.c:173
+#: widgets/misc/e-messagebox.c:168
+msgid "Error"
+msgstr "Napaka"
+
+#: widgets/misc/e-messagebox.c:175
 msgid "Question"
 msgstr "Vprašanje"
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
 msgid "Message"
 msgstr "Sporočilo"
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
-msgstr "Tega sporočila ne kaži več."
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "I_skanje"
+
+#: widgets/misc/e-search-bar.c:537
+msgid "_Find Now"
+msgstr "_Išči sedaj"
+
+#: widgets/misc/e-search-bar.c:538
+#, fuzzy
+msgid "_Clear"
+msgstr "Počisti"
 
-#: widgets/misc/e-search-bar.c:342
-msgid "Sear_ch"
-msgstr "_Iskanje"
+#: widgets/misc/e-search-bar.c:833
+#, fuzzy
+msgid "Item ID"
+msgstr "_Predmet (FIXME)"
+
+#: widgets/misc/e-search-bar.c:840
+msgid "Subitem ID"
+msgstr ""
 
-#: widgets/misc/e-search-bar.c:468
+#: widgets/misc/e-search-bar.c:847
+#, fuzzy
+msgid "Text"
+msgstr "Preizkus"
+
+#: widgets/misc/e-search-bar.c:925
+msgid "Clear"
+msgstr "Počisti"
+
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Išči sedaj"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Strežnik osebnega adresarja"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Evolucijin adresarjev veznik"
+
+#: 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 "Evolucijin veznik Koledarja"
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Tovarna uvozov datotek LDIF v Evolucijo."
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Uvozi datoteke LDIF v Evolucijo. "
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Tovarna uvozov datotek vVizitk v Evolucijo."
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Uvozi datoteke vVizitk v Evolucijo. "
+
+#~ msgid "Error in search expression."
+#~ msgstr "Napaka v iskalnem izrazu."
+
+#~ msgid "Restarting search."
+#~ msgstr "Znova začenjam iskanje."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "Kontrola Bonobo za vznik naslova."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Kontrola Bonobo za prikaz naslova."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Vzorčna kontrola Bonobo, ki prikaže adresar."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Kontrola, ki prikaže mini vizitko iz Evolucijinega adresarja."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Evolucijina komponenta za urejanje stikov."
+
+#~ msgid "Factory for the Addressbook Minicard control"
+#~ msgstr "Tovarna za orodje mini vizitk adresarja"
+
+#~ msgid "Factory for the Addressbook's address displayer"
+#~ msgstr "Tovarna za prikazovalnik adresarjeve adrese"
+
+#~ msgid "Factory for the Addressbook's address popup"
+#~ msgstr "Tovarna za Adresarjev vznik naslova"
+
+#~ msgid "Factory for the sample Addressbook control"
+#~ msgstr "Tovarna za vzorčno kontrolo adresarja"
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "Uredi adresar"
+
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "_Avtentificiraj se pri srežniku z uporabo:"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Dodaj adresar"
+
+#~ msgid "Advanced"
+#~ msgstr "Napredno"
+
+#~ msgid "Base"
+#~ msgstr "Osnovno"
+
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "Izberite to, če strežnik zahteva od vas avtentifikacijo."
+
+#~ msgid ""
+#~ "Evolution will use this Distinquished Name (DN) to authenticate you with "
+#~ "the server"
+#~ msgstr ""
+#~ "Evolucija bo uporabila to Razločno ime (DN), za vašo avtentifikacijo pri "
+#~ "strežniku"
+
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr "Podatki spodaj so potrebni za dodajanje adresarja.  "
+
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr "Te podatki za večino strežnikov ldap niso potrebni"
+
+#~ 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 ""
+#~ "Te podatke potrebuje vaš strežnik ldap za določitev katera vozlišča naj "
+#~ "se uporabljajo za iskanja. Za več podatkov se obrnite na svojega "
+#~ "administratorja."
+
+#~ msgid ""
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
+#~ msgstr ""
+#~ "To je izhodiščno vozlišče vseh vaših iskanj na strežniku ldap. Za več "
+#~ "podatkov se obrnite na svojega administratorja."
+
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "To je ime strežnika, kjer se nahaja vaš adresar"
+
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "To so vrata, ki jih uporablja vaš strežnik ldap."
+
+#~ msgid "_Port:"
+#~ msgstr "_Vrata:"
+
+#~ msgid "Email is"
+#~ msgstr "E-naslov je"
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr "Tovarna Evolucijinih vmesnikov za izbiro imen iz adresarja"
+
+#~ msgid "Edit Contact List"
+#~ msgstr "Uredi seznam stikov"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d ni pokazanih)"
+
+#~ 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 ""
+#~ "Evolucija ne more dobiti krajevne hrambe adresarja.\n"
+#~ "To se lahko zgodi, če se komponenta evolution-addressbook sesuje.\n"
+#~ "Da bi nam pomagali bolje razumeti in na koncu rešiti ta problem,\n"
+#~ "prosim pošljite e-pošto na Jon Trowbridge <trow@ximian.com>.\n"
+#~ "Vsebuje naj podroben opis okoliščin v katerih se je ta napaka tgodila.\n"
+#~ "Hvala."
+
+#~ 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 ""
+#~ "Evolucija ne more dobiti krajevne hrambe adresarja.\n"
+#~ "V normalnih okoliščinah se to nikoli ne bi smelo zgoditi.\n"
+#~ "Za rešitev tega problema boste morali zapustiti in znova\n"
+#~ "pognati Evolucijo."
+
+#~ msgid "C_ontaining:"
+#~ msgstr "_Vsebujejo:"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Kaži stike, ki ustrezajo naslednjim kriterijem:"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "_Stiki..."
+
+#~ msgid "Phone Types"
+#~ msgstr "Vrste telefonov"
+
+#~ msgid "Display Cards?"
+#~ msgstr "Prikaži vizitke?"
+
+#~ msgid "Display Cards"
+#~ msgstr "Prikaži vizitke"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Kontrola Bonobo, ki prikaže seznam nalog."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Kontrola Bonobo, ki prikaže koledar."
+
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Evolucijina komponenta za povzetke."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Komponenta Evolucije za urejanje koledarja."
+
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Tovarna komponent za povzetke koledarja."
+
+#~ msgid "Factory for the Evolution Tasks control"
+#~ msgstr "Tovarna za Evolucijino komponento nalog."
+
+#~ msgid "Factory for the calendar iTip view control"
+#~ msgstr "Tvoarna za orodje koledarja iTip"
+
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr "Vzorčna tovarna za kontrolo koledarja"
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr "Tovarna za centralzacijo dialogov urejevalnika komponent koledarja."
+
+#~ msgid "Factory to create a component editor factory"
+#~ msgstr "Tovarna za ustvarjanje tovarne komponent urejevalnika."
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Storitev opozorilnega alarma"
+
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "Nisem mogel inicializirati GNOMEa"
+
+#~ msgid "Could not create the alarm notify service"
+#~ msgstr "Nisem mogel ustvariti storitve alarma"
+
+#~ msgid ""
+#~ "This is an email reminder, but Evolution does not yet support this kind "
+#~ "of reminders.  You will not be able to edit the options for this reminder."
+#~ msgstr ""
+#~ "To je opozorilo preko elektronske pošte, ki pa ga Evolucija še ne "
+#~ "podpira. Ne boste mogli spremeniti možnosti za to opozorilo."
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Ustvari nove sestanke s privzetim _opomnilnikom"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "Prvi dan ted_na:"
+
+#~ msgid "Sta_rt of day:"
+#~ msgstr "Zače_tek dneva:"
+
+#~ msgid "_End of day:"
+#~ msgstr "_Konec dneva:"
+
+#~ msgid "_Other"
+#~ msgstr "_Drugo"
+
+#~ msgid "before the start of the appointment"
+#~ msgstr "pred pričetkom sestanka"
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "Stanje sestanka se je spremenilo. Pošlji posodobljeno različico?"
+
+#~ msgid "_Other Organizer"
+#~ msgstr "_Drug organizator"
+
+#~ msgid "th"
+#~ msgstr "4."
+
+#~ msgid "_Delete this Task"
+#~ msgstr "_Zbriši to opravilo"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "_Zbriši ta sestanek"
+
+#~ msgid "Meeting begins: <b>"
+#~ msgstr "Čas pričetka sestanka: <b>"
+
+#~ msgid "Task begins: <b>"
+#~ msgstr "Čas pričetka opravila: <b>"
+
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "Podatki o zasedenosti se pričnejo: <b>"
+
+#~ msgid "Begins: <b>"
+#~ msgstr "Pričetek: <b>"
+
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "Čas zaključka sestanka: <b>"
+
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "Podatki o zasedenosti se končajo: <b>"
+
+#~ msgid "Task Completed: <b>"
+#~ msgstr "Opravilo končano: <b>"
+
+#~ msgid "Task Due: <b>"
+#~ msgstr "Rok opravila: <b>"
+
+#~ msgid "Unable to find any of your identities in the attendees list!\n"
+#~ msgstr "Ne morem najti nobene od vaših identitet v seznamu udeležencev!\n"
+
+#~ msgid "Non-Participants"
+#~ msgstr "Ne-udeleženci"
+
+#~ msgid "Could not create the component editor factory"
+#~ msgstr "Nisem mogel ustvariti tovarne komponent urejevalnikov"
+
+#~ msgid "Print Calendar"
+#~ msgstr "Natisni koledar"
+
+#~ msgid ""
+#~ "Could not create the tasks view.  Please check your ORBit and OAF setup."
+#~ msgstr ""
+#~ "Nisem mogel ustvariti pogleda nalog. Prosim preverite nastavitve ORBit-a "
+#~ "in OAF-a."
+
+#~ msgid ""
+#~ "Evolution has taken the tasks that were in your calendar folder and "
+#~ "automatically migrated them to the new tasks folder."
+#~ msgstr ""
+#~ "Evolucija je vzela naloge, ki so bile v vaši mapi koledarja in jih "
+#~ "samodejno prenesla v novo mapo nalog."
+
+#~ 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 ""
+#~ "Evolucija je poskušala vzeti vse naloge, ki so bile v vaši mapi koledarja "
+#~ "in jih prenesti v novo mapo nalog.\n"
+#~ "Nekaterih nalog ni bilo mogoče prenesti, zato bo ta proces v prihodnosti "
+#~ "še ponovljen."
+
+#~ msgid ""
+#~ "Could not open `%s'; no items from the calendar folder will be migrated "
+#~ "to the tasks folder."
+#~ msgstr ""
+#~ "Ne morem odpreti `%s'; noben predmet iz mape koledarja ne bo prenešen v "
+#~ "mapo nalog."
+
+#~ msgid ""
+#~ "The method required to load `%s' is not supported; no items from the "
+#~ "calendar folder will be migrated to the tasks folder."
+#~ msgstr ""
+#~ "Metoda potrebna za naložitev `%s' ni podprta; predmeti iz mape koledarja "
+#~ "ne bodo prenešeni v mapo nalog."
+
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Tovarna uvozov datotek iCalendar v Evolucijo"
+
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Uvozi datoteke iCalendar v Evolucijo."
+
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Uvozi datoteke vCalendar v Evolucijo."
+
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "Čisto podpisovanje v tem šifrirniku ni podprto"
+
+#~ msgid "Invalid type in body-contains, expecting string"
+#~ msgstr "Neveljaven tip v body-contains, pričakovan niz"
+
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Prosim vpišite svoje %s geslo za %s"
+
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Prosim vpišite svoje %s geslo"
+
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Ne morem podpisati sporočila: osnovnega besedila ni"
+
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Ne morem podpisati sporočila: geslo ni podano"
+
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Ne morem podpisati tega sporočila: nisem mogel ustvariti cevi do GPG/PGP: "
+#~ "%s"
+
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "Ne morem podpisati tega sporočila: ni osnovnega besedila"
+
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr ""
+#~ "Ne morem preveriti tega sporočila: ni osnovnega besedila za preverbo"
+
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Nisem mogel preveriti tega sporočila: nisem mogel ustvariti cevi do GPG/"
+#~ "PGP: %s"
+
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "Ne morem zašifirati tega sporočila: ni besedila za zašifriranje"
+
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Ne morem zašifirati tega sporočia: geslo ni podano"
+
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Ne morem zašifirati tega sporočila: nisem mogel ustvariti cevi do GPG/"
+#~ "PGP: %s"
+
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr ""
+#~ "Ne morem dešifrirati tega sporočila: ni zašifriranega besedila za "
+#~ "dekodiranje."
+
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "Ne morem dešifrirati tega sporočila: geslo ni podano"
+
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Ne morem dešifrirati tega sporočila: nisem mogel ustvariti cevi do GPG/"
+#~ "PGP: %s"
+
+#~ msgid "Error hashing password."
+#~ msgstr "Napaka ob razprševanju gesla."
+
+#~ msgid "Invalid password."
+#~ msgstr "Neveljavno geslo.7"
+
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr "Nisem mogel podpisati: certifikat za \"%s\" ni bil najden."
+
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr "Nisem mogel čistopodpisati: certifikat za \"%s\" ni bil najden."
+
+#~ msgid "Could not encrypt: failed to create enveloped data."
+#~ msgstr "Nisem mogel šifrirati: nisem uspel ustvariti podatkovne ovojnice."
+
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr "Nisem mogel šifrirati: nisem uspel ustvariti konteksta šifriranja"
+
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "Nisem mogel šifrirati podatkov: neveljaven ključ uporabnika \"%s\"."
+
+#~ msgid "Could not encrypt: encoding failed."
+#~ msgstr "Nisem mogel šifirirati: enkodiranje ni uspelo."
+
+#~ msgid "%s server %s"
+#~ msgstr "strežnik %s %s"
+
+#~ msgid "(unknown host)"
+#~ msgstr "(neznan gostitelj)"
+
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "Proizvedel: %s\n"
+#~ "Zadeva: %s"
+
+#~ msgid "No such message: %s"
+#~ msgstr "Ni takšnega sporočila: %s"
+
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "Ne morete kopirati sporočil iz te mape smeti."
+
+#~ msgid "Directory tree of mbox files"
+#~ msgstr "Imeniško drevo datotek mbox"
+
+#~ 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 ""
+#~ "Za dostopanje do pošte shranjene v zunanjem drevesu datotek mbox.\n"
+#~ "To vam bo omogočilo, da neposredno dostopate do map pine in elm.\n"
+#~ "OPOZORILO: Ta nudilnik je še vedno preizkusen, zato pred uporabo naredite "
+#~ "varnostno kopijo mape."
+
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Ne morem pripeti sporočila k datoteki vrste 'spool': %s: %s"
+
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Nisem mogel shraniti: %s: %s"
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Prosim vpišite geslo NNTP za %s@%s"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Strežnik je zavrnil uporabniško ime"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Nisem uspel poslati uporabniškega imena strežniku"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Strežnik je zavrnil uporabniško ime/geslo"
+
+#~ msgid "Internal error: uid in invalid format: %s"
+#~ msgstr "Notranja napaka: uid ima neveljavno obliko: %s"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Nisem mogel dobiti seznama skupin s strežnika."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "Nisem mogel naložiti datoteke s seznamom skupin za %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "Nisem mogel shraniti datoteke s seznamom skupin za %s: %s"
+
+#~ msgid "SASL Protocol error"
+#~ msgstr "Napaka protokola SASL"
+
+#~ msgid "I/O Error: %s"
+#~ msgstr "V/I napaka: %s"
+
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "V sporočilu nisem našel naslova 'From' (pošiljatelja)."
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Napaka pri pozdravu: %s: morda ni usodna"
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni naveden."
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "Zahtevek HELO je prekoračil časovno omejitev: %s: ni usodno"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "Napaka v odgovoru na HELO: %s: ni usodno"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "Zahtevek QUIT je prekoračil časovno omejitev: %s: ni usodno"
+
+#~ msgid "1 byte"
+#~ msgstr "1 bajt"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u bajtov"
+
+#~ msgid "Warning!"
+#~ msgstr "Opozorilo!"
+
+#~ msgid "Insert File"
+#~ msgstr "Vstavi datoteko"
+
+#~ msgid ""
+#~ "Could not create composer window, because you have not yet\n"
+#~ "configured any identities in the mail component."
+#~ msgstr ""
+#~ "Nisem mogel ustvariti okna skladatelja, ker še niste nastavili\n"
+#~ "identitet v komponenti pošte."
+
+#~ msgid "Cannot initialize Evolution's composer."
+#~ msgstr "Ne morem inicializirati Evolucijinega sestavljalca."
+
+#~ msgid "Evolution component for the executive summary."
+#~ msgstr "Evolucijina komponenta za povzetke."
+
+#~ msgid "Factory for the Evolution executive summary component."
+#~ msgstr "Tovarna za Evolucijine komponente za povzetke."
+
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Ne morem inicializirati Evolucijine komponente za povzetke."
+
+#~ 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 ""
+#~ "Za ozadje izvlečka lahko izberete drugačno HTML stran.\n"
+#~ "\n"
+#~ "Pustite pravno za privzete nastavitve"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Odpri %s s privzetim GNOMEovim programom"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Odpri %s s privzetim GNOMEovim brskalnikom"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Pošlji e-pošto %s"
+
+#~ msgid "Run %s"
+#~ msgstr "Poženi %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Zapri %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Premakni %s na levo"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Premakni %s na desno"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Premakni %s v prešnjo vrstico"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Premakni %s v naslednjo vrstico"
+
+#~ msgid "Configure %s"
+#~ msgstr "Nastavi /%s"
+
+#~ msgid "page"
+#~ msgstr "stran"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nisem mogel odpreti HTML datoteke:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Napaka ob branju podatkov:\n"
+#~ "%s"
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "Datoteka nima mesta za storitve.\n"
+
+#~ 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 ""
+#~ "Komponenta Povzetek ni mogla inicializirati Bonoba.\n"
+#~ "Če se je pokazalo opozorilo o RootPOA, to verjetno pomeni,\n"
+#~ "da ste prevedli Bonobo z GOAD-om namesto z OAF-om."
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Tovarna za povzetke RDF."
+
+#~ msgid "RDF Summary"
+#~ msgstr "Povzetek RDF"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Tovarna za preizkusno komponento bonobo."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Tovarna za preizkusno komponento."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Preizkusi storitev bonobo"
+
+#~ msgid "Test service"
+#~ msgstr "Preizkusi storitev"
+
+#~ msgid "Update automatically"
+#~ msgstr "Samodejno posodobi"
+
+#~ msgid "Update now"
+#~ msgstr "Posodobi zdaj"
+
+#~ msgid "Update every "
+#~ msgstr "Posodobi vsakih"
+
+#~ msgid "year"
+#~ msgstr "leto"
+
+#~ msgid "week"
+#~ msgstr "teden"
+
+#~ msgid "hour"
+#~ msgstr "ura"
+
+#~ msgid "minute"
+#~ msgstr "minuta"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "Strežnik osebnega koledarja; tovarna koledarjal"
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Izbrali ste neveljaven datum."
 
-#: wombat/wombat.c:200
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): nisem mogel inicializirati GNOME-VFS"
+#~ 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 ""
+#~ "Datum tega sporočila bo primerjan s\n"
+#~ "časom ob katerem se bo pognal filter\n"
+#~ "ali vmapa odprta."
+
+#~ msgid " ago"
+#~ msgstr " nazaj "
+
+#~ msgid "Add action"
+#~ msgstr "Dodaj dejanje"
+
+#~ msgid ""
+#~ "You forgot to choose a folder.\n"
+#~ "Please go back and specify a valid folder to deliver mail to."
+#~ msgstr ""
+#~ "Pozabili ste izbrati mapo.\n"
+#~ "Pojdite nazaj in navedite veljavno mapo v katero naj se dostavlja pošta."
+
+#~ msgid "Enter folder URI"
+#~ msgstr "Vnesite URI mape"
+
+#~ msgid "Add criterion"
+#~ msgstr "Dodaj pogoj"
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Evolucijina komponenta za obravnavo pošte."
+
+#~ msgid "Evolution mail executive summary component."
+#~ msgstr "Evolucijina komponenta za povzetke."
+
+#~ msgid "Evolution mail folder factory component."
+#~ msgstr "Evolucijina komponenta za tovarne poštnih map."
+
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr "Tovarna za Evolucijinega skladatelja."
+
+#~ msgid "Factory for the Mail Summary component."
+#~ msgstr "Tovarna za komponento povzetka pošte."
+
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "Mapa v kateri se hrani pošta (notranja)"
+
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Nisem se mogel povezati s hrambo: %s"
+
+#~ msgid "Cannot initialize Evolution's mail component."
+#~ msgstr "Ne morem inicializirati Evolucijine komponente za pošto."
+
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "Ne morem inicializirati Evolucijine komponente za nastavitev pošte."
+
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Ne morem inicializirati Evolucijine komponente za podatke o mapah"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Ustvari vMapo iz iskanja"
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Tovarna za uvoz mbox predalov v Evolucijo"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Uvozi mbox daoteke v Evolucijo"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "Tovarna za uvoz pošte Outlook Express 4 v Evolucijo"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Uvozi datoteke Outlook Express 4 v Evolucijo"
+
+#~ msgid "Indexing:"
+#~ msgstr "Ustvarjanje kazala:"
+
+#~ msgid "Mailbox Format"
+#~ msgstr "Vrsta poštnega predala"
+
+#~ msgid "Random"
+#~ msgstr "Naključno"
+
+#~ msgid ""
+#~ "Please specify signature filename\n"
+#~ "in Andvanced section of signature settings."
+#~ msgstr ""
+#~ "Prosim navedite datoteko s podpisom\n"
+#~ "v naprednem odseku nastavitev podpisa."
+
+#~ msgid " (default)"
+#~ msgstr " (privzeto)"
+
+#~ msgid "Really delete account?"
+#~ msgstr "Resnično zbriši račun?"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Ste prepričani, želite zbrisati ta novičarski račun?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "Nastaviti morate račun preden lahko pošljete to e-pošto."
+
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "Pojdi v naslednjo mapo z neprebranimi sporočili?"
+
+#~ msgid ""
+#~ "There are no more new messages in this folder.\n"
+#~ "Would you like to go to the next folder?"
+#~ msgstr ""
+#~ "V tej mapi ni več novih sporočil.\n"
+#~ "Želite iti v naslednjo mapo?"
+
+#~ msgid "US-Letter"
+#~ msgstr "ZDA-pismo"
+
+#~ msgid ""
+#~ "Could not get inbox for new mail store:\n"
+#~ "%s\n"
+#~ "No shortcut will be created."
+#~ msgstr ""
+#~ "Nisem mogel dobiti vhodnega predala za novo hrambo pošte:\n"
+#~ "%s\n"
+#~ "Bližnjica ne bo ustvarjena."
+
+#~ msgid "%s: Inbox"
+#~ msgstr "%s: Dohdona pošta"
+
+#~ msgid "Cannot execute signature script"
+#~ msgstr "Nisem mogel izvesti skripte podpisa"
+
+#~ msgid "                        "
+#~ msgstr "                        "
+
+#~ msgid "&lt;&lt; S_imple"
+#~ msgstr "&lt;&lt; _Enostavno"
+
+#~ msgid "/home/rodo/cvs/evolution/mail/"
+#~ msgstr "/home/rodo/cvs/evolution/mail/"
+
+#~ msgid "Accounts"
+#~ msgstr "Računi"
+
+#~ msgid "Ad_vanced &gt;&gt;"
+#~ msgstr "Napredno &gt;&gt;"
+
+#~ msgid "Always _encrypt to myself when sending encrypted mail"
+#~ msgstr "Kadar pošiljam ši_frirano pošto, vedno šifriraj sebi"
+
+#~ msgid "Composer"
+#~ msgstr "Skladatelj"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "Privzet način posredovanja naprej je: "
+
+#~ msgid "Delete selected signature"
+#~ msgstr "Zbriši izbran podpis"
+
+#~ msgid "Display"
+#~ msgstr "Prikaz"
+
+#~ msgid "E_mail address:"
+#~ msgstr "_E-poštni naslov:"
+
+#~ msgid "Ed_it..."
+#~ msgstr "_Uredi..."
+
+#~ msgid "Edi_t..."
+#~ msgstr "Ur_edi..."
+
+#~ msgid "Edit signature content in editor"
+#~ msgstr "Uredi vsebino podpisa v urejevalniku"
+
+#~ msgid "File containing signature"
+#~ msgstr "Datoteka, ki vsebuje podpis"
+
+#~ msgid "Hide advanced settings"
+#~ msgstr "Skrij napredne nastavitve"
+
+#~ msgid "If selected signature will be included in random signature list"
+#~ msgstr "Če bo izbran podpis vključen v seznamu naključnih podpisov"
+
+#~ msgid "Include in _random signatures list"
+#~ msgstr "Vključi v seznamu na_ključnih podpisov"
+
+#~ msgid "NNTP Server:"
+#~ msgstr "Strežnik NNTP"
+
+#~ msgid "N_ew..."
+#~ msgstr "N_ova..."
+
+#~ msgid "Name of selected signature"
+#~ msgstr "Ime izbranega podpisa"
+
+#~ msgid "Ne_w..."
+#~ msgstr "No_va..."
+
+#~ msgid "News"
+#~ msgstr "Novice"
+
+#~ msgid "Same as text"
+#~ msgstr "Enako kot besedilo"
+
+#~ msgid "Script which is run before signature loading from specified filename"
+#~ msgstr "Skripta, ki se požene pred nalaganjem podpisa iz navedene datoteke"
+
+#~ msgid "Select Filter Log file..."
+#~ msgstr "Izberi datoteko za dnevnik filtra..."
+
+#~ msgid "Select PGP binary"
+#~ msgstr "Izberi datoteko PGP"
+
+#~ msgid "Show advanced settings"
+#~ msgstr "Kaži napredne nastavitve"
+
+#~ msgid "Sources"
+#~ msgstr "Viri"
+
+#~ msgid "Text _Signature:"
+#~ msgstr "Besedilo _podpisa:"
+
+#~ msgid "_Edit..."
+#~ msgstr "_Uredi..."
+
+#~ msgid "_Filename"
+#~ msgstr "_Ime datoteke:"
+
+#~ msgid "_HTML Signature:"
+#~ msgstr "Podpis _HTML:"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "Zapisuj dejanja filtra v:"
+
+#~ msgid "_Name"
+#~ msgstr "_Ime"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Organizacija:"
+
+#~ msgid "_PGP binary path:"
+#~ msgstr "Pot do izvršljive datoteke _PGP"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "Privzeto pošiljaj pošto v _HTML obliki."
+
+#~ msgid "_Server type: "
+#~ msgstr "Vrsta _strežnika: "
+
+#~ msgid "newswindow1"
+#~ msgstr "oknonovic1"
+
+#~ msgid "placeholder"
+#~ msgstr "držalec mesta"
+
+#~ msgid "seconds."
+#~ msgstr "sekund."
+
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "Nisem mogel ustvariti konteksta šifiranja PGP."
+
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "Nisem mogel ustvariti konteksta dešifriranja PGP."
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Shrani na disk..."
+
+#~ msgid "Evolution does not recognize this type of signed message."
+#~ msgstr "Evolucija ne pozna te vrste podpisa sporočila"
+
+#~ msgid "%s may not be reconfigured because it is not a local folder"
+#~ msgstr "%s se ne da nasatviti, saj ni krajevna mapa"
+
+#~ msgid "Moving"
+#~ msgstr "Prestavljam"
+
+#~ msgid "Copying"
+#~ msgstr "Kopiram"
+
+#~ msgid "Executing shell command: %s"
+#~ msgstr "Izvajam ukaz lupine: %s"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "V cev je bilo zapisano nepopolno sporočilo!"
+
+#~ msgid "Mail Summary"
+#~ msgstr "Povzetek pošte"
+
+#~ msgid " _Refresh List "
+#~ msgstr " _Osveži seznam"
+
+#~ msgid "All folders"
+#~ msgstr "Vse mape"
+
+#~ msgid "Display options"
+#~ msgstr "Pokaži možnosti"
+
+#~ msgid "Folders whose names begin with:"
+#~ msgstr "Mape, katerih ime se začno z:"
+
+#~ msgid "Show _folders from server: "
+#~ msgstr "Kaži _mape s strežnika: "
+
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "Ne morem inicializirati Evolucijine komponente za povzetek."
+
+#~ msgid "Summary Settings"
+#~ msgstr "Nastavitev povzetka"
+
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "Komponenta povzetka ni mogla inicializirati Bonoba.\n"
+
+#~ msgid "Factory for the Notes control"
+#~ msgstr "Tovarna za kontrolo zaznamkov"
+
+#~ msgid "Evolution installation"
+#~ msgstr "Namestitev Evolucije"
+
+#~ msgid ""
+#~ "This new version of Evolution needs to install additional files\n"
+#~ "into your personal Evolution directory"
+#~ msgstr ""
+#~ "Ta različica Evolucije mora namestiti dodatne datoteke\n"
+#~ "v vaš osebni imenik Evolucije"
+
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr ""
+#~ "Prosim kliknite \"V redu\" za namestitev datotek ali \"Prekliči\" za "
+#~ "izhod."
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Evolucija ni mogla ustvariti imenika:\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 ""
+#~ "Imenik %s\n"
+#~ "nima pravilnih dovoljenj. Prosim naredite ga\n"
+#~ "berljivega in pisljivega ter znova poženite Evolucijo."
+
+#~ msgid ""
+#~ "File %s\n"
+#~ "should be removed to allow Evolution to work correctly.\n"
+#~ "Please remove this file and restart Evolution."
+#~ msgstr ""
+#~ "Datoteka %s\n"
+#~ "mora biti odstranjena, da bi Evolucija delovala pravilno.\n"
+#~ "Prosim, odstranite to datoteko ter znova poženite Evolucijo."
+
+#~ 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 ""
+#~ "Evolucija je zaznala star imenik\n"
+#~ "povzetka.\n"
+#~ "Ta mora biti odstranjen preden se\n"
+#~ "lahko Evolucija požene.\n"
+#~ "Želite, da odstranim ta imenik?"
+
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Ste prepričani, da želite zbrisati mapo \"%s\"?"
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolucija - Ustvar novo mapo"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "Vrsta izbrane mape ni veljavna za zahtevano\n"
+#~ "operacijo."
+
+#~ msgid "New..."
+#~ msgstr "Nova..."
+
+#~ msgid ""
+#~ "Importing %s\n"
+#~ "Importer not ready.\n"
+#~ "Waiting 5 seconds to retry."
+#~ msgstr ""
+#~ "Uvažam %s\n"
+#~ "Uvoznik ni pripravljen.\n"
+#~ "Čakam 5 sekund na nov poskus."
 
-#: wombat/wombat.c:212
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): nisem mogel inicializirati GNOMEa"
+#~ msgid "You may only import to local folders"
+#~ msgstr "Uvažate lahko le v krajevne mape"
 
-#: wombat/wombat.c:225
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Nisem mogel pognati Evolucijinega vmesnika za pomoč pri pošti\n"
+#~ "(%s)"
+
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr "Nisem mogel pognati Evolucijinega vmesnika za pomoč pri pošti\n"
+
+#~ msgid "Folder name cannot contain slashes."
+#~ msgstr "Ime mape ne more vsebovati poševnic"
+
+#~ msgid "Bug buddy was not found in your $PATH."
+#~ msgstr "Program 'Bug buddy' ni bil najden v vaši poti ($PATH)."
+
+#~ msgid "Don't remove"
+#~ msgstr "Ne odstrani"
+
+#~ msgid "Active connections"
+#~ msgstr "Aktivne povezave"
+
+#~ msgid "Host"
+#~ msgstr "Gostitelj"
+
+#~ msgid "Cannot initialize the Bonobo component system."
+#~ msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
+
+#~ msgid "Output File"
+#~ msgstr "Izhodna datoteka"
+
+#~ msgid "Dump"
+#~ msgstr "Shrani"
+
+#~ msgid "_Contact List"
+#~ msgstr "Seznam _stikov"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Nastavi pogled koledarja"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Ustvari nov celodnevni _dogodek"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Ustvari novo _nalogo"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Ustvari _nov sestanek"
+
+#~ msgid "Create a _New Meeting"
+#~ msgstr "Ustvari _nov sestanek"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Ustvari sestanek, ki zavzame cel dan"
+
+#~ msgid "_Appointment..."
+#~ msgstr "_Sestanek..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Nastavitve pošte..."
+
+#~ msgid "_Meeting..."
+#~ msgstr "_Sestanek..."
+
+#~ msgid "_Task..."
+#~ msgstr "_Naloga..."
+
+#~ msgid "Copy selected messages"
+#~ msgstr "Kopiraj izbrana sporočila"
+
+#~ msgid "Cut selected messages"
+#~ msgstr "Izreži izbrana sporočila"
+
+#~ msgid "Create a virtual folder based on this search"
+#~ msgstr "Ustvari navidezno mapo za to iskanje"
+
+#~ msgid "Design an advanced search to run on the messages in this folder"
+#~ msgstr "Oblikuj napredno iskanje, ki naj poteče na sporočilih te mape"
+
+#~ msgid "Edit Saved Searches"
+#~ msgstr "Uredi shranjena iskanja"
+
+#~ msgid "Erase the current search"
+#~ msgstr "Zbriši trenutno iskanje"
+
+#~ msgid "Family Mail"
+#~ msgstr "Družinska pošta"
+
+#~ msgid "Save this search"
+#~ msgstr "Shrani to iskanje"
+
+#~ msgid "Search through the messages in this folder"
+#~ msgstr "Išči skozi sporočila v tej mapi"
+
+#~ msgid "Sue's Phone"
+#~ msgstr "Suein telefon"
+
+#~ msgid "_Advanced Search..."
+#~ msgstr "N_apredno iskanje..."
+
+#~ msgid "_Clear Search"
+#~ msgstr "_Počisti iskanje"
 
-#~ msgid "Connecting to LDAP server..."
-#~ msgstr "Vzpostavljam povezavo s strežnikom LDAP..."
+#~ msgid "Inline Text _File..."
+#~ msgstr "Vstavi _datoteko z besedilom..."
 
-#~ msgid "Unable to connect to LDAP server."
-#~ msgstr "Nisem se mogel povezati s strežnikom LDAP."
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Vstavi datoteko v sporočilo kot besedilo"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Vstavi datoteko z besedilom..."
+
+#~ msgid "Send _Later"
+#~ msgstr "Pošilji _kaseneje"
+
+#~ msgid "Send _later"
+#~ msgstr "Pošlji _kasneje"
+
+#~ msgid "Send the message later"
+#~ msgstr "Pošlji sporočilo kasneje"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Nastavi pogled nalog"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "Nastavitve nalog..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Spremeni nastavitve povzetka"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "Nastaviteve _povzetka..."
+
+#~ msgid "Add to Saved Searches"
+#~ msgstr "Dodaj med shranjena iskanja"
+
+#~ msgid "Edit..."
+#~ msgstr "Uredi..."
+
+#~ msgid "Show All"
+#~ msgstr "Kaži vse"
+
+#~ msgid "Sear_ch"
+#~ msgstr "_Iskanje"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Strežnik osebnega adresarja"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "Strežnik osebnega koledarja; tovarna koledarjal"
+
+#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
+#~ msgstr "setup_vfs(): nisem mogel inicializirati GNOME-VFS"
+
+#~ msgid "init_corba(): could not initialize GNOME"
+#~ msgstr "init_corba(): nisem mogel inicializirati GNOMEa"
+
+#~ msgid "init_bonobo(): could not initialize Bonobo"
+#~ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "Čakam na povezavo s strežnikom LDAP..."
@@ -26272,39 +29435,18 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Email contains"
 #~ msgstr "E-naslov vsebuje"
 
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "Podatki o zasedenosti (%s do %s)"
-
-#~ msgid "iCalendar information"
-#~ msgstr "Podatki o iKodledarju"
-
 #~ msgid "Mark as Unim_portant"
 #~ msgstr "Označi kot ne_pomembno"
 
 #~ msgid "Filter on Mailing List"
 #~ msgstr "Filter glede na dopisni seznam"
 
-#~ msgid "Could not save signature file."
-#~ msgstr "Nisem mogel shraniti datoteke s podpisom."
-
-#~ msgid ""
-#~ "This signature has been changed, but hasn't been saved.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "Podpis je bil spremenjen, a ni bil shranjen.\n"
-#~ "\n"
-#~ "Želite shraniti spremembe?"
-
 #~ msgid "HTML signature file:"
 #~ msgstr "Datoteka s podpisom HTML:"
 
 #~ msgid "Signature file:"
 #~ msgstr "Datoteka s podpisom:"
 
-#~ msgid "Evolution "
-#~ msgstr "Evolucija "
-
 #~ msgid "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
 #~ msgstr "Avtorske pravice pridržane 1999, 2000, 2001, 20002 Ximian, Inc."
 
@@ -26554,9 +29696,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "New Contact _List"
 #~ msgstr "Nov seznam _stikov"
 
-#~ msgid "New _Task"
-#~ msgstr "Nova _naloga"
-
 #~ msgid "Could not check POP server for new messages: %s"
 #~ msgstr "Nisem mogel preveriti strežnika POP za nova sporočila: %s."
 
@@ -26576,18 +29715,12 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "To se bo povezalo s strežnikom POP in uporabilo Kerbos 4 za ustrezno "
 #~ "avtentifikacijo."
 
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "Strežniku KPOP se nisem mogel avtentificirati: %s"
-
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "Nisem se mogel povezati s strežnikom: %s."
 
 #~ msgid "(Unknown)"
 #~ msgstr "(Neznana)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "Nepričakovan odgovor strežnika POP: %s"
-
 #~ msgid "RCPT TO response error: %s: mail not sent"
 #~ msgstr "Napaka v ogovoru na RCPT TO: %s: pošta ni bila poslana"
 
@@ -26622,15 +29755,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid " _Remove"
 #~ msgstr " _Odstrani"
 
-#~ msgid "Al_l stations:"
-#~ msgstr "Vse _postaje:"
-
 #~ msgid "All _folders:"
 #~ msgstr "Vse _mape:"
 
-#~ msgid "All news _feeds:"
-#~ msgstr "Vsi viri _novic:"
-
 #~ msgid "_Display folders:"
 #~ msgstr "_Kaži mape:"
 
@@ -26640,15 +29767,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_Displayed feeds:"
 #~ msgstr "_Kaži novice:"
 
-#~ msgid "New List"
-#~ msgstr "Nov seznam"
-
-#~ msgid "New Message"
-#~ msgstr "Novo sporočilo"
-
-#~ msgid "Forward As"
-#~ msgstr "Posreduj naprej kot"
-
 #~ msgid "Forward _Attached"
 #~ msgstr "Posreduj _pripeto"
 
@@ -26658,9 +29776,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Forward _Quoted"
 #~ msgstr "Posreduj kot _citirano"
 
-#~ msgid "Email Address:"
-#~ msgstr "E-poštni naslov:"
-
 #~ msgid "British Virgin Islands"
 #~ msgstr "Britanski deviški otoki"
 
@@ -26670,9 +29785,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Republika Moldavija"
 
-#~ msgid "Pierto Rico"
-#~ msgstr "Portoriko"
-
 #~ msgid "_Message Recipients:"
 #~ msgstr "Prejemniki _sporočila:"
 
@@ -26917,9 +30029,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "after start of appointment"
 #~ msgstr "po pričetku sestanka"
 
-#~ msgid "before end of appointment"
-#~ msgstr "pred koncem sestanka"
-
 #~ msgid "_12 hour (am/pm)"
 #~ msgstr "_12 urna (dop./pop.)"
 
@@ -27005,9 +30114,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%d/%m/%Y"
 
-#~ msgid "Add"
-#~ msgstr "Dodaj"
-
 #~ msgid "Edit"
 #~ msgstr "Uredi"
 
@@ -27076,9 +30182,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Prosim kliknite \"V redu\" za namestitev Evolucijinih uporabniških "
 #~ "datotek pod"
 
-#~ msgid "Delete folder '%s'"
-#~ msgstr "Zbriši mapo '%s'"
-
 #~ msgid ""
 #~ "Evolution is a suite of groupware applications\n"
 #~ "for mail, calendaring, and contact management\n"
@@ -27101,41 +30204,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Opa!  Pogled `%s' je nepričakovano umru.  :-(\n"
 #~ "To verjetno pomeni, da se je komponenta %s sesula."
 
-#~ msgid ""
-#~ "Hi.  Thanks for taking the time to download this preview release\n"
-#~ "of the Evolution groupware suite.\n"
-#~ "\n"
-#~ "Evolution is not yet complete. It's getting close, but there are\n"
-#~ "places where features are either missing or only half working. \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"
-#~ "individuals prone to violent fits of anger.\n"
-#~ "\n"
-#~ "We hope that you enjoy the results of our hard work, and we\n"
-#~ "eagerly await your contributions!\n"
-#~ msgstr ""
-#~ "Pozdrav.  Hvala, ker ste si vzeli čas za prenos te predogledne izdaje\n"
-#~ "programja za delovne skupine Evolucija.\n"
-#~ "\n"
-#~ "Evolucija še ni končana. Še vedno so kraji, kjer funkcionalnost manjka "
-#~ "ali\n"
-#~ "deluje le polovično.\n"
-#~ "\n"
-#~ "Če najdete hrošča, ga prosimo sporočite na bugzilla.ximian.com.\n"
-#~ "Ta izdelek prihaja brez kakršnihkoli zagotovil in ni primeren za\n"
-#~ "osebe, ki doživljajo nasilne napade jeze.\n"
-#~ "\n"
-#~ "Upamo, da boste uživali sadove našega trdega dela in nestrpno\n"
-#~ "pričakujemo vaše prispevke!\n"
-
-#~ msgid ""
-#~ "Thanks\n"
-#~ "The Evolution Team\n"
-#~ msgstr ""
-#~ "Hvala,\n"
-#~ "skupina Evolucije\n"
-
 #~ msgid "New contact"
 #~ msgstr "Nov stik"
 
@@ -27276,9 +30344,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Notification about your journal entry"
 #~ msgstr "Obvestilo o vašem dnevniškem vpisu"
 
-#~ msgid "Save calendar"
-#~ msgstr "Shrani koledar"
-
 #~ msgid ""
 #~ "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 #~ msgstr "Uvrstitev mora biti 'Javno', 'Zastebno', 'Zaupno' ali 'Brez'"
@@ -27286,15 +30351,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 #~ msgstr "Prosojnost mora biti 'Prozorno', 'Prosojno' ali 'Brez'."
 
-#~ msgid "Show a dialog"
-#~ msgstr "Kaži dialog"
-
 #~ msgid "Beep when alarm windows appear."
 #~ msgstr "Pozvoni, ko se pokažejo okna alarmov."
 
-#~ msgid "Calendar Preferences"
-#~ msgstr "Nastavitve koledarja"
-
 #~ msgid "Colors for Tasks"
 #~ msgstr "Barve za opravila"
 
@@ -27551,9 +30610,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Items Not Yet Due:"
 #~ msgstr "Predmeti z rokom v prihodnosti:"
 
-#~ msgid "Overdue Items:"
-#~ msgstr "Naloge s prekoračenim rokom:"
-
 #~ msgid "Time Until Due"
 #~ msgstr "Čas do preteka"
 
@@ -27635,9 +30691,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Inline attachment"
 #~ msgstr "Priloga kot del sporočila"
 
-#~ msgid "Send as:"
-#~ msgstr "Pošlji kot:"
-
 #~ msgid ""
 #~ "This version of Evolution was not built with support for S/MIME.\n"
 #~ "You may wish to instead use PGP to %s your document."
@@ -27697,15 +30750,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Reply to all recipients of this message"
 #~ msgstr "Odgovori vsem prejemnikom tega sporočila"
 
-#~ msgid "Delete this message"
-#~ msgstr "Zbriši to sporčilo"
-
 #~ msgid "Activate this shortcut"
 #~ msgstr "Aktiviraj to bližnjico"
 
-#~ msgid "Find a contact"
-#~ msgstr "Poišči stik"
-
 #~ msgid "View All"
 #~ msgstr "Glej vse"
 
@@ -27772,9 +30819,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_About..."
 #~ msgstr "_O programu..."
 
-#~ msgid "_Item (FIXME)"
-#~ msgstr "_Predmet (FIXME)"
-
 #~ msgid "_Journal Entry (FIXME)"
 #~ msgstr "_Dnevniški zapis (FIXME)"
 
@@ -27871,9 +30915,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Configure Folder..."
 #~ msgstr "Nastavi mapo..."
 
-#~ msgid "Copy message to a new folder"
-#~ msgstr "Prestavi sporočilo v novo mapo"
-
 #~ msgid "Display all of the message headers"
 #~ msgstr "Kaži vse glave sporočil"
 
@@ -27965,9 +31006,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_Compose"
 #~ msgstr "_Sestavi"
 
-#~ msgid "PLAIN"
-#~ msgstr "ČISTO"
-
 #~ msgid ""
 #~ "This option will connect to the server using a the PLAIN SASL mechanism "
 #~ "if the server supports it."
@@ -28016,18 +31054,12 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Unspecified"
 #~ msgstr "Ni naveden"
 
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Nastavitev Evolucijine pošte"
-
 #~ msgid "Include this account when receiving mail"
 #~ msgstr "Vključi ta račun ob sprejemanju pošte"
 
 #~ msgid "Keep mail on server"
 #~ msgstr "Ohrani pošto na strežniku"
 
-#~ msgid "Mail Account"
-#~ msgstr "Poštni račun"
-
 #~ msgid "Plain Text"
 #~ msgstr "Nešifrirano"
 
@@ -28084,9 +31116,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 #~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
-#~ msgid "Evolution Addressbook Conduit"
-#~ msgstr "Evolucijin adresarjev veznik"
-
 #~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
 #~ msgstr "(C) 1998-2000 Fundacija za prosto programje in Helix Code"
 
@@ -28125,27 +31154,18 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "label26"
 #~ msgstr "označba26"
 
-#~ msgid "Evolution Calendar Conduit"
-#~ msgstr "Evolucijin veznik koledarja"
-
 #~ msgid "Configuration utility for the evolution calendar conduit.\n"
 #~ msgstr "Nastavitveno orodje za Evolucijin veznik koledarja.\n"
 
 #~ msgid "Configure the GnomeCal conduit"
 #~ msgstr "Nastavi veznik GnomeCal"
 
-#~ msgid "Evolution Calendar conduit"
-#~ msgstr "Evolucijin veznik Koledarja"
-
 #~ msgid "Configure the todo conduit"
 #~ msgstr "Nastavi veznik opravil"
 
 #~ msgid "Evolution ToDo conduit "
 #~ msgstr "Evolucijin veznik opravil"
 
-#~ msgid "Evolution ToDo Conduit"
-#~ msgstr "Evolucijin veznik opravil"
-
 #~ msgid "Configuration utility for the evolution todo conduit.\n"
 #~ msgstr "Nastavitveno orodje za Evolucijin veznik opravil.\n"
 
@@ -28172,9 +31192,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "matches regex"
 #~ msgstr "ustreza regularnemu izrazu"
 
-#~ msgid "Add VFolder Rule"
-#~ msgstr "Dodaj pravilo vMape"
-
 #~ msgid "Edit VFolder Rule"
 #~ msgstr "Uredi pravilo vMape"
 
@@ -28190,9 +31207,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_Message Hiding"
 #~ msgstr "_Skrivanje sporočila"
 
-#~ msgid "The time is invalid"
-#~ msgstr "Čas ni veljaven"
-
 #~ msgid "The priority must be between 1 and 9, inclusive"
 #~ msgstr "Prioriteta mora biti med vključno 1 in 9"
 
@@ -28205,9 +31219,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Enter the subject of the mail"
 #~ msgstr "Vnesite zadevo spročila"
 
-#~ msgid "Account Properties"
-#~ msgstr "Lastnosti računa"
-
 #~ msgid "Include in \"Get Mail\" operations."
 #~ msgstr "Vključuj v operacije \"Dobi pošto\"."
 
@@ -28250,9 +31261,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_Open in New Window"
 #~ msgstr "_Odpri v novem oknu"
 
-#~ msgid "_Print Message"
-#~ msgstr "Na_tisni sporočilo"
-
 #~ msgid "_VFolder on Subject"
 #~ msgstr "vMapa glede na _Zadevo"
 
@@ -28298,26 +31306,12 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Load %s Folder for %s"
 #~ msgstr "Naloži mapo %s za %s"
 
-#~ msgid ""
-#~ "Error while `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Napaka ob '%s':\n"
-#~ "%s"
-
 #~ msgid "Error reading commands from dispatching thread."
 #~ msgstr "Napaka ob branju ukazov iz razpošiljalne niti."
 
 #~ msgid "Corrupted message from dispatching thread?"
 #~ msgstr "Prispelo pokvarjeno sporočilo iz razpošiljalne niti?"
 
-#~ msgid ""
-#~ "Cannot open location `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nisem mogel odpreti URIja `%s':\n"
-#~ "%s"
-
 #~ msgid "Get store for \"%s\""
 #~ msgstr "Dobi shrambo za \"%s\""
 
@@ -28375,9 +31369,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Congratulations, your mail configuration is complete.\n"
 #~ msgstr "Čestitamo, vaša nastavitev pošte je opravljena.\n"
 
-#~ msgid "\n"
-#~ msgstr "\n"
-
 #~ msgid "You are now ready to send and receive email \n"
 #~ msgstr "Sedaj ste pripravljeni za sprejemanje e-pošte \n"
 
@@ -28592,9 +31583,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "External Directories"
 #~ msgstr "Zunanji imeniki"
 
-#~ msgid "Port Number:"
-#~ msgstr "Številka vrat:"
-
 #~ msgid "Headings:"
 #~ msgstr "Zaglavja:"
 
@@ -28659,15 +31647,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "today"
 #~ msgstr "danes"
 
-#~ msgid "this"
-#~ msgstr "ta"
-
 #~ msgid "next"
 #~ msgstr "naslednji"
 
-#~ msgid "first"
-#~ msgstr "prvi"
-
 #~ msgid "fifth"
 #~ msgstr "peti"
 
@@ -28723,9 +31705,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "bodo prikazane v dnevnem in tedenskem pogledu.\n"
 #~ "Časi izven tega razpona ne bodo samodejno prikazani"
 
-#~ msgid "Day end:"
-#~ msgstr "Konec dneva:"
-
 #~ msgid "Show on TODO List:"
 #~ msgstr "Pokaži v seznamu opravil:"
 
@@ -28741,15 +31720,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "To Do List Properties"
 #~ msgstr "Lastnosti seznama opravil"
 
-#~ msgid "To Do List"
-#~ msgstr "Seznam opravil"
-
-#~ msgid "Preferences"
-#~ msgstr "Nastavitve"
-
-#~ msgid "Beep on display alarms"
-#~ msgstr "Piskaj ob zaslonskih alarmih"
-
 #~ msgid "Audio alarms timeout after"
 #~ msgstr "Zvočni alarmi pretečejo po"
 
@@ -28867,12 +31837,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "News Sources"
 #~ msgstr "Viri novic"
 
-#~ msgid "Couldn't create pipe to %s: %s"
-#~ msgstr "Nisem mogel ustvariti cevi do %s: %s"
-
-#~ msgid "Could not execute %s: %s\n"
-#~ msgstr "Nisem mogel izvršiti %s: %s\n"
-
 #~ msgid "No GPG/PGP support available in this copy of Evolution."
 #~ msgstr "V tej različici Evolucije GPG/PGP podpora ni prisotna."
 
@@ -28925,9 +31889,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Exception while reporting result to shell component listener."
 #~ msgstr "Izjema med sporočanjem rezultatov lupini"
 
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "Uskladi \"%s\""
-
 #~ msgid "Displaying message UID \"%s\""
 #~ msgstr "Prikazujem sporočilo z UID \"%s\""
 
@@ -28955,9 +31916,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Rebuilding message view"
 #~ msgstr "Obnavljam pogled sporočil"
 
-#~ msgid "N_ew Directory Server"
-#~ msgstr "N_ov strežnik imenikov"
-
 #~ msgid "_New appointment..."
 #~ msgstr "_Nov sestanek..."
 
@@ -28991,9 +31949,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "FIXME: New _Journal Entry for Contact"
 #~ msgstr "FIXME: Nov vpis v _dnevnik za stik"
 
-#~ msgid "FIXME: _Flag for Follow Up..."
-#~ msgstr "FIXME: _Zastavica za nadaljevanje..."
-
 #~ msgid "FIXME: _Display Map of Address"
 #~ msgstr "FIXME: _Pokaži zemljevid naslova"
 
@@ -29012,9 +31967,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "FIXME: Next"
 #~ msgstr "FIXME: Naslednji"
 
-#~ msgid "Gnome Calendar"
-#~ msgstr "Gnome Koledar"
-
 #~ msgid "The GNOME personal calendar and schedule manager."
 #~ msgstr "Gnome osebni koledar in urnik."
 
@@ -29113,9 +32065,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "label23"
 #~ msgstr "label23"
 
-#~ msgid "Every "
-#~ msgstr "Vsak "
-
 #~ msgid "label24"
 #~ msgstr "label24"
 
@@ -29182,9 +32131,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Current week (%s %s %d %d - %s %s %d %d)"
 #~ msgstr "Trenutni teden (%s %s %d %d - %s %s %d %d)"
 
-#~ msgid "Cut selected item into clipboard"
-#~ msgstr "Izreži izbran predmet na odložišče"
-
 #~ msgid "Copy selected item into clipboard"
 #~ msgstr "Kopiraj izbran predmet na odložišče"
 
@@ -29200,9 +32146,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Bcc: >>"
 #~ msgstr "Bcc: >>"
 
-#~ msgid "label9"
-#~ msgstr "oznaka9"
-
 #~ msgid "label7"
 #~ msgstr "oznaka7"
 
@@ -29249,9 +32192,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "<< Remove"
 #~ msgstr "<< odstrani"
 
-#~ msgid "Discard this message?"
-#~ msgstr "Zavrzi to sporočilo"
-
 #~ msgid ""
 #~ "<h2>Create Filtering Rule</h2><p>Select one of the base rules above, then "
 #~ "continue forwards to customise it.</p>"
diff --git a/po/sv.po b/po/sv.po
index db377c521c..209d951038 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,12 +6,12 @@
 # Martin Norbäck <d95mback@dtek.chalmers.se>, 2001.
 # Johan Dahlin <zilch.am@home.se>, 2001.
 #
-# $Id: sv.po,v 1.166 2003/03/29 13:39:17 menthos Exp $
+# $Id: sv.po,v 1.167 2003/04/09 20:36:11 ettore Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2003-03-29 14:36+0100\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-03-29 14:38+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -20,20 +20,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 "Fabrik för import av LDIF-filer till Evolution."
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolutions importörsassistent"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "Importerar LDIF-filer till 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 för import av VCard-filer till Evolution."
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolutions e-postredigerare."
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importerar VCard-filer till Evolution."
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolutions e-postredigerare."
+
+#: 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
@@ -203,14 +210,14 @@ msgid "TTY"
 msgstr "TTY"
 
 #: 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 "E-post 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"
@@ -496,74 +503,77 @@ msgstr "Mottar LDAP-sökresultat..."
 msgid "Error performing search"
 msgstr "Fel vid sökning"
 
-#: addressbook/conduit/address-conduit.c:296
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Sstandardsynkroniseringsadress:"
 
-#: addressbook/conduit/address-conduit.c:539
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Markören kunde inte läsas in\n"
 
-#: addressbook/conduit/address-conduit.c:552
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EBook inte inläst\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 "Kunde inte starta wombat-server"
 
-#: 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 "Kunde inte starta wombat"
 
-#: 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 "Kunde inte läsa pilotens adressprogramblock"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "En Bonobo-kontroll för en adress-popup."
+msgid "Configure access to LDAP directory servers here"
+msgstr "Konfigurera åtkomst till LDAP-katalogservrar här"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "En Bonobo-kontroll för att visa en adress."
+msgid "Directory Servers"
+msgstr "Katalogservrar"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "En Bonobo-testkontroll som visar en adressbok."
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Adresser"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr "Konfigurationsstyrning för Evolution-adressbokslagren."
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "_Adressbokskonfiguration..."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure access to LDAP directory servers here"
-msgstr "Konfigurera åtkomst till LDAP-katalogservrar här"
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Fabrik för adressbokens adress-popup"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Kontroll som visar ett Evolution-adressboksvisitkort."
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Visare för Evolution-adressboksvisitkort"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Directory Servers"
-msgstr "Katalogservrar"
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Visare för Evolution-adressboksvisitkort"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Visare för Evolution-adressboksvisitkort"
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Adresser"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Evolutionkomponent för att hantera kontakter."
-
-#: 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 kontrollerna som exporteras av Evolution-adressboken"
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Visare för Evolution-adressboksvisitkort"
 
 #: addressbook/gui/component/addressbook-component.c:76
 #: addressbook/gui/component/addressbook-component.c:605
@@ -781,7 +791,7 @@ msgstr "Denna fråga returnerade inte utan problem."
 
 #. 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 "Alla kategorier"
 
@@ -794,46 +804,46 @@ msgstr "URI:n som mappbläddraren kommer att visa"
 #. * 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: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 "Primär e-post"
 
-#: addressbook/gui/component/e-address-popup.c:608
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Välj en åtgärd"
 
-#: 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 "Skapa en ny kontakt \"%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 "Lägg till adress till befintliga kontakten \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:913
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Undersöker adressboken..."
 
-#: 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 "Redigera kontaktinformation"
 
-#: 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 "Lägg till i kontakter"
 
-#: addressbook/gui/component/e-address-popup.c:1051
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Slå samman e-postadress"
 
@@ -968,7 +978,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 "Aldrig"
 
@@ -996,8 +1006,8 @@ msgstr "S_ökomfattning: "
 
 #. 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 "Söker"
 
@@ -1292,47 +1302,36 @@ msgid "searching-tab"
 msgstr "sökflik"
 
 #: 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 "Evolutions adressboks namnvalsgränssnitt."
 
-#: 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 adressbokens namnvalsgränssnitt"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Ta bort alla"
 
 #. 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 "Ta bort"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:177
-msgid "Remove All"
-msgstr "Ta bort alla"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:201
-msgid "Send HTML Mail?"
-msgstr "Skicka HTML-post?"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:300
-msgid "View Contact Info"
-msgstr "Visa kontaktinformation"
-
-#: 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 "Visa kontaktlista"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:417
-msgid "Unnamed Contact List"
-msgstr "Namnlös kontaktlista"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+msgid "View Contact Info"
+msgstr "Visa kontaktinformation"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:434
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d visas inte)"
+#: 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 "Skicka HTML-post?"
 
-#: 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 "Namnlös kontakt:"
 
@@ -1341,11 +1340,11 @@ msgstr "Namnlös kontakt:"
 msgid "Source"
 msgstr "Källkod"
 
-#: 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 "Välj kontakter från adressboken"
 
-#: 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 "Sök kontakt i"
 
@@ -1475,7 +1474,7 @@ msgstr "Vill ha _HTML-post"
 #: 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:3710 calendar/gui/e-week-view.c:3557
+#: 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
@@ -1514,10 +1513,10 @@ msgstr "_Webbsideadress:"
 #: 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 "Redigerbar"
 
@@ -2547,7 +2546,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 "Bok"
@@ -2555,7 +2554,7 @@ msgstr "Bok"
 #: 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 "Kort"
 
@@ -2856,7 +2855,7 @@ msgstr "%d kort"
 #: 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 "Fråga"
@@ -2871,20 +2870,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 "Fel vid ändring av kort"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr "Lyckades"
 
 #: 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 "Okänt fel"
 
@@ -2893,7 +2893,7 @@ msgid "Repository offline"
 msgstr "Lagret frånkopplat"
 
 #: 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 "Åtkomst nekas"
 
@@ -2910,7 +2910,7 @@ msgid "Protocol not supported"
 msgstr "Protokollet stöds inte"
 
 #: 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
@@ -3105,7 +3105,7 @@ msgid "Delete"
 msgstr "Ta bort"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:904
-#: calendar/gui/e-day-view.c:3670 calendar/gui/e-week-view.c:3522
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 msgid "Current View"
 msgstr "Aktuell vy"
 
@@ -3210,38 +3210,38 @@ msgstr "och ett annat kort."
 msgid "Save in addressbook"
 msgstr "Spara i adressboken"
 
-#: 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 "Bredd"
 
-#: 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öjd"
 
-#: 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 "Har fokus"
 
-#: addressbook/gui/widgets/e-minicard-label.c:123
+#: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Fält"
 
-#: addressbook/gui/widgets/e-minicard-label.c:130
+#: addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Fältnamn"
 
-#: 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 "Maximal fältnamnslängd"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:125
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
 msgstr "Kolumnbredd"
 
@@ -3273,11 +3273,11 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:165
+#: addressbook/gui/widgets/e-minicard.c:169
 msgid "Selected"
 msgstr "Markerad"
 
-#: addressbook/gui/widgets/e-minicard.c:172
+#: addressbook/gui/widgets/e-minicard.c:176
 msgid "Has Cursor"
 msgstr "Har markör"
 
@@ -3607,7 +3607,7 @@ msgid "High"
 msgstr "Hög"
 
 #: 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"
@@ -3626,71 +3626,75 @@ msgstr "Låg"
 msgid "Undefined"
 msgstr "Odefinierad"
 
-#: calendar/conduits/calendar/calendar-conduit.c:208
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr "Delade flerdagshändelser:"
 
-#: 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 "Fel vid kommunikation med kalenderserver"
 
-#: 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 "Kunde inte läsa pilotens kalenderprogramblock"
 
-#: calendar/conduits/todo/todo-conduit.c:208
+#: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
 msgstr "Standardprioritet:"
 
-#: 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 "Kunde inte läsa pilotens att-göra-programblock"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "En Bonobo-kontroll som visar en uppgiftslista."
+msgid "Calendar and Tasks"
+msgstr "Kalender och uppgifter"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "En Bonobo-testkontroll som visar en kalender."
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfigurera din tidszon, kalender och uppgiftslista här "
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
 msgstr "Kalender och uppgifter"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Konfigurationsverktyg för Evolution-kalendern."
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolutions kalendersammanfattningskomponent."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Konfigurera din tidszon, kalender och uppgiftslista här "
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolutions e-postkonfiguration"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
 msgstr "Evolutionkalenderns visare för iTip/iMip"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Evolutionkomponent för hantering av kalendern."
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolutionkalenderns visare för iTip/iMip"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Factory for the Evolution Calendar objects"
-msgstr "Fabrik för Evolution-kalenderobjekt"
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolutions diskussionsgruppsredigerare"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Fabrik för att centralisera kalenderkomponentens redigerardialoger"
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolutions diskussionsgruppsredigerare"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Alarm notification service"
-msgstr "Alarmaviseringstjänst"
-
-#: 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 alarmavsieringstjänsten"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
@@ -3794,7 +3798,7 @@ msgstr "Beskrivningen innehåller"
 msgid "Comment contains"
 msgstr "Kommentaren innehåller"
 
-#: 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 "Omatchade"
 
@@ -3804,8 +3808,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"
 
@@ -3823,7 +3827,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"
 
@@ -3854,7 +3858,7 @@ msgstr "Publik mapp som innehåller möten och evenemang"
 
 #: 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
@@ -3921,12 +3925,12 @@ msgstr "Hel_dagsmöte"
 msgid "Create a new all-day appointment"
 msgstr "Skapa ett nytt heldagsmöte"
 
-#: 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 "Konfidentiellt"
@@ -3951,37 +3955,37 @@ msgstr "Ö"
 msgid "W"
 msgstr "V"
 
-#: 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 "Ledig"
 
 #: 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 "Upptagen"
 
-#: 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 "Inte startad"
 
-#: 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 "Pågår"
 
-#: 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 "Färdigt"
 
-#: calendar/gui/calendar-model.c:1028
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3992,32 +3996,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 "Ingen"
 
-#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Återkommande"
 
-#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Tilldelad"
 
-#: 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 "Nej"
@@ -4055,31 +4059,31 @@ msgstr "Åtkomst nekas för öppnande av kalendern"
 msgid "Could not open the folder in '%s'"
 msgstr "Kunde inte öppna mappen i \"%s\""
 
-#: calendar/gui/control-factory.c:163
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "URI:n som kalendern kommer att visa"
 
-#: calendar/gui/control-factory.c:170
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr "Typen av vy att visa"
 
-#: calendar/gui/dialogs/alarm-options.c:473
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Alternativ för ljudalarm"
 
-#: calendar/gui/dialogs/alarm-options.c:482
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Alternativ för meddelandealarm"
 
-#: calendar/gui/dialogs/alarm-options.c:491
+#: calendar/gui/dialogs/alarm-options.c:438
 msgid "Email Alarm Options"
 msgstr "Alternativ för e-postalarm"
 
-#: calendar/gui/dialogs/alarm-options.c:500
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Alternativ för programalarm"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Alternativ för okända alarm"
 
@@ -4120,14 +4124,19 @@ msgid "days"
 msgstr "dag"
 
 #: 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 "extra gånger var"
 
-#: 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 "timme"
 
-#: 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 "minut"
 
@@ -4192,7 +4201,7 @@ msgstr "slut på möte"
 msgid "hour(s)"
 msgstr "timme/timmar"
 
-#: 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(er)"
 
@@ -4372,7 +4381,7 @@ msgid "_Fri"
 msgstr "_fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "Allm_änt"
 
@@ -4559,8 +4568,8 @@ msgid "No summary"
 msgstr "Ingen sammanfattning"
 
 #: calendar/gui/dialogs/comp-editor.c:1230
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3928
-#: calendar/gui/e-week-view.c:3758 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 "Spara som..."
 
@@ -4654,19 +4663,19 @@ msgstr "Schemaläggning"
 msgid "Meeting"
 msgstr "Möte"
 
-#: 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 "Startdatumet är fel"
 
-#: calendar/gui/dialogs/event-page.c:664
+#: calendar/gui/dialogs/event-page.c:610
 msgid "End date is wrong"
 msgstr "Slutdatumet är fel"
 
-#: calendar/gui/dialogs/event-page.c:687
+#: calendar/gui/dialogs/event-page.c:633
 msgid "Start time is wrong"
 msgstr "Starttiden är fel"
 
-#: calendar/gui/dialogs/event-page.c:694
+#: calendar/gui/dialogs/event-page.c:640
 msgid "End time is wrong"
 msgstr "Sluttiden är fel"
 
@@ -4723,15 +4732,10 @@ msgid "Su_mmary:"
 msgstr "Sa_mmanfattning:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Kontakter..."
-
-#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_End time:"
 msgstr "Slutti_d:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "_Starttid:"
 
@@ -4791,7 +4795,7 @@ msgid "Member"
 msgstr "Medlem"
 
 #: 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 "OSA"
@@ -4813,7 +4817,7 @@ msgid "_Change Organizer"
 msgstr "_Ändra organisatör"
 
 #: 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 "Bjud _in andra..."
 
@@ -5012,7 +5016,7 @@ msgstr "Tilldelning"
 msgid "Due date is wrong"
 msgstr "Förfallodatumet är fel"
 
-#: 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:"
@@ -5022,6 +5026,10 @@ msgstr "Beskrivning:"
 msgid "Sta_rt Date:"
 msgstr "Sta_rtdatum:"
 
+#: 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örfallo_datum:"
@@ -5120,56 +5128,67 @@ msgid "%s for an unknown trigger type"
 msgstr "%s för en okänd triggertyp"
 
 #: 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 "Tar bort markerade objekt"
 
-#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3692
-#: calendar/gui/e-week-view.c:3539 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 "_Öppna"
@@ -5178,30 +5197,30 @@ msgstr "_Öppna"
 msgid "_Save as..."
 msgstr "_Spara som..."
 
-#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3694
-#: calendar/gui/e-week-view.c:3514 calendar/gui/e-week-view.c:3541
+#: 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 "Skriv _ut..."
 
-#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3699
-#: calendar/gui/e-week-view.c:3546 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 "Klipp _ut"
 
-#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3700
-#: calendar/gui/e-week-view.c:3547 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 "_Kopiera"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3665
-#: calendar/gui/e-day-view.c:3701 calendar/gui/e-week-view.c:3518
-#: calendar/gui/e-week-view.c:3548 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"
@@ -5227,8 +5246,8 @@ msgstr "_Markera markerade uppgifter som färdiga"
 msgid "_Delete Selected Tasks"
 msgstr "_Ta bort markerade uppgifter"
 
-#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7630
-#: calendar/gui/e-week-view.c:4247
+#: 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 "Uppdaterar objekt"
 
@@ -5271,7 +5290,7 @@ msgid "Start Date"
 msgstr "Startdatum"
 
 #: 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 "Sammanfattning"
@@ -5303,22 +5322,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 minutdivisioner"
 
 #. 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"
 
@@ -5334,67 +5353,67 @@ msgstr "fm"
 msgid "pm"
 msgstr "em"
 
-#: calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "Nytt m_öte"
 
-#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3508
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
 msgid "New All Day _Event"
 msgstr "Nytt _heldagsarrangemang"
 
-#: calendar/gui/e-day-view.c:3653 calendar/gui/e-week-view.c:3509
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
 msgid "New Meeting"
 msgstr "Nytt möte"
 
-#: calendar/gui/e-day-view.c:3655 calendar/gui/e-week-view.c:3510
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
 msgid "New Task"
 msgstr "Ny uppgift"
 
-#: calendar/gui/e-day-view.c:3660 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3673 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: calendar/gui/e-day-view.c:3672 calendar/gui/e-week-view.c:3524
+#: 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å till _idag"
 
-#: calendar/gui/e-day-view.c:3674 calendar/gui/e-week-view.c:3525
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
 msgid "_Go to Date..."
 msgstr "_Gå till datum..."
 
-#: calendar/gui/e-day-view.c:3679 calendar/gui/e-week-view.c:3529
+#: 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 "_Publicera ledig-/upptageninformation"
 
-#: calendar/gui/e-day-view.c:3684 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
 #: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "_Inställningar..."
 
-#: calendar/gui/e-day-view.c:3693 calendar/gui/e-week-view.c:3540
+#: 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 "_Spara som..."
 
-#: calendar/gui/e-day-view.c:3705 calendar/gui/e-week-view.c:3552
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
 msgid "_Schedule Meeting..."
 msgstr "_Boka möte..."
 
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3553
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
 msgid "_Forward as iCalendar..."
 msgstr "_Vidarebefordra som iCalendar..."
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3558
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
 msgid "Make this Occurrence _Movable"
 msgstr "Gör denna förekomst _flyttbar"
 
-#: calendar/gui/e-day-view.c:3712 calendar/gui/e-week-view.c:3559
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
 msgid "Delete this _Occurrence"
 msgstr "Ta bort denna f_örekomst"
 
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3560
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
 msgid "Delete _All Occurrences"
 msgstr "Ta bort _alla förekomster"
 
@@ -5512,31 +5531,31 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:1058
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "Plats:"
 
-#: 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 "Godtaget"
 
-#: 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 "Preliminärt godtaget"
 
-#: 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 "Avböjt"
 
-#: 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
@@ -5548,300 +5567,300 @@ msgstr "Avböjt"
 msgid "Unknown"
 msgstr "Okänd"
 
-#: 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 "Välj en åtgärd:"
 
-#: calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Uppdatera"
 
-#: 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 "Acceptera"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Acceptera preliminärt"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Neka"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Skicka ledig-/upptageninformation"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Uppdatera svarandestatus"
 
-#: calendar/gui/e-itip-control.c:1225
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Skicka senaste information"
 
-#: 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 "Avbryt"
 
-#: 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> har publicerat mötesinformation."
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Mötesinformation"
 
-#: 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> begär att %s närvarar vid ett möte."
 
-#: 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> begär din närvaro vid ett möte."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Mötesförslag"
 
-#: 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> vill lägga till i ett befintligt möte."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Mötesuppdatering"
 
-#: 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> vill få den senaste mötesinformationen."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "Begäran av mötesuppdatering"
 
-#: 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> har svarat på en mötesbegäran."
 
-#: calendar/gui/e-itip-control.c:1346
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Mötessvar"
 
-#: 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> har avbokat ett möte."
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Mötesavbokning"
 
-#: 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> har skickat ett obegripligt meddelande."
 
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Felaktigt mötesmeddelande"
 
-#: 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> har publicerat mötesinformation."
 
-#: calendar/gui/e-itip-control.c:1387
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Uppgiftsinformation"
 
-#: 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> begär att %s utför en uppgift."
 
-#: 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> begär att du utför en uppgift."
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Uppgiftsförslag"
 
-#: 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> vill lägga till i en befintlig uppgift."
 
-#: calendar/gui/e-itip-control.c:1400
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Uppgiftsuppdatering"
 
-#: 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> vill få den senaste uppgiftsinformationen."
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Begäran om uppgiftsuppdatering"
 
-#: 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> har svarat på en uppgiftstilldelning."
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Uppgiftssvar"
 
-#: 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> har avbokat en uppgift."
 
-#: calendar/gui/e-itip-control.c:1421
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Uppgiftsavbokning"
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Felaktigt uppgiftsmeddelande"
 
-#: 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> har publicerat ledig-/upptageninformation."
 
-#: calendar/gui/e-itip-control.c:1449
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Ledig-/upptageninformation"
 
-#: 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> begär din ledig-/upptageninformation."
 
-#: calendar/gui/e-itip-control.c:1454
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Ledig-/Upptagenbegäran"
 
-#: 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> har svarat på en ledig-/upptagenbegäran."
 
-#: calendar/gui/e-itip-control.c:1459
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Ledig-/Upptagensvar"
 
-#: calendar/gui/e-itip-control.c:1464
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Felaktigt ledig-/upptagenmeddelande"
 
-#: 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 "Meddelandet verkar inte vara korrekt utformat"
 
-#: calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "Meddelandet innehåller typer av begäran som inte stöds."
 
-#: 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 "Bilagan innehåller inte ett giltigt kalendermeddelande"
 
-#: calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilagan har inga visningsbara kalenderobjekt"
 
-#: 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 "Objektet är ogiltigt och kan inte uppdateras\n"
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: 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 "Ett fel uppstod i CORBA-systemet\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 "Objektet kunde inte hittas\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 "Du har inte rätt rättigheter för att uppdatera kalendern\n"
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Uppdateringen färdig\n"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunde inte uppdateras!\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 ""
 "Närvarandestatusen kan inte uppdateras eftersom objektet inte längre finns"
 
-#: 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 ""
 "Detta svar är inte från en nuvarande mötesdeltagare. Lägg till som "
 "mötesdeltagare?"
 
-#: 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 "Närvarandestatus kunde inte uppdateras på grund av ogiltig status!\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 "Du har inte rätt rättigheter för att uppdatera kalendern\n"
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Närvarandestatus är uppdaterad\n"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "Närvarandestatus kunde inte uppdateras!\n"
 
-#: calendar/gui/e-itip-control.c:2048
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Borttagning färdig"
 
-#: 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 "Objektet skickat!\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 "Objektet kunde inte skickas!\n"
 
-#: calendar/gui/e-itip-control.c:2205
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr "Välj kalendermapp"
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr "Välj uppgiftsmapp"
 
@@ -5944,7 +5963,7 @@ msgid "Needs Action"
 msgstr "Behöver åtgärd"
 
 #: 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 "Preliminärt"
 
@@ -5960,14 +5979,14 @@ msgstr "Pågår"
 #. 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 %Y-%m-%d"
@@ -5979,63 +5998,63 @@ msgstr "%a %Y-%m-%d"
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: 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 "Inte inne"
 
-#: calendar/gui/e-meeting-time-sel.c:410
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Ingen information"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Alternativ"
 
-#: calendar/gui/e-meeting-time-sel.c:468
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Visa _endast arbetstimmar"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Visa ut_zoomade"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "_Uppdatera ledig/upptagen"
 
-#: 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 "_Autovälj"
 
-#: 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 "_Alla människor och resurser"
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Alla _människor och en resurs"
 
-#: calendar/gui/e-meeting-time-sel.c:594
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "Folk som k_rävs"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Folk som krävs _och en resurs"
 
-#: calendar/gui/e-meeting-time-sel.c:630
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Mötets _starttid:"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Mötets slu_ttid:"
 
@@ -6081,7 +6100,7 @@ msgstr "Tar bort markerade objekt..."
 msgid "Expunging"
 msgstr "Utplånar"
 
-#: calendar/gui/e-week-view.c:3507
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Nytt _möte..."
 
@@ -6189,57 +6208,57 @@ 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 "En organisatör måste vara angiven."
 
-#: calendar/gui/itip-utils.c:297
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "Åtminstone en närvarande person krävs"
 
-#: 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 "Evenemangsinformation"
 
-#: 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 "Uppgiftsinformation"
 
-#: 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 "Dagboksinformation"
 
-#: 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 "Ledig-/upptageninformation"
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Kalenderinformation"
 
-#: calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr "Uppdaterat"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr "Motförslag"
 
-#: calendar/gui/itip-utils.c:512
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig-/upptageninformation (%s till %s)"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "iCalendar-information"
 
-#: calendar/gui/itip-utils.c:672
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Du måste vara närvarande på detta evenemang."
 
@@ -6339,7 +6358,7 @@ msgstr "Kontakter: "
 
 #: 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 "Förhandsgranska"
 
@@ -6376,31 +6395,43 @@ msgstr "Fråga mig inte igen."
 msgid "Print Tasks"
 msgstr "Skriv ut uppgifter"
 
-#: 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.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "Fabrik för import av iCalendar-filer till Evolution"
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Evolutionkalenderns visare för iTip/iMip"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "Importerar iCalendar-filer till Evolution"
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Evolutionkalenderns visare för iTip/iMip"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "Importerar vCalendar-filer till Evolution"
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Evolutionkalenderns visare för iTip/iMip"
 
-#: calendar/importers/icalendar-importer.c:380
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Kalendermeddelande"
+
+#: 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 "Påminnelse!!"
 
-#: calendar/importers/icalendar-importer.c:588
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "Kalenderhändelser"
 
-#: 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?"
@@ -6408,7 +6439,7 @@ msgstr ""
 "Evolution har hittat Gnome-kalenderfiler.\n"
 "Vill du importera dem till Evolution?"
 
-#: calendar/importers/icalendar-importer.c:620
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr "Gnome-kalendern"
 
@@ -8635,7 +8666,7 @@ msgid "The referenced credentials have expired."
 msgstr "De refererade kreditiven har gått ut."
 
 #: 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."
@@ -8646,7 +8677,7 @@ msgstr "Felaktigt autentiseringssvar från servern."
 msgid "Failed to resolve host `%s': %s"
 msgstr "Misslyckades med att slå upp värden \"%s\": %s"
 
-#: camel/camel-sasl-gssapi.c:295
+#: camel/camel-sasl-gssapi.c:299
 msgid "Unsupported security layer."
 msgstr "Säkerhetslagret stöds inte."
 
@@ -9223,7 +9254,7 @@ msgstr "Kontroll av ny e-post"
 msgid "Check for new messages in all folders"
 msgstr "Kontrollera nya meddelanden i alla mappar"
 
-#: 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 "Mappar"
 
@@ -10017,7 +10048,7 @@ msgstr ""
 "Kan inte ansluta till POP-servern %s.\n"
 "Fel vid skickande av lösenord: %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 "Det finns ingen mapp \"%s\"."
@@ -10436,38 +10467,38 @@ msgstr "Svara till:"
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:521
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Från:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:527
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: composer/e-msg-composer-hdrs.c:536
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Till:"
 
-#: composer/e-msg-composer-hdrs.c:537
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Ange meddelandets mottagare"
 
-#: composer/e-msg-composer-hdrs.c:540
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: 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 "Ange adresserna som ska få en kopia av meddelandet"
 
-#: composer/e-msg-composer-hdrs.c:544
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Blindkopia:"
 
-#: 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."
@@ -10478,11 +10509,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Posta till:"
 
-#: composer/e-msg-composer-hdrs.c:554
+#: composer/e-msg-composer-hdrs.c:549
 msgid "Posting destination"
 msgstr "Postdestination"
 
@@ -10491,11 +10522,11 @@ msgstr "Postdestination"
 msgid "Attach file(s)"
 msgstr "Bifoga fil(er)"
 
-#: composer/e-msg-composer.c:530
+#: composer/e-msg-composer.c:533
 msgid "Could not create a PGP signature context"
 msgstr "Kunde inte skapa ett PGP-signatursammanhang"
 
-#: composer/e-msg-composer.c:809
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10504,30 +10535,30 @@ msgstr ""
 "Fel vid läsning av filen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Filen finns, skriv över?"
 
-#: composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fel vid sparande av filen: %s"
 
-#: composer/e-msg-composer.c:1213
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fel vid inläsning av filen: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fel vid åtkomst av filen: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Kunde inte hämta meddelande från redigeraren"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10536,7 +10567,7 @@ msgstr ""
 "Kan inte spola filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1270
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10545,7 +10576,7 @@ msgstr ""
 "Kan inte trunkera filen: %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"
@@ -10554,7 +10585,7 @@ msgstr ""
 "Kan inte kopiera filhandtag: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10563,7 +10594,7 @@ msgstr ""
 "Fel vid automatiskt sparande av meddelande: %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?"
@@ -10571,7 +10602,7 @@ msgstr ""
 "Ximian Evolution har hittat osparade filer från en tidigare session.\n"
 "Vill du försöka återställa dem?"
 
-#: composer/e-msg-composer.c:1544
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10582,32 +10613,32 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: composer/e-msg-composer.c:1549
+#: composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Förkasta ändringar"
 
-#: composer/e-msg-composer.c:1553
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Varning: Ändrat meddelande"
 
-#: composer/e-msg-composer.c:1585
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: 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 "Automatiskt genererad"
 
-#: 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 "Skriv ett meddelande"
 
-#: 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."
@@ -10615,7 +10646,7 @@ msgstr ""
 "Kan inte skapa redigerarfönstret:\n"
 "Kan inte aktivera adressväljarkontrollen."
 
-#: 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"
@@ -10627,7 +10658,7 @@ msgstr ""
 "Försäkra dig om att du har rätt versioner av\n"
 "gtkhtml och libgtkhtml installerade.\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."
@@ -10635,7 +10666,7 @@ msgstr ""
 "Kunde inte skapa redigerarfönstret:\n"
 "Kan inte aktivera HTML-redigerarkomponenten."
 
-#: 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>"
@@ -10815,11 +10846,11 @@ msgstr ""
 msgid "Overwrite file?"
 msgstr "Skriv över fil?"
 
-#: e-util/e-passwords.c:345
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Kom ihåg detta lösenord"
 
-#: e-util/e-passwords.c:347
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Kom ihåg detta lösenord för resten av denna session"
 
@@ -11042,31 +11073,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 "viktigt"
 
 #. 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 "Jobb"
 
 #. 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 "Personligt"
 
 #. 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 "Att-göra"
 
 #. 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 "Senare"
 
@@ -11171,7 +11202,7 @@ msgstr "sedan"
 msgid "months"
 msgstr "månader"
 
-#: 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 "sekunder"
 
@@ -11513,8 +11544,8 @@ msgid "Scanning %s"
 msgstr "Genomsöker %s"
 
 #: 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-post"
@@ -11657,60 +11688,69 @@ msgid "Composer Preferences"
 msgstr "Redigerarinställningar"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Konfigurationsverktyg för Evolutions visningstypsnitt."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Konfigurationsverktyg för Evolutions e-postkonton."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Konfigurationsverktyg för Evolutions e-postkomponent."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Konfigurationsverktyg för Evolutions meddelanderedigerare."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Konfigurera e-postinställningar, inklusive säkerhet och meddelandevisning, "
 "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 ""
 "Konfigurera stavningskontroll, signaturer, och meddelanderedigeraren 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 "Konfigurera de typsnitt som används Evolution här"
 
-#: 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 "Konfigurera dina e-postkonton här"
 
+#: 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 "Evolutions e-postkonfiguration"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolutions e-postredigerare."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolutions e-postredigerare."
+
 #: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Evolutionkomponenten för hantering av e-post."
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolutions e-postkonfiguration"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution mail composer."
-msgstr "Evolutions e-postredigerare."
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Gränssnitt för e-postkonfiguration"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Evolutions e-postsammanfattningskomponent."
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolutions e-postvisningskomponent."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Evolutions e-postvisningskomponent."
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Evolutions e-postkonfiguration"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "Factory for the controls exported by the Evolution Mailer"
-msgstr "Fabrik för kontrollerna som exporteras av Evolution-epostkomponenten"
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolutions e-postsammanfattningskomponent."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:15
 msgid "Font Preferences"
@@ -11724,43 +11764,39 @@ msgstr "E-postkonton"
 msgid "Mail Preferences"
 msgstr "E-postinställningar"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:18
-msgid "Mail configuration interface"
-msgstr "Gränssnitt för e-postkonfiguration"
-
-#: mail/component-factory.c:114
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Mapp som innehåller e-post"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "Publika brev"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "Publik mapp som innehåller e-post"
 
-#: mail/component-factory.c:116
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Virtuell papperskorg"
 
-#: mail/component-factory.c:116
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Virtuell papperskorgsmapp"
 
-#: mail/component-factory.c:144
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Denna mapp kan inte innehålla meddelanden."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Egenskaper..."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Ändra egenskaperna för denna mapp"
 
-#: 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."
@@ -11768,52 +11804,52 @@ msgstr ""
 "En del av dina e-postinställningar verkar felaktiga, kontrollera att allt är "
 "som det ska vara."
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "Du har inte angivit någon e-posttransportmetod"
 
-#: mail/component-factory.c:1016
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Du har oskickade meddelanden, vill du ändå avsluta?"
 
-#: mail/component-factory.c:1056
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Nytt e-postmeddelande"
 
-#: mail/component-factory.c:1056
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "_E-postmeddelande"
 
-#: mail/component-factory.c:1057
+#: mail/component-factory.c:1061
 msgid "Compose a new mail message"
 msgstr "Skriv ett nytt e-postmeddelande"
 
-#: mail/component-factory.c:1065
+#: mail/component-factory.c:1069
 msgid "New Message Post"
 msgstr "Postning av nytt meddelande"
 
-#: mail/component-factory.c:1065
+#: mail/component-factory.c:1069
 msgid "_Post Message"
 msgstr "_Posta meddelande"
 
-#: mail/component-factory.c:1066
+#: mail/component-factory.c:1070
 msgid "Post a new mail message"
 msgstr "Posta ett nytt e-postmeddelande"
 
-#: mail/component-factory.c:1349
+#: mail/component-factory.c:1353
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: mail/component-factory.c:1360
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Kan inte registrera lager hos skal"
 
-#: mail/folder-browser-ui.c:483
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper för \"%s\""
 
-#: mail/folder-browser-ui.c:485
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Egenskaper"
 
@@ -11997,21 +12033,37 @@ msgstr "Standard"
 msgid "Getting Folder Information"
 msgstr "Hämtar mappinformation"
 
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Evolutions e-postredigerare."
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "Fabrik för import av brevlåda (mbox) till Evolution"
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolutions e-postredigerare."
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Importerar brevlådefiler (mbox-filer) till 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-postredigerare."
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Fabrik för import av Outlook Express 4-post till 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 "Importerar Outlook Express 4-filer till 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-postredigerare."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -12056,7 +12108,7 @@ msgstr "Du har inte fyllt i all nödvändig information."
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontoredigerare"
 
-#: 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 "_Värd:"
 
@@ -12064,7 +12116,7 @@ msgstr "_Värd:"
 msgid "User_name:"
 msgstr "Användar_namn:"
 
-#: 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 "_Sökväg:"
 
@@ -12081,12 +12133,12 @@ msgid "Don't delete"
 msgstr "Ta inte bort"
 
 #: 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 "Inaktivera"
 
 #: 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 "Aktivera"
 
@@ -12096,7 +12148,7 @@ msgid "[Default]"
 msgstr "[Standard]"
 
 #: 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 "Aktiverad"
 
@@ -12354,34 +12406,34 @@ msgstr "Skriv ut meddelande"
 msgid "Printing of message failed"
 msgstr "Utskrift av meddelande misslyckades"
 
-#: 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 ""
 "Är du säker på att du vill öppna alla %d meddelanden i separata fönster?"
 
-#: 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 "Namnlös"
 
-#: mail/mail-composer-prefs.c:313
+#: mail/mail-composer-prefs.c:335
 msgid "You must specify a valid script name."
 msgstr "Du måste ange ett giltigt skriptnamn."
 
-#: 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 "Språk"
 
-#: mail/mail-composer-prefs.c:882
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr "Lägg till skriptsignatur"
 
-#: mail/mail-composer-prefs.c:902
+#: mail/mail-composer-prefs.c:926
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
@@ -12444,11 +12496,11 @@ msgstr ""
 "att sammanställas för att skapa ett Evolution-epostkonto. Ange ett namn för "
 "detta konto nedan. Detta namn kommer endast att användas för visning."
 
-#: mail/mail-config.c:924
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Kontrollerar tjänst"
 
-#: 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 "Ansluter till server..."
 
@@ -12692,14 +12744,19 @@ msgid "Message Display"
 msgstr "Meddelandevisning"
 
 #: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Meddelandet innehåller"
+
+#: 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 "Notifiering om ny post"
 
-#: 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"
@@ -12707,10 +12764,6 @@ msgstr ""
 "Observera: du kommer inte att efterfrågas ett lösenord innan du ansluter för "
 "första gången"
 
-#: mail/mail-config.glade.h:80
-msgid "On Screen fonts"
-msgstr "Skärmtypsnitt"
-
 #: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Valfri information"
@@ -12946,102 +12999,108 @@ msgid "_Enable"
 msgstr "_Aktivera"
 
 #: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr "_Fast breddsteg:"
-
-#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "Stil för _vidarebefordran:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "_Fullständigt namn:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr "_HTML-brev"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr "_Identitet"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "Läs _in bilder om avsändaren finns i adressboken"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "_Gör detta till mitt standardkonto"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "_Markera meddelanden som lästa efter"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "_Läs aldrig in bilder från nätet"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr "_Spela ljudfil då ny post anländer"
 
-#: 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 "_Fråga då HTML-meddelanden skickas till kontakter som inte vill ha dem"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Fråga då meddelanden skickas med en _tom ämnesrad"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr "_Mottagande av post"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "_Svarsstil:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr "_Återställ standardalternativ"
 
-#: 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 "_Skickande av post"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Visa animerade bilder"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Signaturer"
 
+#: 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 "_Använd säker anslutning (SSL):"
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "Originalkontakt:"
 
 #: mail/mail-config.glade.h:176
-msgid "_Variable-width:"
-msgstr "_Variabelt breddsteg:"
+msgid "_Use secure connection (SSL):"
+msgstr "_Använd säker 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 "_var"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr "färg"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "beskrivning"
 
@@ -13125,19 +13184,19 @@ msgstr "Skulle ha utförts:"
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "den %d %B %Y %H.%M"
 
-#: mail/mail-display.c:2234
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Öppna länk i webbläsare"
 
-#: mail/mail-display.c:2235
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Kopiera länkplats"
 
-#: mail/mail-display.c:2237
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Spara länk som (FIXME)"
 
-#: mail/mail-display.c:2239
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Spara bild som..."
 
@@ -13677,31 +13736,31 @@ msgstr "Högre"
 msgid "Highest"
 msgstr "Högsta"
 
-#: 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 "Idag %H.%M"
 
-#: mail/message-list.c:1092
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Igå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:2610
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "Genererar meddelandelista"
 
@@ -13797,40 +13856,40 @@ msgstr "_Ska utföras den:"
 msgid "_Flag:"
 msgstr "_Flagga:"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Genomsöker mappar under %s på \"%s\""
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Genomsöker mappar på rotnivå på \"%s\""
 
-#: mail/subscribe-dialog.c:331
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Prenumererar på mappen \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Säger upp prenumeration på mappen \"%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 "Mapp"
 
-#: mail/subscribe-dialog.c:1356
+#: mail/subscribe-dialog.c:1389
 msgid "Scanning folders..."
 msgstr "Genomsöker mappar..."
 
-#: mail/subscribe-dialog.c:1470
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Ingen server har valts"
 
-#: mail/subscribe-dialog.c:1545
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Välj en server."
 
@@ -13864,18 +13923,25 @@ msgid "_Unsubscribe"
 msgstr "_Säg upp prenumeration"
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
-msgid "Configuration control for the Evolution Summary."
-msgstr "Konfigurationsverktyg för Evolution-sammanfattningen."
-
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Konfigurera utseendet för Evolution-sammanfattningen här."
 
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Summary"
+msgstr "Evolutions sammanfattningskomponent."
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
-msgid "Evolution Summary component."
+#, fuzzy
+msgid "Evolution Summary component"
 msgstr "Evolutions sammanfattningskomponent."
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Fabrik för Evolutions sammanfattningskonfigurationsverktyg."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 msgid "Summary Preferences"
 msgstr "Sammanfattningsinställningar"
 
@@ -23768,15 +23834,15 @@ msgstr "ESGG:ESMS:ESSA:ESNU"
 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 "Var vänlig vänta..."
 
-#: 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 "Skriv ut sammanfattning"
 
-#: my-evolution/e-summary.c:624
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Utskrift av sammanfattning misslyckades"
 
@@ -25048,20 +25114,22 @@ msgid "_Weather"
 msgstr "_Väder"
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configuration control for Evolution folder settings."
-msgstr "Konfigurationsverktyg för Evolutions mappinställningar."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Configure special folders and offline folder behavior here"
 msgstr "Konfigurera beteende för specialmappar och frånkopplade mappar här"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolutionskalet."
+
 #: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Folder Settings"
-msgstr "Mappinställningar"
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Fabrik för Evolutions sammanfattningskonfigurationsverktyg."
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "The Evolution shell."
-msgstr "Evolutionskalet."
+msgid "Folder Settings"
+msgstr "Mappinställningar"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25093,8 +25161,8 @@ msgstr "Lägg till en mapp"
 msgid "Drafts"
 msgstr "Utkast"
 
-#: 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 "Inkorg"
 
@@ -25130,40 +25198,7 @@ msgstr ""
 "Ett fel inträffade vid kopiering av filer till\n"
 "\"%s\"."
 
-#: shell/e-setup.c:243
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Evolution kunde inte skapa katalogen\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 ""
-"Katalogen %s\n"
-"har inte rätt rättigheter. Gör den läsbar och\n"
-"körbar och starta om 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 ""
-"Filen %s\n"
-"bör tas bort för att Evolution ska kunna fungera korrekt.\n"
-"Ta bort denna fil och starta om Evolution."
-
-#: shell/e-setup.c:290
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -25174,7 +25209,7 @@ msgstr ""
 "Var vänlig och flytta den så att installationen\n"
 "av Evolutions användarfiler kan genomföras."
 
-#: shell/e-setup.c:299
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25318,7 +25353,7 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "Skapa ny mapp"
 
-#: 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 "(Namnlös)"
 
@@ -25357,17 +25392,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "Välj importör"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s finns inte"
 
-#: 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-fel"
 
-#: 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"
@@ -25376,11 +25411,11 @@ msgstr ""
 "Det finns ingen importör som kan hantera\n"
 "%s"
 
-#: shell/e-shell-importer.c:517
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "Importerar"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25389,17 +25424,17 @@ msgstr ""
 "Importerar %s.\n"
 "Startar %s"
 
-#: shell/e-shell-importer.c:536
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "Fel vid start av %s"
 
-#: shell/e-shell-importer.c:550
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Fel vid inläsning av %s"
 
-#: shell/e-shell-importer.c:567
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25408,31 +25443,31 @@ msgstr ""
 "Importerar %s\n"
 "Importerar objekt 1."
 
-#: shell/e-shell-importer.c:621
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:670
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: shell/e-shell-importer.c:675
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Välj en fil"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Filtyp:"
 
-#: shell/e-shell-importer.c:709
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "Importera data och inställningar från äldre program"
 
-#: shell/e-shell-importer.c:713
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "Importera en ensam fil"
 
-#: 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"
@@ -25440,24 +25475,24 @@ msgstr ""
 "Var god vänta...\n"
 "Letar efter befintliga konfigurationer"
 
-#: shell/e-shell-importer.c:782
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Startar intelligenta importörer"
 
-#: 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 "Från %s:"
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Välj en destinationsmapp för importen av denna data"
 
-#: 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 "Importera"
 
@@ -25597,27 +25632,27 @@ msgstr "Arbeta frånkopplad"
 msgid "(No folder displayed)"
 msgstr "(Ingen mapp visas)"
 
-#: 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 "(Ingen)"
 
-#: 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 är just nu ansluten. Klicka på denna knapp för att koppla "
 "från."
 
-#: 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 håller på att koppla från."
 
-#: 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 ""
@@ -25635,12 +25670,12 @@ msgstr ""
 "Felet från aktiveringssystemet är:\n"
 "%s"
 
-#: shell/e-shell.c:738
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan inte lägga upp lokal plats för sparande -- %s"
 
-#: shell/e-shell.c:1804
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25651,19 +25686,19 @@ msgstr ""
 "oväntat avslutats. Du måste avsluta Evolution och starta om det\n"
 "för att komma åt den datan igen."
 
-#: shell/e-shell.c:2069
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Ogiltiga argument"
 
-#: shell/e-shell.c:2071
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "Kan inte registrera på OAF"
 
-#: shell/e-shell.c:2073
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabasen hittades inte"
 
-#: shell/e-shell.c:2075 shell/e-storage.c:572
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Allmänt fel"
 
@@ -25899,63 +25934,63 @@ msgstr ""
 "Felet från aktiveringssystemet är:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "CORBA-fel"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Avbruten"
 
-#: shell/evolution-shell-component.c:1171
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Ogiltigt argument"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "Har redan en ägare"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Ingen ägare"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Hittades inte"
 
-#: shell/evolution-shell-component.c:1179
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Typen stöds inte"
 
-#: shell/evolution-shell-component.c:1181
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Schemat stöds inte"
 
-#: shell/evolution-shell-component.c:1183
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Åtgärden stöds inte"
 
-#: shell/evolution-shell-component.c:1185
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Existerar"
 
-#: shell/evolution-shell-component.c:1191
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "Ogiltig URI"
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Har undermappar"
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Inget utrymme kvar"
 
-#: shell/evolution-shell-component.c:1199
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "Gamla ägaren har dött"
 
@@ -25975,10 +26010,6 @@ msgstr "Klicka OK för att stänga dessa anslutningar och arbeta frånkopplad"
 msgid "The following connections are currently active:"
 msgstr "Följande anslutningar är aktiva för tillfället:"
 
-#: 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 "K_alender:"
@@ -26116,16 +26147,16 @@ msgstr "Fråga mig inte igen"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importera data från följande filer:"
 
-#: 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 avslutar nu..."
 
 #. 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"
@@ -26162,7 +26193,7 @@ msgstr ""
 "Vi hoppas att du gläds åt resultatet av vårt hårda arbete, och vi\n"
 "inväntar med spänning dina bidrag!\n"
 
-#: shell/main.c:288
+#: shell/main.c:290
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -26170,40 +26201,45 @@ msgstr ""
 "Tack\n"
 "Ximian Evolution-teamet\n"
 
-#: shell/main.c:296
+#: shell/main.c:298
 msgid "Don't tell me again"
 msgstr "Tala inte om för mig igen"
 
-#: shell/main.c:385
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan inte komma åt Ximian Evolution-skalet."
 
-#: shell/main.c:394
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan inte initiera Ximian Evolution-skalet: %s"
 
-#: shell/main.c:526
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Inaktivera startbild"
 
-#: shell/main.c:528
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "Starta i frånkopplat läge"
 
-#: shell/main.c:530
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "Starta i anslutet läge"
 
-#: shell/main.c:532
+#: shell/main.c:535
+#, fuzzy
+msgid "Forcibly shut down all evolution components"
+msgstr "Fabrik för Evolutions anteckningskomponent."
+
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr "Skicka felsökningsinformation från alla komponenter till en fil."
 
-#: shell/main.c:535
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr "Tvinga uppgradering av konfigurationsfiler från Evolution 1.0.x"
 
-#: shell/main.c:560
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26213,7 +26249,6 @@ msgstr ""
 "  Använd %s --help för mer information.\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 "Fel vid inläsning av standardadressboken."
@@ -26223,10 +26258,6 @@ msgstr "Fel vid inläsning av standardadressboken."
 msgid "Input File"
 msgstr "Indatafil"
 
-#: tools/evolution-addressbook-export.c:51
-msgid "Output File"
-msgstr "Utdatafil"
-
 #: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Inget filnamn är angivet."
@@ -26255,6 +26286,19 @@ msgstr "Markera bilagan så att den visas inuti som standard."
 msgid "Default subject for the message."
 msgstr "Standardämne för meddelandet."
 
+#. 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 "Kunde inte köra %s: %s\n"
+
+#: 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 "Kopiera kontakt(er) till en annan mapp..."
@@ -27745,12 +27789,12 @@ msgstr "Definiera vyer"
 
 #. 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 "MTOTFLS"
 
 #. 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"
 
@@ -27901,40 +27945,198 @@ msgstr "_Sök nu"
 msgid "_Clear"
 msgstr "_Töm"
 
-#: widgets/misc/e-search-bar.c:839
+#: widgets/misc/e-search-bar.c:833
 msgid "Item ID"
 msgstr "Objekt-ID"
 
-#: widgets/misc/e-search-bar.c:846
+#: widgets/misc/e-search-bar.c:840
 msgid "Subitem ID"
 msgstr "Underobjekt-ID"
 
-#: widgets/misc/e-search-bar.c:853
+#: widgets/misc/e-search-bar.c:847
 msgid "Text"
 msgstr "Text"
 
-#: widgets/misc/e-search-bar.c:931
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "Töm"
 
-#: widgets/misc/e-search-bar.c:933
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Sök 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 "Server för personlig adressbok"
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Visare för Evolution-adressboksvisitkort"
 
 #: 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 "Server för personlig kalender; kalenderfabrik"
+#, fuzzy
+msgid "Evolution Calendar local file backend"
+msgstr "Evolutions kalendersammanfattningskomponent."
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Visare för Evolution-adressboksvisitkort"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Fabrik för import av LDIF-filer till Evolution."
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Importerar LDIF-filer till Evolution."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Fabrik för import av VCard-filer till Evolution."
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Importerar VCard-filer till Evolution."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "En Bonobo-kontroll för en adress-popup."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "En Bonobo-kontroll för att visa en adress."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "En Bonobo-testkontroll som visar en adressbok."
+
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr "Konfigurationsstyrning för Evolution-adressbokslagren."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Kontroll som visar ett Evolution-adressboksvisitkort."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Evolutionkomponent för att hantera kontakter."
+
+#~ msgid "Factory for the controls exported by the Evolution Addressbook"
+#~ msgstr "Fabrik för kontrollerna som exporteras av Evolution-adressboken"
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr "Fabrik för adressbokens namnvalsgränssnitt"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Namnlös kontaktlista"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d visas inte)"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "En Bonobo-kontroll som visar en uppgiftslista."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "En Bonobo-testkontroll som visar en kalender."
+
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Konfigurationsverktyg för Evolution-kalendern."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Evolutionkomponent för hantering av kalendern."
+
+#~ msgid "Factory for the Evolution Calendar objects"
+#~ msgstr "Fabrik för Evolution-kalenderobjekt"
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr "Fabrik för att centralisera kalenderkomponentens redigerardialoger"
 
-#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:3
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:3
-msgid "Wombat InterfaceCheck interface"
-msgstr "Wombat-gränssnittskontrollsgränssnitt"
+#~ msgid "Alarm notification service"
+#~ msgstr "Alarmaviseringstjänst"
+
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Fabrik för import av iCalendar-filer till Evolution"
+
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Importerar iCalendar-filer till Evolution"
+
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Importerar vCalendar-filer till Evolution"
+
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Konfigurationsverktyg för Evolutions visningstypsnitt."
+
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Konfigurationsverktyg för Evolutions e-postkonton."
+
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Konfigurationsverktyg för Evolutions e-postkomponent."
+
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Konfigurationsverktyg för Evolutions meddelanderedigerare."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Evolutionkomponenten för hantering av e-post."
+
+#~ msgid "Factory for the controls exported by the Evolution Mailer"
+#~ msgstr ""
+#~ "Fabrik för kontrollerna som exporteras av Evolution-epostkomponenten"
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Fabrik för import av brevlåda (mbox) till Evolution"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Importerar brevlådefiler (mbox-filer) till Evolution"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "Fabrik för import av Outlook Express 4-post till Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Importerar Outlook Express 4-filer till Evolution"
+
+#~ msgid "On Screen fonts"
+#~ msgstr "Skärmtypsnitt"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "_Fast breddsteg:"
+
+#~ msgid "_Variable-width:"
+#~ msgstr "_Variabelt breddsteg:"
+
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Konfigurationsverktyg för Evolution-sammanfattningen."
+
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Konfigurationsverktyg för Evolutions mappinställningar."
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Evolution kunde inte skapa katalogen\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 ""
+#~ "Katalogen %s\n"
+#~ "har inte rätt rättigheter. Gör den läsbar och\n"
+#~ "körbar och starta om Evolution."
+
+#~ 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 tas bort för att Evolution ska kunna fungera korrekt.\n"
+#~ "Ta bort denna fil och starta om Evolution."
+
+#~ msgid "Output File"
+#~ msgstr "Utdatafil"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Server för personlig adressbok"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "Server för personlig kalender; kalenderfabrik"
+
+#~ msgid "Wombat InterfaceCheck interface"
+#~ msgstr "Wombat-gränssnittskontrollsgränssnitt"
 
 #~ msgid "No appointments"
 #~ msgstr "Inga möten"
@@ -28399,9 +28601,6 @@ msgstr "Wombat-gränssnittskontrollsgränssnitt"
 #~ msgid "Factory for the Addressbook's address displayer"
 #~ msgstr "Fabrik för adressbokens adressvisare"
 
-#~ msgid "Factory for the Addressbook's address popup"
-#~ msgstr "Fabrik för adressbokens adress-popup"
-
 #~ msgid "Factory for the sample Addressbook control"
 #~ msgstr "Fabrik för adressbokstestkontrollen"
 
@@ -28441,9 +28640,6 @@ msgstr "Wombat-gränssnittskontrollsgränssnitt"
 #~ msgid "Add Signature"
 #~ msgstr "Lägg till signatur"
 
-#~ msgid "Factory for Evolution Summary's configuration control."
-#~ msgstr "Fabrik för Evolutions sammanfattningskonfigurationsverktyg."
-
 #~ msgid "Marquette"
 #~ msgstr "Marquette"
 
@@ -28524,9 +28720,6 @@ msgstr "Wombat-gränssnittskontrollsgränssnitt"
 #~ "Importören är inte redo.\n"
 #~ "Väntar 5 sekunder med nytt försök."
 
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Evolutions importörsassistent"
-
 #~ msgid "_Preferences..."
 #~ msgstr "_Inställningar..."
 
@@ -28669,9 +28862,6 @@ msgstr "Wombat-gränssnittskontrollsgränssnitt"
 #~ msgid "Command"
 #~ msgstr "Kommando"
 
-#~ msgid "Evolution News Editor"
-#~ msgstr "Evolutions diskussionsgruppsredigerare"
-
 #~ msgid "Are you sure you want to delete this news account?"
 #~ msgstr "Är du säker på att du vill ta bort detta diskussionsgruppskonto?"
 
@@ -28742,9 +28932,6 @@ msgstr "Wombat-gränssnittskontrollsgränssnitt"
 #~ msgid "Configuration control for the Evolution Addressbook."
 #~ msgstr "Konfigurationsverktyg för Evolution-adressboken."
 
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr "Evolutions kalendersammanfattningskomponent."
-
 #~ msgid "Factory for the Calendar Summary component."
 #~ msgstr "Fabrik för kalendersammanfattningskomponenten."
 
@@ -29267,9 +29454,6 @@ msgstr "Wombat-gränssnittskontrollsgränssnitt"
 #~ msgid "Mail Summary"
 #~ msgstr "E-postsammanfattning"
 
-#~ msgid "Factory for the Evolution notes component."
-#~ msgstr "Fabrik för Evolutions anteckningskomponent."
-
 #~ msgid "Factory for the Notes control"
 #~ msgstr "Fabrik för anteckningskontrollen"
 
@@ -31237,9 +31421,6 @@ msgstr "Wombat-gränssnittskontrollsgränssnitt"
 #~ msgid "Unspecified"
 #~ msgstr "Odefinierad"
 
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Evolutions e-postkonfiguration"
-
 #~ msgid "Include this account when receiving mail"
 #~ msgstr "Inkludera detta konto när det kommer e-post"
 
@@ -31491,9 +31672,6 @@ msgstr "Wombat-gränssnittskontrollsgränssnitt"
 #~ msgid "Unsubscribe from folder \"%s\""
 #~ msgstr "Säg upp prenumeration på mappen \"%s\""
 
-#~ msgid "_Addressbook Configuration..."
-#~ msgstr "_Adressbokskonfiguration..."
-
 #~ msgid "_Print Contacts..."
 #~ msgstr "Skriv _ut kontakter..."
 
@@ -31914,9 +32092,6 @@ msgstr "Wombat-gränssnittskontrollsgränssnitt"
 #~ msgid "MH folders may not be nested."
 #~ msgstr "MH-mappar får inte nästlas."
 
-#~ msgid "Could not execute %s: %s\n"
-#~ msgstr "Kunde inte köra %s: %s\n"
-
 #~ msgid "Bold"
 #~ msgstr "Fet"
 
@@ -32064,9 +32239,6 @@ msgstr "Wombat-gränssnittskontrollsgränssnitt"
 #~ msgid "Could not connect to IMAP server on %s."
 #~ msgstr "Kunde inte ansluta till IMAP-servern på %s."
 
-#~ msgid "Evolution Address conduit "
-#~ msgstr "Adresser"
-
 #~ msgid "Configure the GnomeCal conduit"
 #~ msgstr "Konfigurera GnomeCal-kanalen"
 
diff --git a/po/tr.po b/po/tr.po
index f71b6dfa9f..16cbecee7b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 1.2\n"
-"POT-Creation-Date: 2003-01-23 11:39+0100\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-01-28 11:37+0000\n"
 "Last-Translator: Görkem Çetin <gorkem@kde.org>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -11,40 +11,52 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\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 dosyalarını Evolution'a aktarım mimarisi."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution Aktarma Yardımcı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 dosyalarını Evolution'a aktarır."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution e-posta programı."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "VCard dosyalarını Evolution'a aktarım mimarisi."
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution e-posta programı."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "VCard dosyalarını Evolution'a aktarır."
+#: 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 "Farklı Dosyala"
 
 #: 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:76 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 "İsim"
 
 #: 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-posta"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "İlk"
 
@@ -54,16 +66,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:1744
+#: 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 "Yardımcı"
 
 #: 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:1745
-#: addressbook/gui/contact-editor/e-contact-editor.c:1812
+#: 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 "Meslek"
 
@@ -73,12 +86,12 @@ msgid "Bus"
 msgstr "Meşg"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr "Geri Arama"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "Şirket"
 
@@ -89,12 +102,13 @@ msgstr "Şirk"
 #: 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:1751
-#: addressbook/gui/contact-editor/e-contact-editor.c:1813
+#: 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 "Kurum"
@@ -105,18 +119,18 @@ msgstr "Kur"
 
 #: 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:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "Cep"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Car"
 msgstr "Araba"
 
 #: 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:1747
+#: 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 "İşyeri Faksı"
@@ -126,13 +140,13 @@ msgid "Bus Fax"
 msgstr "İşy Faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: 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:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "2. Meslek"
 
@@ -141,43 +155,43 @@ msgid "Bus 2"
 msgstr "Meşgul 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "2. ev"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: 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:1756
-#: addressbook/gui/contact-editor/e-contact-editor.c:1814
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "Diğer"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Başka Fakslar"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Çağrı Cihazı"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radyo"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1761
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Teleks"
@@ -188,15 +202,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:1787
+#: 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. E-posta Adresi"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1788
+#: 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. E-posta Adresi"
@@ -220,6 +234,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 "Ofis"
@@ -229,6 +244,7 @@ msgid "Off"
 msgstr "Ofis"
 
 #: 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 "Sıfat"
@@ -243,6 +259,7 @@ msgid "Prof"
 msgstr "Prof"
 
 #: 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 "Yönetici"
@@ -256,6 +273,7 @@ msgid "Ass"
 msgstr "Asis"
 
 #: 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 "Lakap"
@@ -265,16 +283,19 @@ msgid "Nick"
 msgstr "Lakap"
 
 #: 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 "Eş"
 
 #: 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 "Not"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr "Takvim URI"
 
@@ -292,288 +313,377 @@ 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 "Takvim"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
 msgid "Anniversary"
 msgstr "Yıldönümü"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Yıldön"
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "Doğum 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 "Kategoriler"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Tam İsim"
 
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:335
+#, fuzzy
+msgid "ECard"
+msgstr "Araba"
+
+#: 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
 msgid "Unnamed List"
 msgstr "İsimsiz Liste"
 
-#: addressbook/backend/ebook/e-card.c:2683
-msgid "Multiple VCards"
-msgstr "Çoklu 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 İsim"
 
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
-msgstr "%s için VCard"
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "_Adres:"
+
+#: addressbook/backend/ebook/e-card.c:1328
+#, fuzzy
+msgid "Address Label"
+msgstr "Adres Kartları"
+
+#: addressbook/backend/ebook/e-card.c:1335
+#, fuzzy
+msgid "Phone"
+msgstr "Ponce"
+
+#: addressbook/backend/ebook/e-card.c:1349
+#, fuzzy
+msgid "Birth date"
+msgstr "Doğum 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 "Kurum"
 
-#: 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
-#: tools/evolution-launch-composer.c:344
+#: 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 "Görev"
+
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
+msgid "Mailer"
+msgstr "E-postalayıcı"
+
+#: addressbook/backend/ebook/e-card.c:1445
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "_Boş/Meşgul URL:"
+
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Takvim"
+
+#: addressbook/backend/ebook/e-card.c:1466
+#, fuzzy
+msgid "Related Contacts"
+msgstr "Seçilen Bağlantılar:"
+
+#: addressbook/backend/ebook/e-card.c:1480
+#, fuzzy
+msgid "Category List"
+msgstr "Kategori"
+
+#: 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 "Diğer Adres"
+
+#: 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 "Yapıştır"
+
+#: addressbook/backend/ebook/e-card.c:1540
+#, fuzzy
+msgid "Use Score"
+msgstr "Puan"
+
+#: 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'yu başlatamadım"
 
-#: addressbook/backend/pas/pas-backend-file.c:364
-#: addressbook/backend/pas/pas-backend-ldap.c:3021
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 msgid "Searching..."
 msgstr "Aranıyor..."
 
-#: addressbook/backend/pas/pas-backend-file.c:366
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr "Yükleniyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:730
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+#, fuzzy
+msgid "Using Distinguished Name (DN)"
+msgstr "DN kullanarak"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "E-posta adresi kullanılarak"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP sunucuya yeniden bağlantı kuruluyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1273
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr "LDAP sunucuya kart ekleniyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1379
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr "LDAP sunucudaki kart siliniyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1615
-#: addressbook/backend/pas/pas-backend-ldap.c:1618
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr "LDAP sunucudaki kart düzenleniyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2932
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "LDAP arama sonuçları alınıyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:3041
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 msgid "Error performing search"
 msgstr "Arama yaparken bir hata oluştu"
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Öntanımlı Eşzamanlama Adresi:"
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "İmleç yüklenemedi\n"
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "EBook yüklenmedi\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 sunucusu başlatılamadı"
 
-#: 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şlatılamadı"
 
-#: 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 adres uygulama defteri okunamadı"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Adres menüsü için Bonobo denetleyici"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Adres gösteren örnek bir Bonobo denetleyici"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Adres defteri gösteren örnek bir Bonobo denetleyici"
-
-#: 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 "LDAP dizin servislerine erişimi buradan yapılandırın"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Evolution adres defteri mini kartını gösteren denetleyici."
-
-#: 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 "Dizin Servisleri"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution Adres Defteri mini kart görüntüleyici"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Adres Defterini Düzenle"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Bağlantıları düzenleyen Evolution bileşeni."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Evolution adres defteri isim seçme arayüzü."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Adres defteri mini kart mimarisi"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Adres defteri menüsü mimarisi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Adres defteri isim gösterim arayüzü mimarisi"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Adres Defteri mini kart görüntüleyici"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
-msgid "Factory for the Addressbook's address popup"
-msgstr "Adres defteri menüsü mimarisi"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Adres Defteri mini kart görüntüleyici"
 
-#: 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 Adres Defteri mini kart görüntüleyici"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "Factory for the sample Addressbook control"
-msgstr "Örnek adres defteri kontrol mimarisi"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution Adres Defteri mini kart görüntüleyici"
 
-#: 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 "Bağlantılar"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:76
 msgid "Folder containing contact information"
 msgstr "Bağlantı bilgisini içeren dizin"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP Server"
 msgstr "LDAP Sunucusu"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP server containing contact information"
 msgstr "Bağlantı bilgisini içeren LDAP sunucusu"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 msgid "Public Contacts"
 msgstr "Ortak Bağlantılar"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 msgid "Public folder containing contact information"
 msgstr "Bağlantı bilgisini içeren ortak dizin"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Yeni Bağlantı"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_Bağlantı"
 
-#: addressbook/gui/component/addressbook-component.c:568
-#: ui/evolution-addressbook.h:15
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Create a new contact"
 msgstr "Yeni bir bağlantı yarat"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Yeni Bağlantı Listesi"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "B_ağlantı Listesi"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:569
 msgid "Create a new contact list"
 msgstr "Yeni bir bağlantı listesi yarat"
 
-#: addressbook/gui/component/addressbook-config.c:197
+#: addressbook/gui/component/addressbook-config.c:206
 msgid "Failed to connect to LDAP server"
 msgstr "LDAP sunucuyla bağlantı başarısız oldu"
 
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 msgid "Failed to authenticate with LDAP server"
 msgstr "LDAP sunucuyla kimlik denetimi başarısız oldu"
 
-#: addressbook/gui/component/addressbook-config.c:239
+#: addressbook/gui/component/addressbook-config.c:259
 msgid "Could not perform query on Root DSE"
 msgstr "Root DSE üzerinde tarama yapılamadı"
 
-#: addressbook/gui/component/addressbook-config.c:648
+#: addressbook/gui/component/addressbook-config.c:682
 msgid "The server responded with no supported search bases"
 msgstr "Sunucunun cevabında desteklenen bir arama tabanı bulunamadı"
 
-#: addressbook/gui/component/addressbook-config.c:1154
+#: addressbook/gui/component/addressbook-config.c:1193
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Sunucu LDAPv3 şema bilgisini desteklemiyor"
 
-#: addressbook/gui/component/addressbook-config.c:1176
+#: addressbook/gui/component/addressbook-config.c:1215
 msgid "Error retrieving schema information"
 msgstr "Şema bilgisini yüklerken hata oluştu"
 
-#: addressbook/gui/component/addressbook-config.c:1184
+#: addressbook/gui/component/addressbook-config.c:1223
 msgid "Server did not respond with valid schema information"
 msgstr "Sunucu geçerli bir şema bilgisi cevabı vermedi"
 
-#: addressbook/gui/component/addressbook-config.c:1630
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(Evolution'un bu sürümünde LDAP desteklenmiyor)"
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr "Hesap Adı:"
 
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr "Sunucu 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 başlatılamıyor"
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(Evolution'un bu sürümünde LDAP desteklenmiyor)"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
 msgid "Other Contacts"
 msgstr "Diğer Bağlantılar"
 
-#: addressbook/gui/component/addressbook.c:474
-msgid "Unable to open addressbook"
-msgstr "Adres defterini açamadım"
-
-#: 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."
@@ -581,7 +691,7 @@ msgstr ""
 "Bu adres defteri açılamadı. Yeterli izin haklarına sahip olup\n"
 "olmadığınızı ve dosyanın yerini kontrol edin."
 
-#: 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"
@@ -590,7 +700,7 @@ msgstr ""
 "Bu adres defteri açılamadı. Hatalı bir adres girilmiş,\n"
 "ya da LDAP sunucusu erişilemiyor olabilir."
 
-#: 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"
@@ -602,7 +712,7 @@ msgstr ""
 "programı CVS kaynaklarından alacağınız openLDAP desteği\n"
 "ile kurmalısınız:\n"
 
-#: 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"
@@ -611,45 +721,48 @@ msgstr ""
 "Bu adres defteri açılamadı. Hatalı bir adres girilmiş,\n"
 "ya da LDAP sunucusu erişilemiyor olabilir."
 
-#. 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 "Adres defterini açamadım"
+
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP sunucuya anonim bağlantı kuruluyor"
 
-#: addressbook/gui/component/addressbook.c:625
+#: addressbook/gui/component/addressbook.c:667
 msgid "Failed to authenticate.\n"
 msgstr "Kimlik denetimi yapılamadı.\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
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s%s için parolayı girin (kullanıcı: %s)"
 
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:813
 msgid "Name begins with"
 msgstr "İsim başlar"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:814
 msgid "Email begins with"
 msgstr "E-posta başlar"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategori"
 
 #. 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 "Herhangi bir alanın içeriği"
 
-#: addressbook/gui/component/addressbook.c:786
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "Gelişmiş..."
 
-#: 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 +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"
@@ -665,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 "Herhangi bir Kategori"
 
-#: addressbook/gui/component/addressbook.c:1132
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr "Dizin tarayıcısının göstereceği URI"
 
@@ -692,55 +805,54 @@ msgstr "Dizin tarayıcısının göstereceği 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 "(hiç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:1786
+#: 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 "Birincil E-posta Adresi"
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Bir Eylem Seçin"
 
-#: 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 bir bağlantı yarat: \"%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\" bağlantısına adres ekle"
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Adres Defterini Araştırılıyor..."
 
-#: 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 "Bağlantı Bilgisini Düzenle"
 
-#: 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 "Bağlantılara Ekle"
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "E-posta Adresini Birleştir"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Aramaları Kapat"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Aramaları Etkinleştir (Tehlikeli!)"
 
@@ -756,8 +868,16 @@ msgid "  S_how Supported Bases "
 msgstr "_Desteklenen türleri denetle "
 
 #: 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"
@@ -772,59 +892,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 "<- _Sil"
-
-#: addressbook/gui/component/ldap-config.glade.h:14
-msgid "<< Fewer Options"
-msgstr "<< Daha Az Seçenek"
-
-#: 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 "LDAP Sunucusu"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
 msgstr "Adres Defteri Kaynakları"
 
-#: addressbook/gui/component/ldap-config.glade.h:17 mail/mail-account-gui.c:58
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
 #: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Her zaman"
 
-#: addressbook/gui/component/ldap-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Anonymously"
 msgstr "Anonim"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
-msgid "Associated LDAP Attribute"
-msgstr "Verilen LDAP Özniteliği"
-
-#: addressbook/gui/component/ldap-config.glade.h:20
-msgid "Attribute"
-msgstr "Öznitelik"
-
-#: 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"
@@ -837,71 +934,56 @@ msgstr ""
 "\n"
 "Lütfen girdiğiniz bilgileri tamamlamak için \"Bitir\" düğmesine tıklayın."
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
 msgstr "Bağlanıyor"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
-msgid "Corresponding Evolution Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "DN Customization"
-msgstr "DN Yapılandırması"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "_Sil"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Liste adı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid "Edit LDAP Server"
+msgstr "LDAP Sunucusu"
+
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Email Address:"
 msgstr "E-posta Adresi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-msgid "Evolution Attribute"
-msgstr "Evolution Özniteliği"
-
-#: 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 ""
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "Evolution will use this email address to authenticate you with the server"
+#: 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:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Finished"
 msgstr "Bitti"
 
-#: 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 "Genel"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "LDAP Attribute"
-msgstr "LDAP Özniteliği"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "LDAP Configuration Assistant"
 msgstr "LDAP Yapılandırma Sihirbazı"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
-#, fuzzy
-msgid "Mappings"
-msgstr "Marjin"
-
-#: addressbook/gui/component/ldap-config.glade.h:39 mail/mail-account-gui.c:60
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
 #: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr "Hiç bir zaman"
 
-#: 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"
@@ -911,64 +993,34 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: 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 "Biri"
 
-#: 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 "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 "İle_tide Ara..."
 
 #. 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 "Arıyor"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
-msgid "Select"
-msgstr "Seç"
-
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Seçilen:"
 
-#: 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"
@@ -979,7 +1031,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"
@@ -988,44 +1040,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
+#: 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:67
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 1: Server Information"
 msgstr "1. Adım: Sunucu Bilgisi"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Step 2: Connecting to Server"
 msgstr "2. Adım: Sunucuya Bağlantı Kuruluyor"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr "3. Adım: Dizin Aranıyor"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr "4. Adım: Görüntülenecek İsim"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Supported Search Bases"
 msgstr "Desteklenen Arama Tabanları"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: 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"
@@ -1033,7 +1085,7 @@ msgid ""
 "information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1042,7 +1094,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: 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"
@@ -1050,7 +1102,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: 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"
@@ -1060,7 +1112,7 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: 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"
@@ -1070,34 +1122,34 @@ msgid ""
 "need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: 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:91
+#: 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:93
+#: 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:94
+#: 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:96
+#: 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"
@@ -1105,288 +1157,188 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: 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:100
-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:103
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr "_SSL/TLS kullan:"
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr "DN kullanarak"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using email address"
 msgstr "E-posta adresi kullanılarak"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Ne Zaman Mümkünse"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
-#: 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
-#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
+#: 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 "_Ekle"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
-msgid "_Add ->"
-msgstr "_Ekle ->"
-
-#: addressbook/gui/component/ldap-config.glade.h:109
-#, fuzzy
-msgid "_Add Mapping"
-msgstr "Eylem ekle"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-#, fuzzy
-msgid "_Add to DN"
-msgstr "Eylem ekle"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-msgid "_Always"
-msgstr "_Her zaman"
-
-#: addressbook/gui/component/ldap-config.glade.h:112
-#, fuzzy
-msgid "_Delete Mapping"
-msgstr "He_psini sil"
-
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Display name:"
 msgstr "_Görüntülenecek isim:"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
-msgid "_Distinguished Name (DN):"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_Don't use SSL/TLS"
-msgstr "_SSL/TLS kullanma"
-
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr "İ_ndirme sınırı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:117 filter/filter.glade.h:16
-#: mail/mail-config.glade.h:152 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.h:40
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Düzenle"
 
-#: addressbook/gui/component/ldap-config.glade.h:118
-#, fuzzy
-msgid "_Edit Mapping"
-msgstr "_Toplantıyı düzenle"
-
-#: addressbook/gui/component/ldap-config.glade.h:119
-#, fuzzy
-msgid "_Evolution attribute:"
-msgstr "Evolution Alarmı"
-
-#: addressbook/gui/component/ldap-config.glade.h:120
-msgid "_If necessary "
-msgstr "İ_htiyaç anında"
-
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_LDAP attribute:"
-msgstr "_LDAP özniteliği:"
-
-#: addressbook/gui/component/ldap-config.glade.h:122
-msgid "_LDAP attributes:"
-msgstr "_LDAP öznitelikleri:"
-
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr "_Giriş yöntemi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
-msgid "_More Options >>"
-msgstr "_Daha Çok Seçenek >>"
-
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Port number:"
 msgstr "_Port numarası:"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
-msgid "_Restore Defaults"
-msgstr "_Öntanımlı Değerlere Geri Dön"
-
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Search base:"
 msgstr "_Arama tabanı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "_Sunucu adı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Timeout (minutes):"
 msgstr "_Zaman aşımı süresi (dakika):"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
-msgid "account-druid"
-msgstr "hesap-sihirbazı"
-
-#: addressbook/gui/component/ldap-config.glade.h:131
-msgid "account-editor"
-msgstr "hesap-düzenleyici"
-
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "cards"
 msgstr "kartlar"
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "connecting-tab"
 msgstr "bağlantı-sekmesi"
 
-#: addressbook/gui/component/ldap-config.glade.h:134
-msgid "dn-customization-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:135
-msgid "edit_server_window_simple"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "general-tab"
 msgstr "genel-sekme"
 
-#: addressbook/gui/component/ldap-config.glade.h:137
-msgid "mappings-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:138
-msgid "objectclasses-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:139
+#: addressbook/gui/component/ldap-config.glade.h:98
 #, fuzzy
 msgid "searching-tab"
 msgstr "Arıyor"
 
-#: 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 adres defteri isim seçme arayüzü."
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Adres defteri isim seçim arayüzü mimarisi"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Tümünü Sil"
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:707
-#: 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 "Tümünü Sil"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+msgstr "Yeni Bağlantı Listesi"
 
-#: 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 "Bağlantı Bilgisini Düzenle"
+
+#: 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 Posta Gönderilsin mi?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:405
-msgid "Edit Contact List"
-msgstr "Bağ_lantı Listesini Düzenle"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:423
-msgid "Unnamed Contact List"
-msgstr "İsimsiz Bağlantı Listesi"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:440
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d adet gösterilmiyor)"
-
-#: 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 "İsimsiz Bağlantı"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
+#: 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 "Kaynak"
+
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr "Adres Defterinden Bağlantıları Seç"
 
-#: addressbook/gui/component/select-names/e-select-names.c:572
+#: addressbook/gui/component/select-names/e-select-names.c:648
 #, fuzzy
 msgid "Find contact in"
 msgstr "Gönderen içerir"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-#: ui/evolution-addressbook.h:16
+#: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Bul"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "İsimleri Seçin"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "Selected Contacts:"
 msgstr "Seçilen Bağlantılar:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:5
 msgid "Show Contacts"
 msgstr "Bağlantıları Göster"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: 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:7
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Category:"
 msgstr "_Kategori:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr "_Dizin:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "A_ssistant's name:"
 msgstr "_Sekreterinin adı:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Add_ress..."
 msgstr "_Adres..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr "_Yıldönümü:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Birthda_y:"
 msgstr "_Doğum günü:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
-msgstr "_Bağlantılar..."
-
 #: 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 "Kategoriler..."
@@ -1397,7 +1349,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 "Bağlantı Düzenleyici"
 
@@ -1406,7 +1358,7 @@ msgid "D_epartment:"
 msgstr "_Bölüm:"
 
 #: 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 "Ayrıntılar"
 
@@ -1445,1140 +1397,1188 @@ msgstr "_Kurum:"
 msgid "P_rofession:"
 msgstr "_Uzmanlık alanı:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr "Telefon Türleri"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "S_pouse:"
 msgstr "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 "_Bu mektuplaşma adresidir"
 
-#: 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 e-postalarını kabul ediyor"
 
-#: 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:150
-#: 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 "_Meslek tanımı:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr "_Menejerinin adı:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "_Lakap:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_Ofis:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Public Calendar URL:"
 msgstr "_Genel Takvim URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Web page address:"
 msgstr "W_eb sayfası adresi:"
 
-#: 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 "Etkinleştir"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr "Amerika"
 
-#: 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 "Arnavutluk"
 
-#: 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"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Andorra"
 msgstr "Andora"
 
-#: 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 ve 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 "Arjantin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Armenia"
 msgstr "Ermenistan"
 
-#: 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 "Avusturalya"
 
-#: 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 "Avusturya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Azerbaijan"
 msgstr "Azerbaycan"
 
-#: 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 "Bahamalar"
 
-#: 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 "Bangladeş"
 
-#: 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 "Belarus"
 
-#: 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 "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 "Bolivya"
 
-#: 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 "Bosna Hersek"
 
-#: 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 Island"
 
-#: 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 "Brezilya"
 
-#: 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 "British Indian Ocean Territory"
 
-#: 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 "Bulgaristan"
 
-#: 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 "Kamboçya"
 
-#: 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 "Cape 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 "Cayman 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 "Orta Afrika Cumhuriyeti"
 
-#: 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 "Christmas Island"
 
-#: 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) Adaları"
 
-#: 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 "Kolombiya"
 
-#: 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 "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 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 "Cote d'Ivoire"
 
-#: 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 "Hırvatistan"
 
-#: 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 "Küba"
 
-#: 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ıbrıs"
 
-#: 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 "Çek Cumhuriyeti"
 
-#: 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 "Dominik Cumhuriyeti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr "Doğu Timur"
 
-#: 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 "Ekvator"
 
-#: 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 "Mısır"
 
-#: 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 "Equatorial 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 "Estonya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Etiyopya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "Falkland 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 "Faroe Adaları"
 
-#: 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 "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 Guyanası"
 
-#: 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 Polinezyası"
 
-#: 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 "French Southern Territories"
 
-#: 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 "Gürcistan"
 
-#: 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 "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 "Cebelitarık"
 
-#: 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 "Yunanistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Grönland"
 
-#: 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 "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 "Gine"
 
-#: 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 And McDonald Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr "Holy See"
 
-#: 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 "Macaristan"
 
-#: 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 "İzlanda"
 
-#: 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 "İndonezya"
 
-#: 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 "İrlanda"
 
-#: 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 "İtalya"
 
-#: 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 "Japonya"
 
-#: 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 "Ürdün"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kazakistan"
 
-#: 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 "Kore"
 
-#: 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 "Kuveyt"
 
-#: 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ızistan"
 
-#: 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 "Latvia"
 
-#: 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übnan"
 
-#: 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 "Liberya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liechtenstein"
 msgstr "Lihtenştayn"
 
-#: 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 "Litvanya"
 
-#: 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üksemburg"
 
-#: 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 "Makedonya"
 
-#: 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 "Malezya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Maldives"
 msgstr "Maldivler"
 
-#: 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 Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Martinique"
 msgstr "Martinik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mauritania"
 msgstr "Moritanya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Mauritius"
 msgstr "Maritus"
 
-#: 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 "Meksika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Micronesia"
 msgstr "Mikronezya"
 
-#: 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 "Moldova"
 
-#: 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 "Moğolistan"
 
-#: 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 "Morocco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mozambique"
 msgstr "Mozambik"
 
-#: 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 "Namibya"
 
-#: 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 "Hollanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Netherlands Antilles"
 msgstr "Hollanda Antilleri"
 
-#: 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 Kaledonya"
 
-#: 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 Zelanda"
 
-#: 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 "Nijerya"
 
-#: 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 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 "Northern Mariana 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 "Filistan Bölgesi"
 
-#: 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 Gine"
 
-#: 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 "Peru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Philippines"
 msgstr "Filipinler"
 
-#: 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 "Polonya"
 
-#: 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 "Portekiz"
 
-#: 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 "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 "Romanya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Russian Federation"
 msgstr "Rusya Federasyonu"
 
-#: 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 And 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 And The Grena-dines"
 
-#: 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 And 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 "Suudi Arabistan"
 
-#: 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 "Seyşeller"
 
-#: 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 "Slovakya"
 
-#: 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 "Slovenya"
 
-#: 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 "Güney 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 "South Georgia And The South Sandwich 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 "İspanya"
 
-#: 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 "St. 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 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 "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 And Jan Mayen Adaları"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: 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 "İsviçre"
 
-#: 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
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzanya"
 
-#: 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 "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 ve Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tunisia"
 msgstr "Tunus"
 
-#: 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ürkiye"
 
-#: 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 And Caicos Islands"
 
-#: 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 "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 "Birleşik Arap Emirlikleri"
 
-#: 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 "Birleşik Krallık"
 
-#: 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 "United States Minor Outlying Islands"
 
-#: 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 "Özbekistan"
 
-#: 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 "Virgin Islands, ABD"
 
-#: 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 "Virgin Islands, US"
 
-#: 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 And Futuna Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Western Sahara"
 msgstr "Western 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 "Yugoslavya"
 
-#: 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 "Zimbabwe"
 
-#: 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 "Bodo"
+
+#: 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 "Araba"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
+msgid "Is New Card"
 msgstr ""
-"Gerçekten bu bağlantıyı\n"
-"silmek istiyor musunuz?"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "Bağlantıyı Sil?"
+#: 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 "Çad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:826
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr "Kategori düzenleyici bulunamadı."
 
-#: 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 bağlantı adı aşağıdaki sınıflandırmalara girer:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1047
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr "Bağlantıyı VCard olarak kaydet"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1762
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Gerçekten bu bağlantıyı\n"
+"silmek istiyor musunuz?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Gerçekten bu bağlantıyı\n"
+"silmek istiyor musunuz?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2455
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Bir alan için parçacık bulunamadı: `%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 "Bağlantıyı Hızlı Ekle"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr "Tümünü Düzenle"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Tam İsim"
-
-#: 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-posta"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, fuzzy, c-format
+msgid "Error saving %s: %s"
+msgstr "%s dosyasını kaydederken hata oldu"
+
 #. 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 "kart.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:221
+#: addressbook/gui/contact-editor/e-contact-save-as.c:206
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2587,149 +2587,146 @@ msgstr ""
 "%s dosyası mevcut\n"
 "Üzerine yazmak istiyor musunuz?"
 
-#: addressbook/gui/contact-editor/file-exists.glade.h:1
-msgid "Confirm Overwrite"
-msgstr "Üzerine Yazılsın mı?"
-
-#: 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 "Üzerine yaz"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "_2. Adres:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Adresi Denetle"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Ü_lke:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr "Ş_ehir:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Posta Kutusu:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Bölge:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "Posta _Numarası:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Check Full Name"
 msgstr "Tam İsmi Kontrol Et"
 
-#: 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 "Bay"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Bn."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Bn."
 
-#: 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 "_Birinci:"
 
-#: 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 "_Ortanca:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "S_onek:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Sıfatı:"
 
-#: 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 "_Liste adı:"
 
-#: 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 "Üyeler"
 
-#: 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 "_Sil"
 
-#: 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 "bağlantı-listesi-editörü"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+#, fuzzy
+msgid "Is New List"
+msgstr "Yeni Liste"
+
 #. 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 "Bağlantı Listesi Düzenleyici"
 
-#: 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 "Listeyi VCard Olarak Kaydet"
 
@@ -2782,261 +2779,282 @@ msgstr ""
 "Değiştirilen bağlantı adresinin adı ya da e-posta adresi zaten var.\n"
 "Yine de eklemek istiyor musunuz?"
 
-#: 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 "Gelişmiş Arama"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr "Ara"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr "Kart yok"
 
-#: 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 "Quimper"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 #, fuzzy
 msgid "Error getting book view"
 msgstr "%s başlatırken hata oluştu"
 
+#: 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 "Kartlar düzenlenirken bir hata oluştu"
 
-#: 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 "Başarıldı"
 
-#: 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 "Bilinmeyen hata"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Depo çevrimdışı"
 
-#: 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 "İzin yok"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Kart bulunamadı"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Bu kart numarası var"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protokol desteklenmiyor"
 
-#: 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 "İptal Edildi"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr "Kimlik Denetimi Başarısız."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr "Kimlik Denetimi İsteniyor"
 
-#: 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 dosyası bulunamadı."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Diğer hata"
 
-#: 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 "Değişiklikleri kaydetmek istiyor musunuz?"
 
-#: 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 "Liste eklenirken hata oluştu"
 
-#: 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 eklenirken hata oluştu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:91
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Liste düzenlenirken hata oluştu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Listeyi silerken bir hata oluştu"
 
-#: 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ı silerken bir hata oluştu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
-#, fuzzy
-msgid "Display Cards?"
-msgstr "Görüntüleme"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-#, fuzzy
-msgid "Display Cards"
-msgstr "Görüntüleme"
-
-#: 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 "Kartı taşı:"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Kartı kopyala:"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:353
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Kartları taşı:"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:355
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Kartları kopyala:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "Çoklu VCard"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "%s için 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 "Tür"
+
+#: 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 "Adres Defteri"
 
-#: 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 olarak kaydet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "New Contact..."
 msgstr "Yeni Bağlantı..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "New Contact List..."
 msgstr "Yeni Bağlantı Listesi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Go to Folder..."
 msgstr "Dizine Git..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Import..."
 msgstr "Al..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Search for Contacts..."
 msgstr "Bağlantıları Ara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Addressbook Sources..."
 msgstr "Adres Defteri Kaynakları..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Pilot Settings..."
 msgstr "Pilot Ayarları..."
 
-#: 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 "Bağlantıyı Gönder"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:815
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr "Bağlantıya İleti Gönder"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:816
-#: ui/evolution-addressbook.h:18 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
+#: 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 "Yazdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr "Zarfı Yazdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Copy to folder..."
 msgstr "Dizine kopyala..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Move to folder..."
 msgstr "Dizine taşı..."
 
-#: 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 "Kes"
 
-#: 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 "Kopyala"
 
-#: 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ıştı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.h:20 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 "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
 msgid "Current View"
 msgstr "Şimdiki Görünüm"
 
@@ -3044,7 +3062,7 @@ msgstr "Şimdiki Görünüm"
 #. 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"
 
@@ -3052,11 +3070,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"
@@ -3124,20 +3142,61 @@ msgstr "Diğer Telefonlar"
 msgid "Primary Phone"
 msgstr "İlk 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 "ve %d adet diğer kart."
 
-#: addressbook/gui/widgets/e-minicard-control.c:187
+#: addressbook/gui/widgets/e-minicard-control.c:206
 msgid "and one other card."
 msgstr "ve diğer 1 kart."
 
-#: addressbook/gui/widgets/e-minicard-control.c:316
+#: addressbook/gui/widgets/e-minicard-control.c:318
 msgid "Save in addressbook"
 msgstr "Adres Defterine kaydet"
 
-#: 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 "Genişlik:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+#, fuzzy
+msgid "Height"
+msgstr "Yükseklik:"
+
+#: 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 "Tam İsim"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+#, fuzzy
+msgid "Text Model"
+msgstr "Metin _Boyu"
+
+#: 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"
@@ -3151,7 +3210,7 @@ msgstr ""
 "\n"
 "Buraya çift tıklayarak bir bağlantı yaratın."
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 msgid ""
 "\n"
 "\n"
@@ -3161,21 +3220,41 @@ msgstr ""
 "\n"
 "Bu bakışta gösterilecek öğe yok"
 
-#: 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 "Seçilen:"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Görev sıralama"
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Kart Görünümü"
 
-#: 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 "Hafta Görünümü"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr "Zarfı yazdır"
 
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1130
 msgid "Print cards"
 msgstr "Kartları yazdır"
 
-#: 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ı yazdır"
 
@@ -3248,7 +3327,6 @@ msgid "Include:"
 msgstr "İçer:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Yatay"
 
@@ -3268,17 +3346,16 @@ msgstr "Marjin"
 msgid "Number of columns:"
 msgstr "Sütun sayısı:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr "Seçenekler"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Konum"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "Sayfa"
 
@@ -3294,9 +3371,7 @@ msgstr "Kağıt"
 msgid "Paper source:"
 msgstr "Kağıt kaynağı:"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Portre"
 
@@ -3356,43 +3431,167 @@ msgstr "_Yazıtipi..."
 msgid "Untitled appointment"
 msgstr "Başlıksız toplantı"
 
-#: 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 "8."
+
+#: 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 "39."
+
+#: 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 "Yüksek"
 
-#: 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 "Düşük"
 
 #. 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 "Tanımsız"
 
-#: 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 "Takvim sunucusuyla iletişimde hata oluştu"
 
-#: 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'tan takvim uygulama bloğu okunamadı"
 
@@ -3400,88 +3599,76 @@ msgstr "Pilot'tan takvim uygulama bloğu okunamadı"
 msgid "Default Priority:"
 msgstr "Öntanımlı Öncelik:"
 
-#: 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 ToDO uygulama bloğu okunamadı"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "Görev listesi gösteren örnek bir Bonobo denetleyici."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Takvim gösteren örnek bir Bonobo denetleyici."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 msgid "Calendar and Tasks"
 msgstr "Takvim ve Görevler"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Evolution e-posta programı mimarisi."
-
-#: 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 takvimi iTip/iMip görüntüleyici"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Takvimi düzenleyen Evolution bileşeni."
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Takvim ve Görevler"
 
-#: 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"
-msgstr "Evolution e-posta programı mimarisi."
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution takvim özet bileşeni."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the calendar iTip view control"
-msgstr "Takvim iTip görüntü kontrolü mimarisi"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "E-posta özet bileşen mimarisi"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-msgid "Factory for the sample Calendar control"
-msgstr "Örnek Takvim kontrolü mimarisi"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution takvimi iTip/iMip görüntüleyici"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 #, fuzzy
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Örnek Takvim kontrolü mimarisi"
+msgid "Evolution Calendar viewer"
+msgstr "Evolution takvimi iTip/iMip görüntüleyici"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 #, fuzzy
-msgid "Factory to create a component editor factory"
-msgstr "Bileşen düzenleyici mimarisi oluşturulamadı."
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Haber Grubu Düzenleyici"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "Alarm bilgilendirme servisi"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution Haber Grubu Düzenleyici"
 
-#: 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 bilgilendirme servisi mimarisi"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Starting:"
 msgstr "Başlangıç:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Ending:"
 msgstr "Bitiş:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
 msgid "invalid time"
 msgstr "geçersiz saat"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:274
 msgid "Evolution Alarm"
 msgstr "Evolution Alarmı"
 
-#: 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 tarihinde Alarm"
@@ -3503,11 +3690,17 @@ msgstr "Dinlenme zamanı (dakika)"
 msgid "_Edit appointment"
 msgstr "_Toplantıyı düzenle"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "Açıklama yok."
 
-#: 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 "Uyarı"
+
+#: 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"
@@ -3515,13 +3708,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:2924
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Uyarı"
-
-#: 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 "
@@ -3532,15 +3719,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 "GNOME başlatılamıyor"
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize gnome-vfs"
+msgstr "Gnome-vfs başlatılamıyor"
 
-#: 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 bilgilendirme servis mimarisi oluşturamadım"
 
@@ -3556,104 +3743,198 @@ msgstr "Açıklama içeriği"
 msgid "Comment contains"
 msgstr "Yorum içeriği"
 
-#: 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 "Eşleme yok"
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:404
 msgid "%A %d %B %Y"
 msgstr "%d %B %A %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 "%d %b %a"
 
-#: 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 "%d %b %a %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"
 
 #: calendar/gui/calendar-commands.c:799
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Takvim görünümü yaratılamadı. ORBit ve OAF kurulumunu gözden geçirin."
 
-#: 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 "Takvim"
+
+#: calendar/gui/calendar-component.c:71
+msgid "Folder containing appointments and events"
+msgstr "Randevuları tutan dizin"
+
+#: calendar/gui/calendar-component.c:75
+msgid "Public Calendar"
+msgstr "Genel Takvim"
+
+#: calendar/gui/calendar-component.c:76
+#, fuzzy
+msgid "Public folder containing appointments and events"
+msgstr "Randevuları tutan dizin"
+
+#: 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 "Görevler"
+
+#: calendar/gui/calendar-component.c:81
+msgid "Folder containing to-do items"
+msgstr "Yapılacaklar listesini tutan dizin"
+
+#: calendar/gui/calendar-component.c:85
+msgid "Public Tasks"
+msgstr "Genel Görevler"
+
+#: calendar/gui/calendar-component.c:86
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "Yapılacaklar listesini tutan dizin"
+
+#: calendar/gui/calendar-component.c:730
+msgid "New appointment"
+msgstr "Yeni randevu"
+
+#: calendar/gui/calendar-component.c:730
+msgid "_Appointment"
+msgstr "_Randevu"
+
+#: calendar/gui/calendar-component.c:731
+msgid "Create a new appointment"
+msgstr "Yeni bir randevu oluştur"
+
+#: calendar/gui/calendar-component.c:735
+msgid "New meeting"
+msgstr "Yeni toplantı"
+
+#: calendar/gui/calendar-component.c:735
+msgid "_Meeting"
+msgstr "_Toplantı"
+
+#: calendar/gui/calendar-component.c:736
+msgid "Create a new meeting request"
+msgstr "Yeni bir toplantı isteği oluştur"
+
+#: calendar/gui/calendar-component.c:740
+msgid "New task"
+msgstr "Yeni görev"
+
+#: calendar/gui/calendar-component.c:740
+msgid "_Task"
+msgstr "_Görev"
+
+#: calendar/gui/calendar-component.c:741
+msgid "Create a new task"
+msgstr "Yeni bir görev oluştur"
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Yeni Randevu"
+
+#: calendar/gui/calendar-component.c:745
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Yeni _Randevu"
+
+#: calendar/gui/calendar-component.c:746
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Yeni bir randevu oluştur"
+
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
+#: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "Özel"
 
-#: 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 "Genel"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "N"
 msgstr "K"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "S"
 msgstr "G"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "E"
 msgstr "D"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "W"
 msgstr "B"
 
-#: 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 "Meşgul"
 
-#: 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şlamadı"
 
-#: 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 "İşlemde"
 
-#: 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 "Tamamlandı"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3664,334 +3945,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:468 mail/mail-config.glade.h:79
-#: 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 "Yok"
 
-#: calendar/gui/calendar-model.c:1723
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Tekrarlama"
 
-#: calendar/gui/calendar-model.c:1725
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Görevlendirildi"
 
-#: 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:569
-#: calendar/gui/e-meeting-model.c:863
+#: 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 "Evet"
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:864
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:839
 msgid "No"
 msgstr "Hayır"
 
-#: calendar/gui/calendar-view-factory.c:148
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Gün Görünümü"
 
-#: calendar/gui/calendar-view-factory.c:151
+#: calendar/gui/calendar-view-factory.c:121
 msgid "Work Week View"
 msgstr "Çalışma Haftası Görünümü"
 
-#: calendar/gui/calendar-view-factory.c:154
+#: calendar/gui/calendar-view-factory.c:124
 msgid "Week View"
 msgstr "Hafta Görünümü"
 
-#: calendar/gui/calendar-view-factory.c:157
+#: calendar/gui/calendar-view-factory.c:127
 msgid "Month View"
 msgstr "Ay Görünümü"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1372
-#: 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 "Takvim"
-
-#: calendar/gui/component-factory.c:72
-msgid "Folder containing appointments and events"
-msgstr "Randevuları tutan dizin"
-
-#: calendar/gui/component-factory.c:76
-msgid "Public Calendar"
-msgstr "Genel Takvim"
-
-#: calendar/gui/component-factory.c:77
+#: calendar/gui/comp-editor-factory.c:456
 #, fuzzy
-msgid "Public folder containing appointments and events"
-msgstr "Randevuları tutan dizin"
-
-#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:738
-#: 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 "Görevler"
-
-#: calendar/gui/component-factory.c:82
-msgid "Folder containing to-do items"
-msgstr "Yapılacaklar listesini tutan dizin"
-
-#: calendar/gui/component-factory.c:86
-msgid "Public Tasks"
-msgstr "Genel Görevler"
-
-#: calendar/gui/component-factory.c:87
-#, fuzzy
-msgid "Public folder containing to-do items"
-msgstr "Yapılacaklar listesini tutan dizin"
-
-#: calendar/gui/component-factory.c:750
-msgid "New appointment"
-msgstr "Yeni randevu"
-
-#: calendar/gui/component-factory.c:750
-msgid "_Appointment"
-msgstr "_Randevu"
-
-#: calendar/gui/component-factory.c:751
-msgid "Create a new appointment"
-msgstr "Yeni bir randevu oluştur"
-
-#: calendar/gui/component-factory.c:755
-msgid "New meeting"
-msgstr "Yeni toplantı"
-
-#: calendar/gui/component-factory.c:755
-msgid "_Meeting"
-msgstr "_Toplantı"
-
-#: calendar/gui/component-factory.c:756
-msgid "Create a new meeting request"
-msgstr "Yeni bir toplantı isteği oluştur"
-
-#: calendar/gui/component-factory.c:760
-msgid "New task"
-msgstr "Yeni görev"
-
-#: calendar/gui/component-factory.c:760
-msgid "_Task"
-msgstr "_Görev"
-
-#: calendar/gui/component-factory.c:761
-msgid "Create a new task"
-msgstr "Yeni bir görev oluştur"
-
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "New All Day Appointment"
-msgstr "Yeni Randevu"
+msgid "Error while opening the calendar"
+msgstr "Takvim sunucusuyla iletişimde hata oluştu"
 
-#: calendar/gui/component-factory.c:765
-#, fuzzy
-msgid "All _Day Appointment"
-msgstr "Yeni _Randevu"
+#: 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 randevu oluştur"
+msgid "Permission denied to open the calendar"
+msgstr "İzin yok"
 
-#: calendar/gui/control-factory.c:123
+#: calendar/gui/control-factory.c:119
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "`%s' dizini açılamadı."
 
-#: calendar/gui/control-factory.c:167
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "Takvimin gösterecek olduğu 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 "Ses Alarm Seçenekleri"
 
-#: calendar/gui/dialogs/alarm-options.c:368
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "İleti Alarm Seçenekleri"
 
-#: calendar/gui/dialogs/alarm-options.c:377
-msgid "Mail Alarm Options"
+#: calendar/gui/dialogs/alarm-options.c:438
+#, fuzzy
+msgid "Email Alarm Options"
 msgstr "E-posta Alarmı Seçenekleri"
 
-#: calendar/gui/dialogs/alarm-options.c:386
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Program Alarm Seçenekleri"
 
-#: calendar/gui/dialogs/alarm-options.c:395
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Bilinmeyen Alarm Seçenekleri"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Alarm Repeat"
 msgstr "Alarm Tekrarı"
 
-#: 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 "Gösterilecek İleti"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "İleti Gövdesi"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "Ses çal:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "Alarmı tekrar et"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "Program çalıştır:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "Gönder"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr "Bu argümanlarla:"
 
-#: 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 ""
 
-#: 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 "dakika"
 
-#: 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 hafta"
-
-#: calendar/gui/dialogs/alarm-page.c:330
-msgid "1 week"
-msgstr "1 hafta"
-
-#: 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 dakika"
-
-#: calendar/gui/dialogs/alarm-page.c:346
-msgid "1 minute"
-msgstr "1 dakika"
-
-#: calendar/gui/dialogs/alarm-page.c:351
-#, c-format
-msgid "%d seconds"
-msgstr "%d saniye"
-
-#: calendar/gui/dialogs/alarm-page.c:354
-msgid "1 second"
-msgstr "1 saniye"
-
-#: calendar/gui/dialogs/alarm-page.c:383
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
-msgstr "Bir ses çal"
-
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
-msgstr "Bir mesaj göster"
-
-#: calendar/gui/dialogs/alarm-page.c:391
-msgid "Send an email"
-msgstr "Bir e-posta gönder"
-
-#: calendar/gui/dialogs/alarm-page.c:395
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
-msgstr "Bir program çalıştır"
-
-#: calendar/gui/dialogs/alarm-page.c:401
-msgid "Unknown action to be performed"
-msgstr "Bilinmeyen eylem"
-
-#: calendar/gui/dialogs/alarm-page.c:413
-#, fuzzy, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "randevu başlangıcı"
-
-#: calendar/gui/dialogs/alarm-page.c:416
-#, fuzzy, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "randevu başlangıcı"
-
-#: calendar/gui/dialogs/alarm-page.c:421
-#, fuzzy, c-format
-msgid "%s at the start of the appointment"
-msgstr "randevu başlangıcı"
-
-#: calendar/gui/dialogs/alarm-page.c:430
-#, fuzzy, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "Randevuyu sil"
-
-#: calendar/gui/dialogs/alarm-page.c:433
-#, fuzzy, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "randevu başlangıcı"
-
-#: calendar/gui/dialogs/alarm-page.c:438
-#, fuzzy, c-format
-msgid "%s at the end of the appointment"
-msgstr "randevu sonu"
-
-#: calendar/gui/dialogs/alarm-page.c:462
-#, fuzzy, c-format
-msgid "%s at %s"
-msgstr "%s sunucu %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
 msgid "Basics"
@@ -4002,46 +4104,63 @@ msgstr "Temel"
 msgid "Date/Time:"
 msgstr "Tarih/Zaman:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "Bir mesaj göster"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "Bir ses çal"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Hatırlatıcılar"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "Bir program çalıştır"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "Bir e-posta gönder"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1027 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 "Özet:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_Seçenekler..."
 
-#: 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 "önce"
 
-#: 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"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "randevu 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:182
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
 msgid "minute(s)"
 msgstr "dakika"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "randevu başlangıcı"
 
@@ -4090,8 +4209,8 @@ msgid "Days"
 msgstr "Gün"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1135
-#: calendar/gui/e-itip-control.c:655
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr "Cuma"
 
@@ -4104,8 +4223,8 @@ msgid "Minutes"
 msgstr "Dakika"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1131
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr "Pazartesi"
 
@@ -4114,8 +4233,8 @@ msgid "S_un"
 msgstr "_Paz"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1136
-#: calendar/gui/e-itip-control.c:656
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr "Cumartesi"
 
@@ -4128,8 +4247,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/e-itip-control.c:650
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
 msgid "Sunday"
 msgstr "Pazar"
 
@@ -4147,8 +4266,8 @@ msgid "Task List"
 msgstr "Görev Listesi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1134
-#: calendar/gui/e-itip-control.c:654
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr "Perşembe"
 
@@ -4165,8 +4284,8 @@ msgid "Time format:"
 msgstr "Zaman biçimi:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1132
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr "Salı"
 
@@ -4175,8 +4294,8 @@ msgid "W_eek starts:"
 msgstr "_Hafta başı:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1133
-#: calendar/gui/e-itip-control.c:653
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr "Çarşamba"
 
@@ -4218,7 +4337,7 @@ msgid "_Fri"
 msgstr "_Cum"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
 msgid "_General"
 msgstr "_Genel"
 
@@ -4261,161 +4380,161 @@ msgstr "Ç_ar"
 msgid "before every appointment"
 msgstr "her randevudan önce"
 
-#: 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 "Gerçekten bu toplantıyı iptal edip silmek istiyor musunuz?"
 
-#: 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 "Gerçekten bu görevi iptal edip silmek istiyor musunuz?"
 
-#: 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 "`%s' başlıksız günlük girdisini silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Olay silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Bu görev silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 #, fuzzy
 msgid "This journal entry has been deleted."
 msgstr "Olay 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 ""
 
-#: 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  Hiç değişiklik yapılmadı. Düzenleyici kapatılsın mı?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Bu olay değiştirildi."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Görev değiştirildi."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 #, fuzzy
 msgid "This journal entry has been changed."
 msgstr "Görev değiştirildi."
 
-#: 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 "%s  Hiç değişiklik yapılmadı. Düzenleyici güncellensin mi?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:414
+#: calendar/gui/dialogs/comp-editor-page.c:409
 #, c-format
 msgid "Validation error: %s"
 msgstr "Onaylama hatası: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
+#: 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 " (Tamamlanan "
 
-#: 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 "Tamamlanan "
 
-#: 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
 #, fuzzy
 msgid " (Due "
 msgstr "Tarihe göre "
 
-#: 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 "Tarihe göre "
 
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:328
 msgid "Could not update invalid object"
 msgstr "Öğe güncellenemedi"
 
-#: calendar/gui/dialogs/comp-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr "Öğe bulunamadı ve güncellenemedi"
 
-#: 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 "Bu öğeyi güncellemek için izniniz yoktur."
 
-#: calendar/gui/dialogs/comp-editor.c:352
+#: calendar/gui/dialogs/comp-editor.c:337
 msgid "Could not update object"
 msgstr "Öğe güncellenemedi"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Randevuyu Düzenle"
 
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "Randevu - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "Görev - %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 "Özet yok"
 
-#: 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 "Farklı kaydet..."
 
-#: 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 ""
 
@@ -4474,104 +4593,99 @@ msgstr "Dağıt:"
 msgid "Enter Delegate"
 msgstr "Bitiş Tarihi"
 
-#: 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 "Randevu"
 
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Hatırlatıcı"
 
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Tekrarlama"
 
-#: calendar/gui/dialogs/event-editor.c:232
-#: calendar/gui/dialogs/event-editor.c:299
-#: calendar/gui/dialogs/event-editor.c:435
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:434
 msgid "Scheduling"
 msgstr "Zaman Düzenleme"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:302
-#: calendar/gui/dialogs/event-editor.c:438 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 "Toplantı"
 
-#: calendar/gui/dialogs/event-page.c:656 calendar/gui/dialogs/task-page.c:567
+#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:554
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Başlangıç Tarihi"
 
-#: calendar/gui/dialogs/event-page.c:666
+#: calendar/gui/dialogs/event-page.c:610
 msgid "End date is wrong"
 msgstr "Bitiş tarihi yanlış"
 
-#: calendar/gui/dialogs/event-page.c:689
+#: calendar/gui/dialogs/event-page.c:633
 msgid "Start time is wrong"
 msgstr "Başlangıç tarihi yanlış"
 
-#: calendar/gui/dialogs/event-page.c:696
+#: calendar/gui/dialogs/event-page.c:640
 msgid "End time is wrong"
 msgstr "Bitiş tarihi yanlış"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
 msgstr "_Tüm gün olayları"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "Meşgu_l"
 
-#: 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 "Sınıflandırma"
 
-#: 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 "_Gizli"
 
-#: 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 "Tarih & Zaman"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "_Boş"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr "_Konum: "
 
-#: 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 "Ö_zel"
 
-#: 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 "_Genel"
 
-#: 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 "Zamanı Farklı Göster"
 
-#: 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 "Ö_zet:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Bağlantılar..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "B_itiş tarihi:"
@@ -4580,19 +4694,23 @@ msgstr "B_itiş tarihi:"
 msgid "_Start time:"
 msgstr "B_aşlangıç tarihi:"
 
-#: 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 "Bir düzenleyen kişi olmak zorunda."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr "En az bir katılan olmalıdı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 kişi toplantıya zaten katılıyor!"
 
-#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr "_Dağıt..."
 
@@ -4634,16 +4752,11 @@ msgid "Member"
 msgstr "Üye"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1151
+#: 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 "Görev"
-
 #: 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
@@ -4651,13 +4764,6 @@ msgstr "Görev"
 msgid "Status"
 msgstr "Durum"
 
-#: 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ür"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4668,114 +4774,82 @@ msgid "_Change Organizer"
 msgstr "O_rganizatörü Değiştir"
 
 #: 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şkalarını Davet Et..."
 
-#: calendar/gui/dialogs/recurrence-page.c:126
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:156
-#: calendar/gui/e-itip-control.c:603 calendar/gui/e-itip-control.c:623
-#: calendar/gui/e-itip-control.c:633
-msgid "st"
-msgstr "."
-
-#: calendar/gui/dialogs/recurrence-page.c:127
-#: calendar/gui/dialogs/recurrence-page.c:147
-#: calendar/gui/e-itip-control.c:604 calendar/gui/e-itip-control.c:624
-msgid "nd"
-msgstr "."
-
-#: calendar/gui/dialogs/recurrence-page.c:128
-#: calendar/gui/dialogs/recurrence-page.c:148
-#: calendar/gui/e-itip-control.c:605 calendar/gui/e-itip-control.c:625
-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
-#: calendar/gui/e-itip-control.c:606 calendar/gui/e-itip-control.c:607
-#: calendar/gui/e-itip-control.c:608 calendar/gui/e-itip-control.c:609
-#: calendar/gui/e-itip-control.c:610 calendar/gui/e-itip-control.c:611
-#: calendar/gui/e-itip-control.c:612 calendar/gui/e-itip-control.c:613
-#: calendar/gui/e-itip-control.c:614 calendar/gui/e-itip-control.c:615
-#: calendar/gui/e-itip-control.c:616 calendar/gui/e-itip-control.c:617
-#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:619
-#: calendar/gui/e-itip-control.c:620 calendar/gui/e-itip-control.c:621
-#: calendar/gui/e-itip-control.c:622 calendar/gui/e-itip-control.c:626
-#: calendar/gui/e-itip-control.c:627 calendar/gui/e-itip-control.c:628
-#: calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:630
-#: calendar/gui/e-itip-control.c:631 calendar/gui/e-itip-control.c:632
-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
+#, fuzzy
+msgid "This and Future Instances"
+msgstr "Wallis And Futuna Islands"
+
+#: calendar/gui/dialogs/recur-comp.c:77
+#, fuzzy
+msgid "All Instances"
+msgstr "Tüm _istasyonlar:"
+
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Bu randevuyu Evolution düzenleyemiyor."
 
-#: 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 "tarih"
 
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:977
 msgid "first"
 msgstr "birinci"
 
-#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr "ikinci"
 
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "third"
 msgstr "üçüncü"
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "fourth"
 msgstr "dördüncü"
 
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "last"
 msgstr "sonuncu"
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1004
 msgid "Other Date"
 msgstr "Başka Tarih"
 
-#: 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 " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1455
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr "tekrarlar"
 
@@ -4839,23 +4913,23 @@ msgstr "hafta"
 msgid "year(s)"
 msgstr "yıl"
 
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has been created. Send it?"
 msgstr "Toplantı bilgisi oluşturuldu. Gönderilsin mi?"
 
-#: 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 "Toplantı bilgisi değiştirildi. Güncel bir sürümü gönderilsin mi?"
 
-#: 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 "Görev bilgisi oluşturuldu. Gönderilsin mi?"
 
-#: 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 "Görev bilgisi değiştirildi. Güncel bir sürümü gönderilsin mi?"
 
-#: calendar/gui/dialogs/task-details-page.c:420
+#: calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr "Tamamlanma tarihi yanlış"
 
@@ -4869,44 +4943,38 @@ msgstr "Biten %"
 msgid "Date Completed:"
 msgstr "Tamamlama Tarihi:"
 
-#: 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:575 calendar/gui/e-meeting-model.c:876
-msgid "Needs Action"
-msgstr "İşlem Gerektiriyor"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "İşlem"
 
-#: 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 "Ö_ncelik:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Durum:"
 
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "Temel"
 
-#: 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 "Görevlendirme"
 
-#: calendar/gui/dialogs/task-page.c:540
+#: calendar/gui/dialogs/task-page.c:527
 msgid "Due date is wrong"
 msgstr "Bitiş tarihi hatalı"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1081
+#: 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:"
@@ -4916,125 +4984,233 @@ msgstr "Açıklama:"
 msgid "Sta_rt Date:"
 msgstr "_Başlangıç Tarihi:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Bağlantılar..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "_Tarihe Göre:"
 
-#: 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 hafta"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 hafta"
+
+#: 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 dakika"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 dakika"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d saniye"
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "1 saniye"
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "Bir e-posta gönder"
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr "Bilinmeyen eylem"
+
+#: calendar/gui/e-alarm-list.c:487
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "randevu başlangıcı"
+
+#: calendar/gui/e-alarm-list.c:490
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "randevu başlangıcı"
+
+#: calendar/gui/e-alarm-list.c:495
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
+msgstr "randevu başlangıcı"
+
+#: calendar/gui/e-alarm-list.c:504
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "Randevuyu sil"
+
+#: calendar/gui/e-alarm-list.c:507
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "randevu başlangıcı"
+
+#: calendar/gui/e-alarm-list.c:512
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr "randevu sonu"
+
+#: calendar/gui/e-alarm-list.c:536
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "%s sunucu %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: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 "Seçilen bağlantılar siliniyor"
 
-#: 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
 msgid "_Save as..."
 msgstr "_Farklı kaydet..."
 
-#: 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 "_Yazdır..."
 
-#: 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 "_Kes"
 
-#: 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 "_Kopyala"
 
-#: 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ıştır"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:962
 msgid "_Assign Task"
 msgstr "_Görev Ata"
 
-#: calendar/gui/e-calendar-table.c:1000
+#: calendar/gui/e-calendar-table.c:963
 msgid "_Forward as iCalendar"
 msgstr "i_Calendar Olarak Yönlendir"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "_Bitmiş Olarak İşaretle"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:965
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Görevleri _Bitmiş Olarak İşaretle"
 
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "_Seçilen Görevleri Sil"
 
-#: calendar/gui/e-calendar-table.c:1278 calendar/gui/e-day-view.c:7586
-#: calendar/gui/e-week-view.c:4241
+#: 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 "Öğeler güncelleniyor"
 
-#: calendar/gui/e-calendar-table.c:1361
+#: calendar/gui/e-calendar-table.c:1327
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Görev eklemek için tıklayın"
@@ -5043,8 +5219,8 @@ msgstr "Görev eklemek için tıklayın"
 msgid "Alarms"
 msgstr "Uyarılar"
 
-#: 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 "Tamamlandı"
 
@@ -5073,8 +5249,8 @@ msgid "Start Date"
 msgstr "Başlangıç Tarihi"
 
 #: 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 "Özet"
 
@@ -5082,19 +5258,15 @@ msgstr "Özet"
 msgid "Task sort"
 msgstr "Görev sıralama"
 
-#: 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 "%d/%m/%Y %A %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 "%d/%m/%Y %A %I:%M:%S %p"
 
@@ -5109,209 +5281,209 @@ 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 dakika bölmeleri"
 
 #. 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 "%d %B %A"
 
 #. 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 "öö"
 
 #. 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 "ös"
 
-#: calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "Yeni _Randevu"
 
-#: 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 "Y_eni Tüm Gün Olayı"
 
-#: 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 "Yeni Toplantı"
 
-#: 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 Görev"
 
-#: 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 "Yazdır..."
 
-#: 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üne Git"
 
-#: 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 "_Güne Git..."
 
-#: 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 "_Boş/Meşgul Bilgisini Yayınla"
 
-#: 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 "_Ayarlar..."
 
-#: 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 "_Farklı Kaydet..."
 
-#: 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 "Toplantı Zamanı Düzenle"
 
-#: 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 Olarak Yönlendir"
 
-#: 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 _Oluşumu Taşınabilir Yap"
 
-#: 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 Oluşumu 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 "_Tüm Oluşumları Sil"
 
-#: calendar/gui/e-itip-control.c:684
+#: calendar/gui/e-itip-control.c:704
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "_Basit tekrar"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:716
 msgid "Every day"
 msgstr "Her gün"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:718
 #, c-format
 msgid "Every %d days"
 msgstr "Her %d gün"
 
-#: calendar/gui/e-itip-control.c:704
+#: calendar/gui/e-itip-control.c:724
 msgid "Every week"
 msgstr "Her hafta"
 
-#: calendar/gui/e-itip-control.c:706
+#: calendar/gui/e-itip-control.c:726
 #, c-format
 msgid "Every %d weeks"
 msgstr "Her %d hafta"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:729
 #, fuzzy
 msgid "Every week on "
 msgstr "Evergreen"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:731
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d hafta"
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:739
 msgid " and "
 msgstr " ve "
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:746
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:759
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:744
+#: calendar/gui/e-itip-control.c:764
 msgid "every month"
 msgstr "her ay"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:769
 #, c-format
 msgid "every %d months"
 msgstr "her %d ayda"
 
-#: calendar/gui/e-itip-control.c:755
+#: calendar/gui/e-itip-control.c:775
 msgid "Every year"
 msgstr "Her yıl"
 
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every %d years"
 msgstr "Her %d yıl"
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:789
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
+#: calendar/gui/e-itip-control.c:797
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr "<b>Başlangıç:</b> "
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:831
 msgid "<b>Ends:</b> "
 msgstr "<b>Bitiş: </b>"
 
-#: calendar/gui/e-itip-control.c:831
+#: calendar/gui/e-itip-control.c:851
 msgid "<b>Completed:</b> "
 msgstr "<b>Tamamlanan:</b> "
 
-#: calendar/gui/e-itip-control.c:841
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:878 calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 msgid "iCalendar Information"
 msgstr "iCalendar Bilgisi"
 
 #. Title
-#: calendar/gui/e-itip-control.c:893
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr "iCalendar Hatası"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/e-itip-control.c:975
-#: calendar/gui/e-itip-control.c:986 calendar/gui/e-itip-control.c:1003
+#: 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 "Bilinmeyen kişi"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1010
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5319,337 +5491,338 @@ msgstr ""
 "<br> Lütfen bu bilgilerin doğruluğunu denetledikten sonra, aşağıdaki menüden "
 "bir işlem seçiniz."
 
-#: calendar/gui/e-itip-control.c:1025
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Hiçbiri</i>"
 
-#: calendar/gui/e-itip-control.c:1035
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "Konum: "
 
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr "Durum:"
 
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:877
-#: 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 "Onaylandı"
 
-#: calendar/gui/e-itip-control.c:1058 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"
 
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:878
-#: 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 "Reddedildi"
 
-#: calendar/gui/e-itip-control.c:1066 calendar/gui/e-itip-control.c:1272
-#: 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:835
-#: calendar/gui/e-meeting-model.c:851 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:901 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 "Bilinmiyor"
 
-#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
+#: 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 "Bir eylem seçin:"
 
-#: calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Güncelle"
 
-#: calendar/gui/e-itip-control.c:1121 calendar/gui/e-itip-control.c:1152
-#: calendar/gui/e-itip-control.c:1175 calendar/gui/e-itip-control.c:1188
+#: 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
-#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
+#: 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 "Tamam"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr "Onayla"
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1175
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Girişimli"
 
-#: calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Reddet"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Boş/Meşgul Bilgisi Gönder"
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Cevaplayan Bilgisini Güncelle"
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Güncel Bilgiyi Gönder"
 
-#: calendar/gui/e-itip-control.c:1213 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 "İptal"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>, toplantı bilgisi gönderdi."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Toplantı Bilgisi"
 
-#: calendar/gui/e-itip-control.c:1300
+#: 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 toplantıda olmanızı istiyor."
 
-#: calendar/gui/e-itip-control.c:1302
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> sizin toplantıda olmanızı istiyor."
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Toplantı Taslağı"
 
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> mevcut bir toplantıya ekleme yapmak istiyor"
 
-#: calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Toplantı Güncellemesi"
 
-#: calendar/gui/e-itip-control.c:1312
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> son toplantı bilgisini almak istiyor."
 
-#: calendar/gui/e-itip-control.c:1313
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "Toplantı Güncelleme Bilgisi İsteği"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> bir toplantı isteğine cevap verdi."
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Toplantı Yanıtı"
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> bir toplantıyı iptal etti."
 
-#: calendar/gui/e-itip-control.c:1329
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Toplantı İptali"
 
-#: calendar/gui/e-itip-control.c:1336 calendar/gui/e-itip-control.c:1403
-#: calendar/gui/e-itip-control.c:1438
+#: 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> hatalı bir mesaj gönderdi."
 
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Hatalı Toplantı İletisi"
 
-#: calendar/gui/e-itip-control.c:1361
+#: calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> görev bilgisi yayınladı."
 
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Görev Bilgisi"
 
-#: calendar/gui/e-itip-control.c:1367
+#: calendar/gui/e-itip-control.c:1393
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> bir görevi tamamlamanızı istiyor."
 
-#: calendar/gui/e-itip-control.c:1369
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> bir görevi tamamlamanızı istiyor."
 
-#: calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Görev Taslağı"
 
-#: calendar/gui/e-itip-control.c:1374
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> mevcut bir göreve eklenti yapmak istiyor."
 
-#: calendar/gui/e-itip-control.c:1375
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Görev Güncellemesi"
 
-#: calendar/gui/e-itip-control.c:1379
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> en güncel görev bilgisini almak istiyor."
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Güncel Görev Bilgisi İsteği"
 
-#: calendar/gui/e-itip-control.c:1387
+#: calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> bir görev tanımına cevap verdi."
 
-#: calendar/gui/e-itip-control.c:1388
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Görev Yanıtı"
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> bir görevi iptal etti."
 
-#: calendar/gui/e-itip-control.c:1396
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Görev İptali"
 
-#: calendar/gui/e-itip-control.c:1404
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Hatalı Görev İletisi"
 
-#: calendar/gui/e-itip-control.c:1423
+#: calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> boş/meşgul bilgisi gönderdi."
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Boş/Meşgul Bilgisi"
 
-#: calendar/gui/e-itip-control.c:1428
+#: calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> sizden boş/meşgul bilgisini almak istiyor."
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Boş/Meşgul İsteği"
 
-#: calendar/gui/e-itip-control.c:1433
+#: calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> bir boş/meşgul isteğine cevap verdi."
 
-#: calendar/gui/e-itip-control.c:1434
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Boş/Meşgul Cevabı"
 
-#: calendar/gui/e-itip-control.c:1439
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Hatalı Boş/Meşgul İletisi"
 
-#: calendar/gui/e-itip-control.c:1513
+#: calendar/gui/e-itip-control.c:1541
 msgid "The message does not appear to be properly formed"
 msgstr "Bu mesaj düzgün değil"
 
-#: calendar/gui/e-itip-control.c:1575
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "Bu iletide desteklenmeyen bilgiler var."
 
-#: calendar/gui/e-itip-control.c:1603 calendar/gui/e-itip-control.c:1609
+#: 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 "Bu eklenti geçerli bir takvim mesajını içermiyor."
 
-#: calendar/gui/e-itip-control.c:1634
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "Bu eklentide görüntülenebilir takvim öğeleri bulunmuyor"
 
-#: calendar/gui/e-itip-control.c:1856 calendar/gui/e-itip-control.c:1948
+#: 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:1859 calendar/gui/e-itip-control.c:1951
+#: 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:1862 calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:2005
 msgid "Object could not be found\n"
 msgstr "Öğe bulunamadı\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1916
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Bu takvimi güncellemek için yeterli izniniz yoktur\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Güncelleme tamamlandı\n"
 
-#: calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "Takvim dosyası güncellenemedi!\n"
 
-#: calendar/gui/e-itip-control.c:1900 calendar/gui/e-itip-control.c:1966
+#: 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 "Bu öğe yerinde bulunamadığı için katılımcı bilgileri güncellenemedi"
 
-#: calendar/gui/e-itip-control.c:1921
+#: 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:1933
+#: calendar/gui/e-itip-control.c:1984
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Katılımcı bilgileri geçersiz bir durum nedeniyle güncellenemedi!\n"
 
-#: calendar/gui/e-itip-control.c:1957
+#: 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:1960
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Katılımcı bilgileri güncellendi\n"
 
-#: calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "Katılımcı bilgileri güncellenemedi!\n"
 
-#: calendar/gui/e-itip-control.c:1998
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Bitiş Tamamlandı"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2079 calendar/gui/e-itip-control.c:2129
 msgid "Item sent!\n"
 msgstr "Öğe gönderildi!\n"
 
-#: calendar/gui/e-itip-control.c:2030 calendar/gui/e-itip-control.c:2082
+#: calendar/gui/e-itip-control.c:2081 calendar/gui/e-itip-control.c:2133
 msgid "The item could not be sent!\n"
 msgstr "Öğe gönderilemedi!\n"
 
-#: calendar/gui/e-itip-control.c:2155
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr "Takvim Dizinini Seçin"
 
-#: calendar/gui/e-itip-control.c:2162
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr "Görevler Dizinini Seçin"
 
@@ -5690,180 +5863,185 @@ msgstr "bitiş-tarihi"
 msgid "date-start"
 msgstr "başlangıç-tarihi"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr "Toplantıyı Yönetenler"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1764
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
 msgid "Required Participants"
 msgstr "Gerekli Katılımcılar"
 
-#: calendar/gui/e-meeting-model.c:86
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr "Seçimlik Katılımcılar"
 
-#: calendar/gui/e-meeting-model.c:87
+#: calendar/gui/e-meeting-model.c:83
 msgid "Resources"
 msgstr "Kaynaklar"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:565 calendar/gui/e-meeting-model.c:831
+#: 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 "Bireysel"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
+#: calendar/gui/e-meeting-model.c:807
 msgid "Group"
 msgstr "Grup"
 
-#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
+#: calendar/gui/e-meeting-model.c:808
 msgid "Resource"
 msgstr "Kaynak"
 
-#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
+#: calendar/gui/e-meeting-model.c:809
 msgid "Room"
 msgstr "Oda"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:847
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:822
 msgid "Chair"
 msgstr "Sandalye"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:567 calendar/gui/e-meeting-model.c:848
+#: 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 "Gerekli Katılımcı"
 
-#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:849
+#: 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 "Seçimlik Katılımcı"
 
-#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:850
+#: 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 "Katılmayan"
 
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:879 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 "İşlem Gerektiriyor"
+
+#: 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:880
+#: 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 "İşlemde"
 
 #. 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 "%d %B %A, %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 "%d %b %Y %a"
 
 #. 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 "Ofiste Değil"
 
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Bilgi Yok"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Seçenekler"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "_Sadece Çalışma Saatlerini Göster"
 
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "_Uzaklaştırılmış Göster"
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "_Boş/Meşgul Olanları Güncelle"
 
-#: 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 "_Otomatikman 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 "_Tüm Kişiler ve Kaynaklar"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Tüm _Kişiler ve Bir Kaynak"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "_Gerekli Kişiler"
 
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Gerekli Kişiler ve _Bir Kaynak"
 
-#: calendar/gui/e-meeting-time-sel.c:654
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Toplantı b_aşlama saati :"
 
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Toplantı _bitiş saati:"
 
-#: calendar/gui/e-tasks.c:358 calendar/gui/gnome-cal.c:2036
-#: calendar/gui/gnome-cal.c:2047
+#: 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 tarihinde görevler açılıyor"
 
-#: calendar/gui/e-tasks.c:387 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 içindeki görevler yüklenemedi."
 
-#: calendar/gui/e-tasks.c:402
+#: calendar/gui/e-tasks.c:401
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' yüklemek için gereken yöntem desteklenmiyor"
 
-#: calendar/gui/e-tasks.c:416 calendar/gui/gnome-cal.c:1561
+#: 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' dizini açılamadı."
 
-#: calendar/gui/e-tasks.c:484 calendar/gui/gnome-cal.c:1765
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -5872,11 +6050,11 @@ msgstr ""
 "'%s' sırasında hata:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:556
+#: calendar/gui/e-tasks.c:554
 msgid "Completing tasks..."
 msgstr "Görevler tamamlanıyor..."
 
-#: calendar/gui/e-tasks.c:579
+#: calendar/gui/e-tasks.c:577
 msgid "Deleting selected objects..."
 msgstr "Seçilen öğeler siliniyor..."
 
@@ -5885,26 +6063,26 @@ msgstr "Seçilen öğeler siliniyor..."
 msgid "Expunging"
 msgstr "Dizin siliniyor"
 
-#: calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Yeni _Randevu..."
 
-#: calendar/gui/gnome-cal.c:1533
+#: calendar/gui/gnome-cal.c:1503
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' dizini açılamadı."
 
-#: calendar/gui/gnome-cal.c:1547
+#: calendar/gui/gnome-cal.c:1517
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' açmak için gereken yöntem desteklenmiyor"
 
-#: calendar/gui/gnome-cal.c:1593
+#: calendar/gui/gnome-cal.c:1563
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "%s tarihinde Alarm"
 
-#: calendar/gui/gnome-cal.c:1786
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5912,7 +6090,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1791
+#: calendar/gui/gnome-cal.c:1764
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5920,12 +6098,12 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/gnome-cal.c:1995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s tarihinde takvim açılıyor"
 
-#: calendar/gui/gnome-cal.c:2058
+#: calendar/gui/gnome-cal.c:2035
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "%s dizini açılıyor"
@@ -5986,313 +6164,174 @@ msgstr "Ekim"
 msgid "September"
 msgstr "Eylül"
 
-#: 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 "Bir düzenleyen kişi olmak zorunda."
 
-#: calendar/gui/itip-utils.c:383
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "En az bir katılımcı olmak zorunda"
 
-#: 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 "Olay bilgisi"
 
-#: 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 "Görev bilgisi"
 
-#: 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 "Seçimlik Bilgi"
 
-#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:595
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 msgid "Free/Busy information"
 msgstr "Boş/Meşgul bilgisi"
 
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Takvim bilgisi"
 
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr "Güncellendi"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr "Tazele"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:589
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Boş/Meşgul bilgisi (%s -> %s)"
 
-#: calendar/gui/itip-utils.c:601
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "iCalendar bilgisi"
 
-#: calendar/gui/itip-utils.c:759
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Bu olayda bir katılımcı olarak görünmeniz gerekiyor."
 
-#: calendar/gui/main.c:70
-msgid "Could not activate Bonobo"
-msgstr "Bonobo başlatılamadı"
-
-#: calendar/gui/main.c:99
-msgid "Could not create the component editor factory"
-msgstr "Bileşen düzenleyici mimarisi oluşturulamadı."
-
-#: 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 "8."
-
-#: 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 "39."
-
-#: calendar/gui/print.c:462
-msgid "31st"
-msgstr "31."
-
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr "Pz"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "Pt"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "Sa"
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "Ça"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "Pe"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "Cu"
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "Ct"
 
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Seçili gün (%d %b %a %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 "%d %b %a"
 
-#: calendar/gui/print.c:1889
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr "%d %a %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 "%d %b %a %Y"
 
-#: calendar/gui/print.c:1900
+#: calendar/gui/print.c:1922
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Seçili hafta (%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 yıl (%Y)"
 
-#: calendar/gui/print.c:2249
+#: calendar/gui/print.c:2267
 msgid "Task"
 msgstr "Görev"
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr "Durum: %s"
 
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Öncelik: %s"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2358
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Biten Yüzde: %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 "Kategoriler: %s"
 
-#: calendar/gui/print.c:2375
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr "Bağlantılar: "
 
-#: calendar/gui/print.c:2430
-msgid "Print Calendar"
-msgstr "Takvimi Yazdır"
-
-#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3216
-#: 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 "Önizlemeyi Yazdır"
 
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "Öğeyi Yazdır"
 
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "Yazdırma Ayarları"
 
-#: calendar/gui/tasks-control-factory.c:75
-msgid "Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr "Takvim görünümü yaratılamadı. ORBit ve OAF kurulumunu gözden geçirin."
-
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr "Gösterilecek görevler dizininin URI'si"
 
-#: 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"
@@ -6300,88 +6339,51 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2696
-#: mail/mail-callbacks.c:2938
+#: calendar/gui/tasks-control.c:479
 msgid "Do not ask me again."
 msgstr "Tekrar sorma."
 
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:615
 msgid "Print Tasks"
 msgstr "Yazdırma Görevleri"
 
-#: 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 takvim dizininde bulunan tüm görevleri görevler dizinine aktardı."
-
-#: 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 takvim dizininde bulunan görevleri yeni görevler dizinine "
-"göndermeyi denedi, ancak bazı görevler taşınamadı. Bu işlemi daha sonra "
-"tekrar deneyiniz."
-
-#: 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' açılamadı. Takvim dizininden görevler dizinine gönderilecek öğe "
-"bulunmuyor."
-
-#: 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üklemek için gereken yöntem desteklemiyor."
-
-#: 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 "PPSÇPCCP"
 
-#: 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 dosyalarını Evolution'a aktarım mimarisi."
+msgid "Evolution Calendar intelligent importer"
+msgstr "Evolution takvimi iTip/iMip görüntüleyici"
 
-#: 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 dosyalarını Evolution'a aktarır."
+msgid "Evolution iCalendar importer"
+msgstr "Evolution takvimi iTip/iMip görüntüleyici"
 
-#: 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 dosyalarını Evolution'a aktarır."
+msgid "Evolution vCalendar importer"
+msgstr "Evolution takvimi iTip/iMip görüntüleyici"
 
-#: calendar/importers/icalendar-importer.c:168
-#, fuzzy, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr ""
-"%s iletisi %s dizininden alınamadı\n"
-"  %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Takvim İletisi"
 
-#: 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 "Hatırlatıcı!!"
 
-#: calendar/importers/icalendar-importer.c:697
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "Takvim Olayları"
 
-#: calendar/importers/icalendar-importer.c:722
+#: calendar/importers/icalendar-importer.c:663
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6390,10 +6392,14 @@ msgstr ""
 "Evolution, Pine e-posta dosyaları buldu.\n"
 "Bunların Evolution'a aktarılmasını istiyor musunuz?"
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr "Gnome Takvimi"
 
+#: 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 hiç argüman istemiyor"
@@ -8039,27 +8045,37 @@ msgstr "Pacific/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: camel/camel-cipher-context.c:170
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr "Bu şifreleme ile imza desteklenmiyor"
 
-#: camel/camel-cipher-context.c:210
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr "Bu şifreleme ile onaylama desteklenmiyor"
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr "Bu şifre ile şifreleme desteklenmiyor"
 
-#: camel/camel-cipher-context.c:296
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr "Bu şifreleme ile geriye dönük şifreleme desteklenmiyor"
 
-#: camel/camel-data-cache.c:169
+#: camel/camel-cipher-context.c:342
+#, fuzzy
+msgid "You may not import keys with this cipher"
+msgstr "Bu şifreleme ile geriye dönük şifreleme desteklenmiyor"
+
+#: camel/camel-cipher-context.c:374
+#, fuzzy
+msgid "You may not export keys with this cipher"
+msgstr "Bu şifreleme ile geriye dönük şifreleme desteklenmiyor"
+
+#: 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
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr ""
@@ -8096,87 +8112,94 @@ msgstr "'%s' dizinine kaydediliyor"
 msgid "You must be working online to complete this operation"
 msgstr "Bu işlemi bitirmek için İnternet bağlantısı sağlamalı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 iletisi önbelleğe yazılamadı: %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 iletisi önbelleğe yazılamadı: %s"
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "%s adrsinden karşılama mesajı alınamadı: %s"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Dizinler eşzamanlı hale getiriliyor"
 
-#: 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 filtresini ayrıştırırken hata oldu: %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 filtresini çalıştırırken hata oldu: %s"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Spool dizini açılamadı"
 
-#: camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Spool dizini işlenemedi"
 
-#: camel/camel-filter-driver.c:966
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) iletisi alınıyor"
 
-#: camel/camel-filter-driver.c:970
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "İleti açılamadı"
 
-#: 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 iletisinde hata"
 
-#: 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 "Dizin eşzamanlı hale getiriliyor"
 
-#: camel/camel-filter-driver.c:1058
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d ileti alınıyor"
 
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d/%d iletisinde hata"
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "İletinin açılmasında hata."
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Geçersiz argümanlar"
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Geçersiz argümanlar"
 
-#: camel/camel-filter-search.c:514
-#, fuzzy, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "%s iletisi önbelleğe yazılamadı: %s"
-
-#: camel/camel-filter-search.c:550
-#, fuzzy, c-format
-msgid "Failed to create child process '%s': %s"
-msgstr "%s iletisi önbelleğe yazılamadı: %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 filtre taramasını çalıştırırken hata oldu: %s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8185,7 +8208,7 @@ msgstr ""
 "Arama deyimi ayrıştırılamadı: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8194,11 +8217,11 @@ msgstr ""
 "Arama deyimi çalıştırılamadı: %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 "(hepsini-eşle) boolean sonuç içermelidir"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Bilinmeyen başlık üzerinde arama yapılıyor: %s"
@@ -8227,7 +8250,7 @@ msgstr "İletiler taşınıyor"
 msgid "Copying messages"
 msgstr "İletiler %s'e kopyalanıyor"
 
-#: camel/camel-gpg-context.c:697
+#: camel/camel-gpg-context.c:724
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8235,71 +8258,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 "İptal 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 sunucusundan beklenmeyen cevap: %s"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:814
 #, fuzzy
 msgid "No data provided"
 msgstr "Dosya adı belirtilmedi."
 
-#: 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 "%s iletisi önbelleğe yazılamadı: %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 iletisi önbelleğe yazılamadı: %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 iletisi önbelleğe yazılamadı: %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
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "İletinin açılmasında hata."
 
-#: 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 ""
@@ -8324,25 +8348,24 @@ msgstr ""
 msgid "Could not lock '%s'"
 msgstr "%s kilitlenemedi"
 
-#. 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 için kilitleme dosyası oluşturulamadı: %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 dosyasının kilidinin açılmasını beklerken zaman aşımı. Daha sonra yeniden "
 "deneyiniz."
 
-#: camel/camel-lock.c:206
+#: camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2) kullanılırken kilitleme hatası: %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) kullanılırken kilitleme hatası: %s"
@@ -8352,51 +8375,51 @@ msgstr "flock(2) kullanılırken kilitleme hatası: %s"
 msgid "Could not check mail file %s: %s"
 msgstr "E-posta dosyası %s denetlenemedi: %s"
 
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "E-posta dosyası %s açılamadı: %s"
 
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Geçici e-posta dosyası %s açılamadı: %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 geçici mektup dosyasını oluştururken hata: %s"
 
-#: camel/camel-movemail.c:188
+#: camel/camel-movemail.c:187
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Boru yaratılamadı: %s"
 
-#: camel/camel-movemail.c:200
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Çatallama yapılamadı: %s"
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:237
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail programında hata: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 msgid "(Unknown error)"
 msgstr "(Bilinmeyen hata)"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "%s posta dosyasını okurken hata oluştu"
 
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Geçici mektup dosyasına yazarken hata: %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 "Geçici mektup dosyasına yazarken hata: %s"
@@ -8413,25 +8436,25 @@ 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 "ayrıştırma hatası"
 
-#: 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üklenemedi: Bu sistemde modül yükleneme desteklenmiyor."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:141
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s yüklenemedi: %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üklenemedi: Modülde başlangıç kodu bulunamadı"
@@ -8485,49 +8508,126 @@ msgid ""
 "the server supports it."
 msgstr "Bu seçenek sunucuya güvenli CRAM-MD5 sistemi ile bağlantı kuracaktı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."
-msgstr "Bu seçenek sunucuya güvenli DIGEST-MD5 sistemi ile bağlantı kuracaktır. "
+msgstr ""
+"Bu seçenek sunucuya güvenli DIGEST-MD5 sistemi ile bağlantı kuracaktır. "
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Sunucu cevabı çok uzun (>2048 bayt)\n"
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr "Sunucudan hatalı cevap\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 "Sunucudan hatalı \"Quality of Protection\" anahtarı geldi\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 "Sunucu cevabı kimlik denetim bilgisi içermiyor\n"
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Sunucu cevabı yetersiz kimlik denetim bilgisis içeriyor\n"
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr "Sunucu cevabı uyuşmuyor\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çenek sunucuya Kerberos 4 kimlik denetimi ile bağlanacaktır."
+
+#: 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 "Sunucudan hatalı kimlik sınama yanıtı."
+
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "%s iletisi önbelleğe yazılamadı: %s"
+
+#: camel/camel-sasl-gssapi.c:299
+#, fuzzy
+msgid "Unsupported security layer."
+msgstr "Desteklenmeyen tür"
+
+#: 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çenek sunucuya Kerberos 4 kimlik denetimi ile bağlanacaktır."
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -8536,11 +8636,6 @@ msgstr ""
 "Kerberos bileti alınamadı:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1059
-msgid "Bad authentication response from server."
-msgstr "Sunucudan hatalı kimlik sınama yanıtı."
-
 #: camel/camel-sasl-login.c:32
 msgid "Login"
 msgstr "Giriş"
@@ -8574,7 +8669,8 @@ msgstr "SMTP öncesi POP"
 
 #: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "Bu özellik, SMTP bağlantısı yaratmadan önce bir POP bağlantısı kuracaktır"
+msgstr ""
+"Bu özellik, SMTP bağlantısı yaratmadan önce bir POP bağlantısı kuracaktır"
 
 #: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Source URI"
@@ -8588,7 +8684,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 "Düzgün deyim derleme işlemi başarısız: %s: %s"
@@ -8608,35 +8704,35 @@ msgstr "'%s' URL'inde makine adı bilgisi bulunmuyor"
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URL'inde dizin bilgisi bulunmuyor"
 
-#: camel/camel-service.c:743
+#: camel/camel-service.c:741
 #, c-format
 msgid "Resolving: %s"
 msgstr "Çözümleniyor: %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 "İsim çözümlemesinde hata: %s"
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Makine adı çözümlemesinde hata: %s: Makine bulunamadı"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Makine adı çözümlemesinde hata: %s: bilinmeyen hata"
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 msgid "Resolving address"
 msgstr "Adres çözümleniyor"
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 msgid "Host lookup failed: host not found"
 msgstr "Makine adı çözümlemesinde hata: Makine bulunamadı"
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 msgid "Host lookup failed: unknown reason"
 msgstr "Makine adı çözümlemesinde hata: Bilinmeyen hata"
 
@@ -8648,12 +8744,12 @@ msgstr "Sanal dizin e-posta sağlayıcısı"
 msgid "For reading mail as a query of another set of folders"
 msgstr "diğer bir dizin listesinden alınan iletileri okumak için"
 
-#: 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' protokolü için alıcı yok"
 
-#: camel/camel-session.c:545
+#: camel/camel-session.c:548
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8662,176 +8758,176 @@ msgstr ""
 "%s dizini yaratılamadı:\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 için parolanızı 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 ""
 
-#: 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\" için imza sertifikası bulunmuyor."
 
-#: 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\" için şifreleme sertifikası bulunmuyor."
 
-#: 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\" için sertifika bulunamadı."
 
-#: 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 "İletinin açılmasında hata."
 
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
 msgid "Failed to verify certificates."
 msgstr "Sertifika denetlenemedi."
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Dizin alınamadı: Gerçersiz"
 
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Dizin oluşturulamadı: Geçersiz işlem"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 #, fuzzy
 msgid "Unable to get issuer's certificate"
 msgstr "Sertifika denetlenemedi."
 
-#: 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 "Sertifika denetlenemedi."
 
-#: 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 "İmza dosyası kaydedilemedi."
 
-#: 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 "Sertifika geçersiz"
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr "Sertifikanın süresi dolmuş"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr "CRL geçersiz"
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr "CRL'in süresi dolmuş"
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 msgid "Error in CRL"
 msgstr "CRL'de hata"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 msgid "Out of memory"
 msgstr "Bellek yetersiz"
 
-#: 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 "Sertifika denetlenemedi."
 
-#: 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 "_Sertifika No:"
 
-#: 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 "Geçersiz argüman"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 #, fuzzy
 msgid "Certificate untrusted"
 msgstr "_Sertifika No:"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 #, fuzzy
 msgid "Certificate rejected"
 msgstr "_Sertifika No:"
 
-#: 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:805
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8840,15 +8936,15 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:811
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr "UYGUN"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:811
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr "HATALI"
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8868,7 +8964,7 @@ msgstr ""
 "Yine de kabul etmek istiyor musunuz?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:815
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8883,7 +8979,7 @@ msgstr ""
 "\n"
 "Yine de kabul etmek istiyor musunuz?"
 
-#: camel/camel-tcp-stream-ssl.c:859
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -8892,28 +8988,28 @@ msgstr ""
 "Sertifika hatalı:%s\n"
 "Veren: %s"
 
-#: camel/camel-tcp-stream-ssl.c:911
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:929
+#: camel/camel-tcp-stream-ssl.c:947
 #, fuzzy, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr "_Sertifika No:"
 
-#: camel/camel-tcp-stream-ssl.c:946
+#: camel/camel-tcp-stream-ssl.c:964
 #, fuzzy, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr "_Sertifika No:"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL açılamadı: %s"
@@ -8928,40 +9024,40 @@ msgstr "%s başlatırken hata oluştu"
 msgid "No such message %s in %s"
 msgstr "Bu isimle bir ileti yok: %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 "Yeni iletileri tüm dizinlerde denetle"
 
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "%s dizini silinemedi. Geçersiz işlem"
 
-#: camel/camel-vee-store.c:319
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "%s dizini silinemedi: Böyle bir dizin yok"
 
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "%s dizininin adı değiştirilemedi: Geçersiz işlem"
 
-#: camel/camel-vee-store.c:340
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "%s dizininin adı değiştirilemedi: Bu isimde bir dizin yok"
 
 #: 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:2656
+#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr "İşlem iptal edildi"
 
 #: 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 "Sunucu beklenmedik bir şekilde bağlantıyı kesti: %s"
@@ -8984,52 +9080,52 @@ msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP komutu başarısız oldu: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:463
 msgid "Server response ended too soon."
 msgstr "Sunucu cevabı çok erken bitti."
 
-#: 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 sunucu cevabı %s bilgisini içermiyor"
 
-#: 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 sunucudan beklenmeyen cevap: %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 dizini yaratılamadı: %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 için özet bilgisi yüklenemedi"
 
-#: 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 "Sunucudaki dizin silindi ve yeniden oluşturuldu."
 
 #. 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 "Değiştirilen iletiler taranıyor"
 
-#: 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 numaralı ileti alınıyor"
 
-#: 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"
@@ -9038,24 +9134,24 @@ msgstr ""
 "İleti alınamadı: %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 "İleti bulunmuyor"
 
-#: 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 ileti kullanılabilir değil"
 
-#: 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 iletilerdeki özet bilgiler alınıyor"
 
-#: 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 cevabında ileti gövdesi bulunamadı"
 
@@ -9085,7 +9181,7 @@ msgstr "Yeni iletiler denetleniyor"
 msgid "Check for new messages in all folders"
 msgstr "Yeni iletileri tüm dizinlerde denetle"
 
-#: 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 "Dizinler"
 
@@ -9115,7 +9211,7 @@ msgstr "IMAP sunucuları ileti alma ve göndermede kullanmak için"
 
 #: 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:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr "Parola"
 
@@ -9135,62 +9231,61 @@ msgstr "IMAP sunucu %s"
 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 "Bağlantı iptal 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 adresine bağlantı kurulamadı (%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 sunucusuyla bağlantı kurulamadı.\n"
 "Parola iletiminde hata: %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 "İşlem desteklenmiyor"
 
-#: 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 "Kimlik denetimi başarısız."
 
-#: 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 sunucusu %s kimlik sınama yöntemini desteklemiyor"
 
-#: 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 kimlik sınama yöntemi desteklenmiyor"
 
-#: 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ütfen %s@%s için IMAP parolasını giriniz"
 
-#: 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 "Bir parola girmediniz."
 
-#: 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"
@@ -9201,23 +9296,24 @@ 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 "Bu isimde bir dizin yok: `%s'"
 
-#: camel/providers/imap/camel-imap-store.c:1848
+#: camel/providers/imap/camel-imap-store.c:1839
 #, fuzzy, c-format
-msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Dizin içinde yeni satır karakteri bulunamaz."
 
-#: camel/providers/imap/camel-imap-store.c:1860
+#: camel/providers/imap/camel-imap-store.c:1851
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Bilinmeyen hata: %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 "Ana dizin üzerinde alt dizin açılamaz"
 
@@ -9261,7 +9357,8 @@ msgstr "Yerel aktarım"
 msgid ""
 "For retrieving (moving) local mail from standard mbox formated spools into "
 "folders managed by Evolution."
-msgstr "Standart UNIX posta kutularından ileti alma ve göndermede kullanmak için"
+msgstr ""
+"Standart UNIX posta kutularından ileti alma ve göndermede kullanmak için"
 
 #: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
@@ -9291,11 +9388,12 @@ msgstr "Standart UNIX posta kutusu dosyası"
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
-msgstr "Standart UNIX posta kutularından ileti alma ve göndermede kullanmak için"
+msgstr ""
+"Standart UNIX posta kutularından ileti alma ve göndermede kullanmak için"
 
 #: 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 saklama dizininde hata"
@@ -9307,36 +9405,36 @@ msgstr "%s saklama dizini geçersiz"
 
 #: 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 dizini alınamadı: %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 "Yerel disklerde gelen dizini bulunmasın"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "Yerel mektup dosyası %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 dizininin adı %s olarak değiştirilemedi: %s"
 
-#: camel/providers/local/camel-local-store.c:363
+#: camel/providers/local/camel-local-store.c:365
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' adı değiştirilemedi: %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' dizin özet dosyası silinemedi: %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' dizin indeks dosyası silinemedi: %s"
@@ -9346,7 +9444,7 @@ msgstr "`%s' dizin indeks dosyası silinemedi: %s"
 msgid "Could not save summary: %s: %s"
 msgstr "Özet kaydedilemedi: %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 "İleti özete eklenemedi: bilinmeyen neden"
 
@@ -9360,14 +9458,14 @@ msgstr "İleti aktarımı iptal edildi"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "%s dizinine ileti eklenemedi: %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 "Geçersiz ileti içeriği"
 
 #: 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"
@@ -9379,14 +9477,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 dizini bulunamadı."
 
 #: 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"
@@ -9401,71 +9499,71 @@ msgid "`%s' is not a maildir directory."
 msgstr "`%s' bir maildir dizini."
 
 #: 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' dizini silinemedi: %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:169
 msgid "not a maildir directory"
 msgstr "maildir dizini değil"
 
 #: 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 dizini taranamadı: %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 "Maildir dizini açılamadı: %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 iletiler denetleniyor"
 
-#: camel/providers/local/camel-maildir-summary.c:640
+#: camel/providers/local/camel-maildir-summary.c:644
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Yeni iletiler taranıyor"
 
-#: 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' dizinine kaydediliyor"
 
-#: 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 üzerinde dizin kilitlemesi yaratılamadı: %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 "%s posta kutusu açılamadı: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr "İleti aktarımı iptal 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 "İleti mbox dosyasına eklenemedi (%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"
@@ -9474,11 +9572,11 @@ msgstr ""
 "%s iletisi %s dizininden alınamadı\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 "Dizin onarılamayacak şekilde bozulmuş."
 
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "İletiler düzenlenemiyor: İleti kutusu bozulmuş olabilir."
 
@@ -9521,75 +9619,75 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' dizini boş değil. Silinmedi."
 
-#: 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 "Dizin açılamadı: `%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 yakınında e-posta ayrıştırma hatası (dizin: %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 dizini alınamadı: %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 dosyası açılamadı: %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 "Geçici posta kutusu açılamadı: %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 "Kaynak dizin %s açılamadı: %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 "geçici dizin kapatılamadı: %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 "Dizinin adı değiştirilemedi: %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 "Özet ve dizin uyuşmazlığı"
 
-#: 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 "Bilinmeyen hata: %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 "Dizinin adı değiştirilemedi: %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 "Geçici posta kutusuna yazma hatası: %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 "Geçici dosya kutusuna yazma işlemi başarısız: %s: %s"
@@ -9609,67 +9707,67 @@ msgstr "İleti mh dizinine eklenemedi: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' bir dizin değil."
 
-#: 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 dizin yolu açılamadı: %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 ""
 
-#: 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 saklama dizini geçersiz"
 
-#: 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 "%s dizini bulunamadı."
 
-#: 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 "`%s' bir posta kutusu dosyası değil."
 
-#: 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 "Yerel mektup dosyası %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 "'%s' dizinine kaydediliyor"
 
-#: 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 "Geçici e-posta dosyası %s açılamadı: %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 "'%s dizini taranamadı: %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 ""
@@ -9748,42 +9846,42 @@ msgid "Retrieving POP summary"
 msgstr "POP özeti alınıyor"
 
 #: 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 "Kullanıcı işlemi iptal etti"
 
-#: 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 "POP özeti alınamadı: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:306
+#: camel/providers/pop3/camel-pop3-folder.c:308
 msgid "Expunging deleted messages"
 msgstr "Silinen iletiler çöpe gönderiliyor"
 
-#: 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 kullanıcı numarasıyla ileti yok"
 
 #. 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 iletisi alınıyor"
 
-#: 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 "%s. ileti alınamadı: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
 msgid "Unknown reason"
 msgstr "Bilinmeyen hata"
 
@@ -9800,7 +9898,7 @@ msgstr "İletileri sunucuda bırak"
 msgid "Delete after %s day(s)"
 msgstr "%s günden sonra sil"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr "POP"
 
@@ -9821,27 +9919,28 @@ 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."
-msgstr "Bu seçenek POP sunucuya şifreli APOP protokolünü kullanarak bağlantı kurar."
+msgstr ""
+"Bu seçenek POP sunucuya şifreli APOP protokolünü kullanarak bağlantı kurar."
 
-#: 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 "%s POP sunucusuna bağlantı kurulamadı (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 ""
 
-#: 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 üzerindeki POP sunucusuna bağlantı kurulamadı."
 
-#: 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 "
@@ -9850,28 +9949,28 @@ msgstr ""
 "POP sunucusuyla bağlantı kurulamadı.\n"
 "Belirtilen kimlik sınama protokolü desteklenmiyor."
 
-#: 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 "%s POP sunucusuyla kimlik denetimi başarısız oldu: %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ütfen %s@%s için POP3 parolasını 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"
@@ -9880,13 +9979,13 @@ msgstr ""
 "POP sunucusuyla bağlantı kurulamadı.\n"
 "Parola iletiminde hata: %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 "Bu isimde bir dizin yok: `%s'"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9896,50 +9995,50 @@ msgid ""
 "system."
 msgstr "Yerel sistemdeki sendmail programının iletilerinizi göndermesi için."
 
-#: 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 açılamadı: %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 ile bağlantı kurulamadı: %s: ileti gönderilemedi"
 
-#: 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 çalıştırılamadı: %s: ileti gönderilemedi"
 
-#: 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 "İleti gönderilemedi: %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 sinyali ile kapandı: ileti gönderilemedi."
 
-#: 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 çalıştırılamadı: ileti gönderilemedi."
 
-#: 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 durumu ile çıktı: ileti gönderilemedi."
 
-#: 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 üzerinden ileti gönderimi"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9947,135 +10046,135 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "SMTP üzerinden bir sunucuya bağlanıp iletilerinizi göndermek için.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr "İmla hatası, bilinmeyen komut"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr "Parametre ya da argümanlarda imla hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr "Komut henüz tanınmıyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr "Komut parametresi henüz tanınmıyor"
 
-#: 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 durumu, ya da sistem yardım yanıtı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr "Yardım mesajı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr "Servis hazır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr "Servis iletişim kanalını kapatıyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr "Servis uygun değil, iletişim kanalı kapatılıyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr "İstenen ileti işlemi tamamlandı"
 
-#: 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 "Kullanıcı yerel değil, <forward-path> üzerine yönlendirilecek"
 
-#: 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 "İstenen ileti eylemi yapılmadı: posta kutusu bulunamadı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "İstenen eylem yapılmadı: posta kutusu bulunamadı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr "İstenen eylem iptal edildi: işlem sırasında hata"
 
-#: 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 "Kullanıcı yerel değil; lütfen <forward-path> deneyin"
 
-#: 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 "İstenen eylem yapılmadı: disk alanı yetersiz"
 
-#: 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 "İstenen eylem iptal edildi: disk alanı yetersiz"
 
-#: 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 "İstenen eylem yapılmadı: e-posta kutusu izni yok"
 
-#: 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 "İleti başlangıcını girin, <CRLF>.<CRLF> ile bitirin."
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr "İletişim kurulamadı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr "Parola iletimi gerekiyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr "Kimlik sınama yöntemi çok zayıf"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr "İstenen kimlik sınama yöntemi için şifreleme gerekiyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr "Geçici kimlik denetim hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "Kimlik denetimi isteniyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 msgid "Welcome response error"
 msgstr "Karşılama cevabı hatası"
 
-#: 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 "%s SMTP sunucusuna güvenli kipte bağlantı kurulamadı: %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 "Sunucu SSL desteklemiyor"
 
-#: 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 "START TLS isteği zaman aşımına uğradı: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 msgid "STARTTLS response error"
 msgstr "STARTTLS cevap hatası"
 
-#: 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 IMAP sunucusu %s kimlik sınama yöntemini desteklemiyor"
 
-#: 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ütfen %s@%s için SMTP parolasını giriniz"
@@ -10105,7 +10204,7 @@ msgstr "%s üzerinden STMP ileti gönderimi"
 msgid "Cannot send message: sender address not valid."
 msgstr "İleti gönderilemiyor: gönderen adresi geçersiz"
 
-#: 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 "İleti gönderiliyor"
 
@@ -10118,61 +10217,61 @@ msgstr "MAIL FROM cevap hatası: %s: ileti gönderilmedi"
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "MAIL FROM cevap hatası: %s: ileti gönderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr "SMTP Karşı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 isteği zaman aşımına uğradı: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "HELO response error"
 msgstr "HELO cevap hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr "SMTP Kimlik Denetimi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr "SASL kimlik denetim nesnesi yaratılamadı."
 
-#: 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 isteği zaman aşımına uğradı: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr "AUTH isteği başarısız."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr "Sunucudan hatalı kimlik sınama yanıtı.\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 zaman aşımı: %s: ileti gönderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM cevap hatası"
 
-#: 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 zaman aşımı: %s: ileti gönderilmedi"
 
-#: 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> başarısız oldu"
 
-#: 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 isteği zaman aşımına uğradı: %s: ileti gönderilmedi"
@@ -10180,77 +10279,77 @@ msgstr "DATA isteği zaman aşımına uğradı: %s: ileti gönderilmedi"
 #. 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 cevap hatası"
 
-#: 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önderimi zaman aşımına uğradı: %s: ileti gönderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 msgid "DATA termination response error"
 msgstr "DATA cevap hatası"
 
-#: 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 isteği zaman aşımına uğradı: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 msgid "RSET response error"
 msgstr "RSET cevap hatası"
 
-#: 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 isteğinde zaman aşımı: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 msgid "QUIT response error"
 msgstr "QUIT cevap hatası"
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:102
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:113
+#: 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:371 mail/mail-display.c:227
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr "ek"
 
-#: 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 dosyaları ekler listesinden sil"
 
-#: composer/e-msg-composer-attachment-bar.c:551
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Dosya ekle..."
 
-#: composer/e-msg-composer-attachment-bar.c:552
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "İletiyi bir dosya ekle"
 
-#: 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 dosyası eklenemedi: %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 dosyası eklenemedi: Normal bir dosya değil."
@@ -10268,11 +10367,15 @@ msgid "MIME type:"
 msgstr "MIME türü:"
 
 #: 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 "Eklentinin otomatik gösterimini öner"
 
-#: 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 "Adres defteri için buraya tıklayın"
 
@@ -10283,45 +10386,45 @@ msgstr "Adres defteri için buraya tıklayın"
 #. * 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 "Cevapla:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:411
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Gönderen:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Konu:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Alıcı:"
 
-#: composer/e-msg-composer-hdrs.c:432
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "İletinin gönderildiği kişiler"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Bilgi:"
 
-#: 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 "İletinin kopyasının gönderilecek olunduğu adresler"
 
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Gizli:"
 
-#: 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."
@@ -10332,26 +10435,27 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:447
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "Git"
 
-#: composer/e-msg-composer-hdrs.c:449
+#: composer/e-msg-composer-hdrs.c:549
 #, fuzzy
 msgid "Posting destination"
 msgstr "Açıklama yok"
 
-#: composer/e-msg-composer-select-file.c:275
-#: ui/evolution-message-composer.h:26 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 dosya ekle"
 
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:533
 msgid "Could not create a PGP signature context"
 msgstr "PGP imza içeriği yaratılamadı"
 
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10360,35 +10464,31 @@ msgstr ""
 "%s dosyasını yüklerken hata oldu:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1160
-msgid "Warning!"
-msgstr "Uyarı!"
-
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Dosya var. Üzerine yazılsın mı?"
 
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "%s dosyasını kaydederken hata oldu"
 
-#: composer/e-msg-composer.c:1207
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "`%s' dosyasını yüklerken hata oldu"
 
-#: composer/e-msg-composer.c:1240
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Dosyaya erişirken hata oldu: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1262
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "%s üzerindeki POP sunucusundan iletiler alınamadı: "
 
-#: composer/e-msg-composer.c:1255
+#: composer/e-msg-composer.c:1269
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10397,7 +10497,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1276
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10406,7 +10506,16 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %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 ""
+"Çıkış dosyası yaratılamadı: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1294
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10415,7 +10524,7 @@ msgstr ""
 "İletilerin kaydında hata: %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?"
@@ -10423,7 +10532,7 @@ msgstr ""
 "Evolution, önceki oturumlardan kaydedilmemiş dosyalar saptadı.\n"
 "Bunları kurtarmak istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1525
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10433,33 +10542,38 @@ msgstr ""
 "Bu ileti gönderilmedi.\n"
 "Değişiklikleri kaydetmek istiyor musunuz?"
 
-#: 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 "Uyarı: İleti Değiştirildi"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Dosyayı aç"
 
-#: composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:2015
 msgid "Signature:"
 msgstr "İmza:"
 
-#: 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 ileti 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."
 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"
@@ -10467,7 +10581,7 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:2879
+#: composer/e-msg-composer.c:2991
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10476,26 +10590,13 @@ msgstr ""
 "E-posta düzenleme penceresi açılmadı, çünkü adınızı ve\n"
 "e-posta bilgilerinizi girmediniz."
 
-#: composer/e-msg-composer.c:3860
+#: composer/e-msg-composer.c:4005
 #, fuzzy
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr "<b>(Burada düzenlenmesi mümkün olmayan bir bilgi vardır.)<b>"
 
-#: composer/evolution-composer.c:394
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-"E-posta düzenleme penceresi açılmadı, çünkü adınızı ve\n"
-"e-posta bilgilerinizi girmediniz."
-
-#: composer/evolution-composer.c:413
-#, fuzzy
-msgid "Cannot initialize the Evolution composer."
-msgstr "Evolution posta programı açılamadı."
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Evolution kitlesel işlemler uygulaması"
@@ -10544,11 +10645,111 @@ msgstr "Konu içerir"
 msgid "Subject does not contain"
 msgstr "Konu içermez"
 
-#: e-util/e-component-listener.c:131
-msgid "ping_timeout_callback: could not determine if the CORBA object is nil or not"
+#: 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 "Ofiste Değil"
+
+#: designs/OOA/ooa.glade.h:5
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Başlangıç:</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 ""
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2563
+#: 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 "Ofiste Değil"
+
+#: designs/OOA/ooa.glade.h:13
+#, fuzzy
+msgid "Yes, Change Status"
+msgstr "Bayrak Durumu"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:2
+#, fuzzy
+msgid "<b>Receiving Email</b>"
+msgstr "İletiler Alınıyor"
+
+#: designs/read_receipts/read.glade.h:3
+#, fuzzy
+msgid "<b>Sending Email:</b>"
+msgstr "İleti Gönderiliyor"
+
+#: 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?"
@@ -10556,210 +10757,238 @@ msgstr ""
 "Aynı isimde bir dosya zaten var\n"
 "Üzerine yazılsın mı?"
 
-#: e-util/e-passwords.c:363
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "Dosya üzerine yazılsın mı?"
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Bu parolayı hatırla"
 
-#: e-util/e-passwords.c:365
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Bu oturumun sonuna kadar girilen parolayı hatırla"
 
-#: 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 "Kategoriler"
 
 #. 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 "%d/%m/%Y %A %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 "%d/%m/%Y %A %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 "%d/%m/%Y %A %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 "%d/%m/%Y %A %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:183
-msgid "seconds"
-msgstr "saniye"
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr "1 saniye"
 
-#: filter/filter-datespec.c:71
-msgid "minute"
-msgstr "dakika"
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr "%d saniye"
 
-#: filter/filter-datespec.c:72
-msgid "hour"
-msgstr "saat"
+#: filter/filter-datespec.c:66
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 dakika"
 
-#: filter/filter-datespec.c:74
-msgid "week"
-msgstr "hafta"
+#: filter/filter-datespec.c:66
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "%d dakika"
 
-#: filter/filter-datespec.c:74 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "hafta"
+#: 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 "%d %s önce"
+
+#: filter/filter-datespec.c:69
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 hafta"
+
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d hafta"
+
+#: filter/filter-datespec.c:70
+#, fuzzy
+msgid "1 month ago"
 msgstr "ay"
 
-#: filter/filter-datespec.c:76
-msgid "year"
-msgstr "yılda bir güncelle"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr "%d %s önce"
 
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
-msgid "years"
-msgstr "yılda bir güncelle"
+#: filter/filter-datespec.c:71
+msgid "1 year ago"
+msgstr ""
+
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr "%d %s önce"
 
-#: filter/filter-datespec.c:174
+#: filter/filter-datespec.c:176
 msgid "You must choose a date."
 msgstr "Bir tarih seçmelisiniz."
 
-#: filter/filter-datespec.c:269
+#: filter/filter-datespec.c:275
 msgid "<click here to select a date>"
 msgstr "<bir tarih seçmek için tıklayınız>"
 
-#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
 msgid "now"
 msgstr "şimdi"
 
 #. 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
 msgid "%d-%b-%Y"
 msgstr "%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 "%d %s önce"
-
-#: filter/filter-datespec.c:407
+#: filter/filter-datespec.c:406
 #, fuzzy
 msgid "Select a time to compare against"
 msgstr "Bir Zaman Dilimi 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 "Filtre Kuralları"
 
-#: filter/filter-file.c:178
-msgid "You must specify a file name"
+#: filter/filter-file.c:166
+#, fuzzy
+msgid "You must specify a file name."
 msgstr "Bir dosya dı vermelisiniz"
 
-#: 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 "`%s' dosyası bulunamadı, ya da normal bir dosya değil."
 
-#: filter/filter-file.c:307
+#: filter/filter-file.c:298
 msgid "Choose a file"
 msgstr "Bir dosya seç"
 
 #. and now for the action area
-#: filter/filter-filter.c:513
+#: filter/filter-filter.c:491
 msgid "Then"
 msgstr "Sonra"
 
-#: filter/filter-filter.c:527
-msgid "Add action"
-msgstr "Eylem ekle"
-
-#: filter/filter-folder.c:149
-msgid "You must specify a folder.\n"
+#: filter/filter-folder.c:155
+#, fuzzy
+msgid "You must specify a folder."
 msgstr "Bu dizin adı belirtmelisiniz.\n"
 
-#: 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 "Dizini Seçin"
 
-#: filter/filter-input.c:200
+#: filter/filter-input.c:191
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10768,74 +10997,72 @@ msgstr ""
 "`%s' düzgün deyiminde hata var:\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
-#: mail/mail-config.glade.h:64
+#: 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 "Önemli"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:69
-#: mail/mail-config.glade.h:135
+#: 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:88
+#: 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 "Kişisel"
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:71
-#: mail/mail-config.glade.h:126
+#: 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 "Yapılacaklar"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:68
+#: 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 "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 "Test"
 
-#: filter/filter-rule.c:223
+#: filter/filter-rule.c:219
 msgid "You must name this filter."
 msgstr "Bu filtrenin adını değiştirmelisiniz."
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:751
 msgid "Rule name: "
 msgstr "Kural adı:"
 
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:755
 msgid "Untitled"
 msgstr "İsimsiz"
 
-#: filter/filter-rule.c:785
+#: filter/filter-rule.c:772
 msgid "If"
 msgstr "Eğer"
 
-#: filter/filter-rule.c:803
+#: filter/filter-rule.c:790
 msgid "Execute actions"
 msgstr "Eylemleri işlet"
 
-#: filter/filter-rule.c:807
+#: filter/filter-rule.c:794
 msgid "if all criteria are met"
 msgstr "tüm kriterler sağlanırsa"
 
-#: filter/filter-rule.c:812
+#: filter/filter-rule.c:799
 msgid "if any criteria are met"
 msgstr "herhangi bir kriter sağlanırsa"
 
-#: filter/filter-rule.c:823
-msgid "Add criterion"
-msgstr "Sınıf ekle"
-
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "incoming"
 msgstr "gelen"
 
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "outgoing"
 msgstr "giden"
 
@@ -10877,7 +11104,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 "Sanal Dizinler"
 
@@ -10889,6 +11116,14 @@ msgstr "şimdiki zamana göreceli bir zaman"
 msgid "ago"
 msgstr "önce"
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "ay"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr "saniye"
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "sadece belirtilen dizinler"
@@ -10905,6 +11140,10 @@ msgstr ""
 msgid "vFolder Sources"
 msgstr "vFolder Kaynakları"
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "hafta"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "tüm etkin uzak dizinlerle birlikte"
@@ -10917,6 +11156,10 @@ msgstr "tüm yerel ve etkin uzak dizinlerle birlikte"
 msgid "with all local folders"
 msgstr "tüm yerel dizinlerle birlikte"
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "yılda bir güncelle"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -11049,7 +11292,7 @@ msgstr "değil"
 msgid "is not Flagged"
 msgstr "İşaretli"
 
-#: 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"
@@ -11080,7 +11323,7 @@ msgstr "Bağlantıya İleti Gönder"
 msgid "Play Sound"
 msgstr "Ses ç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 "Oku"
 
@@ -11111,12 +11354,12 @@ msgstr "büyük"
 msgid "returns less than"
 msgstr "küçük"
 
-#: 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 "Puan"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1857
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "Gönderen"
 
@@ -11152,8 +11395,9 @@ msgstr "başlayan"
 msgid "Stop Processing"
 msgstr "İşlemeyi Durdur"
 
-#: 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 "Konu"
 
@@ -11162,52 +11406,66 @@ msgstr "Konu"
 msgid "Unset Status"
 msgstr "Durum belirt"
 
-#: filter/rule-editor.c:180
-msgid "Rules"
-msgstr "Görevler"
-
-#: 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 "Görevler"
+
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Görev Ekle"
 
-#: filter/rule-editor.c:388
+#: filter/rule-editor.c:372
 msgid "Edit Rule"
 msgstr "Görev Düzenle"
 
-#: filter/score-editor.c:130
+#: filter/rule-editor.c:689
+#, fuzzy
+msgid "Rule name"
+msgstr "Kural adı:"
+
+#: filter/score-editor.c:114
 msgid "Score Rules"
 msgstr "Puan Kuralları"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 msgid "You must name this vfolder."
 msgstr "Bu vfolder adını değiştirmelisiniz."
 
-#: filter/vfolder-rule.c:215
+#: filter/vfolder-rule.c:222
 #, fuzzy
-msgid "You need to specify at least one folder as a source."
+msgid "You need to to specify at least one folder as a source."
 msgstr "Kaynak için en az bir dizin belirtmelisiniz."
 
-#: importers/elm-importer.c:95
+#: filter/vfolder-rule.c:499
+#, fuzzy
+msgid "VFolder source"
+msgstr "vFolder Kaynakları"
+
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution, eski Elm iletilerinizi alıyor"
 
 #: 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ıyor..."
 
 #: 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 "Lütfen bekleyiniz"
 
 #: 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 ""
@@ -11215,18 +11473,20 @@ msgstr ""
 "%s başlatılıyor"
 
 #: 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 taranıyor"
 
 #: 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 "İleti"
 
-#: 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?"
@@ -11234,7 +11494,7 @@ msgstr ""
 "Evolution, Elm ileti dosyaları buldu.\n"
 "Bunları Evolution'a aktarmak ister misiniz?"
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -11246,12 +11506,12 @@ msgstr ""
 "Evolution, GnomeCard dosyaları buldu.\n"
 "Bunların Evolution'a aktarılmasını istiyor musunuz?"
 
-#: importers/netscape-importer.c:70
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Öncelik Filtresi \"%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"
@@ -11266,7 +11526,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"
@@ -11274,7 +11534,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"
@@ -11283,37 +11543,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 verilerini alıyor."
 
 #. 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 "Çöp"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "E-posta filtreleri taranıyor"
 
 #: 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 "Dizin taranıyor"
 
-#: 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 "Aktarma işlemi başlıyor"
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 msgid "Mail Filters"
 msgstr "E-posta Filtreleri"
 
-#: 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?"
@@ -11321,11 +11583,11 @@ msgstr ""
 "Evolution, Netscape e-posta dosyaları buldu.\n"
 "Bunların Evolution'a aktarılmasını istiyor musunuz?"
 
-#: 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'daki tüm verileri alıyor"
 
-#: 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?"
@@ -11333,362 +11595,344 @@ msgstr ""
 "Evolution, Pine e-posta dosyaları buldu.\n"
 "Bunların Evolution'a aktarılmasını istiyor musunuz?"
 
-#: 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 "Düzenleyici Tercihleri"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Evolution yazıtipleri için yapılandırma denetimi."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Evolution posta hesabı için yapılandırma denetimi."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Evolution e-posta servisi için yapılandırma denetimi."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Evolution İleti Düzenleyici için yapılandırma denetimi"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Configure mail preferences, including security and message display, here"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr "İleti tercihleri, güvenlik ve diğer ayarları buradan yapılandırın"
 
-#: 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 "İmla denetimi, imza ve metin düzenleyiciyi buradan yapılandırın"
 
-#: 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 "Evolution'un kullanacağı yazıtiplerini buradan yapılandırı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 "Posta hesaplarını buradan yapılandırın"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "E-posta alma va gönderme için Evolution bileşeni"
+#: 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 "E-posta özet bileşen mimarisi"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
 msgstr "Evolution e-posta programı."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Evolution e-posta özet bileşeni."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolution e-posta programı."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Evolution e-posta dizin görüntüleme bileşeni."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "E-posta özet bileşen mimarisi"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
-msgstr "Evolution e-posta dizin bileşeni"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "İleti yapılandırma arayüzü"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
-msgstr "Evolution e-posta programı mimarisi."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution e-posta dizin görüntüleme bileşeni."
 
-#: 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 "E-posta özet bileşen mimarisi"
 
-#: 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 e-posta özet bileşeni."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 msgid "Font Preferences"
 msgstr "Yazıtipi Tercihleri"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
 msgid "Mail Accounts"
 msgstr "E-posta Hesapları"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:71
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
 msgid "Mail Preferences"
 msgstr "E-posta Tercihleri"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-msgid "Mail configuration interface"
-msgstr "İleti yapılandırma arayüzü"
-
-#: mail/component-factory.c:102
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "İletileri içeren dizin"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "Genel Posta"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "E-posta içeren genel dizin"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Sanal Çöp"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Sanal Çöp dizini"
 
-#: mail/component-factory.c:132
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Bu dizinde ileti bulunamaz."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Özellikler..."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Bu dizinin özelliklerini değiştir"
 
-#: mail/component-factory.c:811
+#: 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:976
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "Posta iletim yöntemi düzenlenmemiş"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Henüz gönderilmemiş iletileriniz var. Yine de çıkmak istiyor musunuz?"
 
-#: mail/component-factory.c:1004
-msgid "Warning: Unsent Messages"
-msgstr "Uyarı: Gönderilmeyen İletiler"
-
-#: mail/component-factory.c:1046
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Yeni İleti"
 
-#: mail/component-factory.c:1046
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "_İletiyi Gönder"
 
-#: mail/component-factory.c:1047
+#: mail/component-factory.c:1061
 msgid "Compose a new mail message"
 msgstr "Yeni bir e-posta hazırla"
 
-#: mail/component-factory.c:1055
+#: mail/component-factory.c:1069
 msgid "New Message Post"
 msgstr "Yeni İleti"
 
-#: mail/component-factory.c:1055
+#: mail/component-factory.c:1069
 msgid "_Post Message"
 msgstr "İ_letiyi Gönder"
 
-#: mail/component-factory.c:1056
+#: mail/component-factory.c:1070
 msgid "Post a new mail message"
 msgstr "Yeni bir e-posta gönder"
 
-#: mail/component-factory.c:1084
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Evolution posta programı başlatılamadı."
-
-#: mail/component-factory.c:1093
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Evolution'ın ileti yapılandırma bileşeni başlatılamadı."
-
-#: mail/component-factory.c:1099
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Evolution'ın ileti dizin bilgi bileşeni başlatılamadı."
-
-#: mail/component-factory.c:1341 mail/component-factory.c:1371
+#: mail/component-factory.c:1353
 msgid "Connecting..."
 msgstr "Bağlanıyor..."
 
-#: mail/component-factory.c:1382
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Depo kabuğa kayıt ettirilemedi"
 
-#: mail/folder-browser-ui.c:471
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" özellikleri"
 
-#: mail/folder-browser-ui.c:473
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Özellikler"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:381 mail/mail-display.c:893
+#: 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 "Geçici dizin yaratılamadı: %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 "%d görünen"
 
-#: 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 gönderilmemiş"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d sent"
 msgstr "%d gönderilmiş"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr "toplam %d"
 
-#: mail/folder-browser.c:1118
+#: mail/folder-browser.c:1182
 msgid "Create _Virtual Folder From Search..."
 msgstr "Arama sonucundan  _Sanal Dizin Yarat..."
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "_Konuya Göre VFolder"
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "_Gönderene Göre VFolder"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "_Alıcılara Göre VFolder"
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "_E-posta Listesi Üzerinde VFolder"
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "_Konuya Göre Filtrele"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "_Gönderene Göre Filtrele"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "_Alıcılara Göre Filtrele"
 
-#: 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 "_E-posta Listelerine Göre Filtrele"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "Yeni İleti Olarak _Düzenle..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "_Yazdır"
 
-#: 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önderene Cevapla"
 
-#: 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 "_Listeye Cevapla"
 
-#: 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 "_Herkese Cevapla"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "_Yönlendir"
 
-#: 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 "Tamamlandı"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1772
 msgid "Cl_ear Flag"
 msgstr "_Bayrağı Temizle"
 
 #. 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 "_Okunmuş Olarak İşaretle"
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1777
 msgid "Mark as _Unread"
 msgstr "Oku_nmamış Olarak İşaretle"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "Ö_nemli Olarak İşaretle"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1779
 msgid "_Mark as Unimportant"
 msgstr "Ö_nemsiz Olarak İşaretle"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1784
 msgid "U_ndelete"
 msgstr "_Silme"
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1788
 msgid "Mo_ve to Folder..."
 msgstr "_Dizine Taşı..."
 
-#: 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 "D_izine Kopyala..."
 
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1797
 msgid "Add Sender to Address_book"
 msgstr "_Göndereni Adres Defterine Ekle"
 
-#: mail/folder-browser.c:1774
+#: mail/folder-browser.c:1801
 msgid "Appl_y Filters"
 msgstr "_Filtreleri Uygula"
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1805
 msgid "Crea_te Rule From Message"
 msgstr "_Bu İletiden Bir Kural Yarat"
 
-#: mail/folder-browser.c:2036
+#: mail/folder-browser.c:2064
 msgid "VFolder on M_ailing List"
 msgstr "_E-posta Listesi Üzerinde VFolder"
 
-#: 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
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "E-posta Listesi Üzerinde VFolder (%s)"
@@ -11697,25 +11941,41 @@ msgstr "E-posta Listesi Üzerinde VFolder (%s)"
 msgid "Default"
 msgstr "Öntanımlı"
 
-#: mail/folder-info.c:71
+#: mail/folder-info.c:70
 msgid "Getting Folder Information"
 msgstr "Dizin Bilgisi Alınıyor"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "Mbox dosyalarını Evolution'a aktarım mimarisi"
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Evolution e-posta programı."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Mbox dosyalarını Evolution'a aktarır"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolution e-posta programı."
 
-#: 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 iletilerini Evolution'a aktarım mimarisi"
+#: 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 dosyalarını Evolution'a aktarır"
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution e-posta programı."
+
+#: 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 e-posta programı."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -11751,101 +12011,96 @@ msgstr "pkutusu"
 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 "Gerekli tüm bilgiler verilmedi."
 
 #. 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 Hesap Düzenleyici"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:159
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Makina:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Kullanıcı adı:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "_Yol:"
 
-#: mail/mail-account-gui.c:1847
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr "İki hesabı aynı isimlerle oluşturamazsınız."
 
-#: mail/mail-accounts.c:224
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr "Gerçekten bu hesabı silmek istiyor musunuz?"
 
-#: mail/mail-accounts.c:228
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "Silme"
 
-#: mail/mail-accounts.c:231
-msgid "Really delete account?"
-msgstr "Gerçekten hesap silinsin mi?"
-
-#: 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 "Kapat"
 
-#: 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 "Etkinleştir"
 
-#: mail/mail-accounts.c:467
+#. translators: default account indicator
+#: mail/mail-accounts.c:433
 msgid "[Default]"
 msgstr "[Öntanımlı]"
 
-#: mail/mail-accounts.c:538 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 "Etkin"
 
-#: mail/mail-accounts.c:539 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Hesap adı"
 
-#: mail/mail-accounts.c:540 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protokol"
 
-#: mail/mail-autofilter.c:78
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "%s adresine postala"
 
-#: mail/mail-autofilter.c:242
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Konu: %s"
 
-#: mail/mail-autofilter.c:258
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "%s'ten E-posta"
 
-#: mail/mail-autofilter.c:275
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s posta listesi"
 
-#: mail/mail-autofilter.c:327
+#: mail/mail-autofilter.c:323
 msgid "Add Filter Rule"
 msgstr "Filtre Kuralı Ekle"
 
-#: mail/mail-autofilter.c:376
+#: mail/mail-autofilter.c:372
 msgid "The following filter rule(s):\n"
 msgstr "Bu filtre kural(lar)ı:\n"
 
-#: mail/mail-autofilter.c:382
+#: mail/mail-autofilter.c:378
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11853,7 +12108,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 "Bu mesajı bir daha gösterme."
+
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11865,7 +12125,16 @@ msgstr ""
 "önce yapmanız gerekiyor.\n"
 "Şimdi yapılandırmak istiyor musunuz?"
 
-#: 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 ""
+"İleti göndermeden önce kendinize\n"
+"ait bir kimlik oluşturmalısınız."
+
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11873,7 +12142,7 @@ msgstr ""
 "İleti göndermeden önce kendinize\n"
 "ait bir kimlik oluşturmalısınız."
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11882,7 +12151,7 @@ msgstr ""
 "iletim ayarı yapmalısınız."
 
 #. 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"
@@ -11891,11 +12160,11 @@ msgstr ""
 "HTML biçimli bir ileti gönderiyorsunuz. Ancak aşağıdaki alıcılar, HTML "
 "biçimli iletiler almak istemiyorlar:\n"
 
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "Yine de gönderilsin mi?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11903,17 +12172,17 @@ msgstr ""
 "Bu iletinin konusu yok.\n"
 "Yine de gönderilsin mi?"
 
-#: 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 "Bu ileti sadece gizli (Bcc) alıcıları içeriyor."
 
-#: 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"
@@ -11923,11 +12192,11 @@ msgstr ""
 "getirebilir.\n"
 "Yine de göndereyim mi?"
 
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr "Bu e-postayı göndermek için alıcısını belirtmeniz gereklidir."
 
-#: 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?"
@@ -11935,28 +12204,28 @@ msgstr ""
 "Bu hesap için taslak dizini açılamadı.\n"
 "Öntanımlı taslak dizinini kullanmak istiyor musunuz?"
 
-#: mail/mail-callbacks.c:1233
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "bilinmeyen gönderici"
 
-#: mail/mail-callbacks.c:1237
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%d-%m-%Y %A günü saat %H:%M sularında, %%s dedi ki:"
 
-#: mail/mail-callbacks.c:1738 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr "İletileri buraya taşı"
 
-#: mail/mail-callbacks.c:1740 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr "İleti(leri) buraya kopyala"
 
-#: mail/mail-callbacks.c:2407
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Gerçekten %d iletiyi düzenlemek istiyor musunuz?"
 
-#: mail/mail-callbacks.c:2432
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11964,7 +12233,7 @@ msgstr ""
 "Sadece taslaklar dizinine kaydedilen\n"
 "iletileri düzenleyebilirsiniz."
 
-#: mail/mail-callbacks.c:2471
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11972,47 +12241,50 @@ msgstr ""
 "Sadece Gönderilen dizinine kaydedilen\n"
 "iletileri yeniden gönderebilirsiniz."
 
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Gerçekten %d iletiyi yeniden göndermek istiyor musunuz?"
 
-#: mail/mail-callbacks.c:2511
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "Hiç İleti Seçilmedi"
 
-#: mail/mail-callbacks.c:2556 mail/mail-display.c:189
-msgid "Overwrite file?"
-msgstr "Dosya üzerine yazılsın mı?"
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"İleti alınamadı: %s\n"
+"  %s"
 
-#: mail/mail-callbacks.c:2610
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"%s isimli bir dosya zaten var.\n"
+"Üzerine yazılsın mı?"
+
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "İletiyi Farklı Kaydet..."
 
-#: mail/mail-callbacks.c:2612
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "İletileri Farklı Kaydet..."
 
-#: mail/mail-callbacks.c:2681
-#, fuzzy
-msgid "Go to next folder with unread messages?"
-msgstr "Sonraki okunmamış iletiyi göster"
-
-#: mail/mail-callbacks.c:2688
-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:2931
+#: 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:3044
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12021,60 +12293,62 @@ msgstr ""
 "Filtre bilgisini yüklerken hata oluştu:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3056
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtreler"
 
-#: mail/mail-callbacks.c:3100
+#: mail/mail-callbacks.c:2831
 #, c-format
 msgid "Page %d of %d"
 msgstr "Sayfa: %d / %d"
 
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "İletiyi Yazdır"
 
-#: mail/mail-callbacks.c:3182
-msgid "US-Letter"
-msgstr "Zarf"
-
-#: mail/mail-callbacks.c:3223
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "İletiyi yazdırılmasında hata"
 
-#: mail/mail-callbacks.c:3413
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Gerçekten %d iletiyi farklı pencerelerde açmak istiyor musunuz?"
 
-#: mail/mail-composer-prefs.c:223
-msgid ""
-"Please specify signature filename\n"
-"in Advanced section of signature settings."
-msgstr ""
-
-#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
-#: mail/mail-composer-prefs.c:416
-msgid " [script]"
-msgstr " [betik]"
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
+msgid "Unnamed"
+msgstr "İsimsiz"
 
-#: mail/mail-composer-prefs.c:309
-msgid "Please specify a valid script name"
+#: mail/mail-composer-prefs.c:335
+#, fuzzy
+msgid "You must specify a valid script name."
 msgstr "Lütfen geçerli bir betik adı veriniz"
 
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
-msgid "Unnamed"
-msgstr "İsimsiz"
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
+#, fuzzy
+msgid "[script]"
+msgstr " [betik]"
+
+#: mail/mail-composer-prefs.c:864
+#, fuzzy
+msgid "Language(s)"
+msgstr "Dil"
 
-#: mail/mail-composer-prefs.c:880
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr "Betik imzası girin"
 
-#: mail/mail-composer-prefs.c:881
-msgid "Add Signature"
-msgstr "İmza Ekle"
+#: mail/mail-composer-prefs.c:926
+#, fuzzy
+msgid "Signature(s)"
+msgstr "İm_zalar"
 
-#: 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
 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 "
@@ -12084,7 +12358,12 @@ msgstr ""
 "e-posta adresinizin içinde görünmesini istemiyorsanız seçimlik alanları "
 "doldurmanıza gerek yoktur. "
 
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "_Alınan İletiler"
+
+#: 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."
@@ -12093,20 +12372,29 @@ msgstr ""
 "kullandığınızı bilmiyorsanız sistem yöneticinize, ya da İnternet servis "
 "sağlayıcınıza başvurun."
 
-#: mail/mail-config-druid.c:150
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Aşağıdaki seçeneklerden birisini seçin"
 
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:400
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Gönderilen İ_leti"
+
+#: 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 ""
 "Lütfen giden e-posta sunucusu için protokol bilgisini aşağıda belirtin. Eğer "
-"hangi protokolü kullandığınızı bilmiyorsanız sistem yöneticinize, ya da İnternet servis sağlayıcınıza "
-"başvurun."
+"hangi protokolü kullandığınızı bilmiyorsanız sistem yöneticinize, ya da "
+"İnternet servis sağlayıcınıza başvurun."
 
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "Hesap Yöneticisi"
+
+#: 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 "
@@ -12115,25 +12403,15 @@ msgid ""
 "purposes only."
 msgstr ""
 "E-posta yapılandırma işlemi neredeyse tamamlandı. Kimlik ayarlarınız, gelen "
-"ve giden e-posta sunucunuz Evolution hesabınızı tanımlamak için yeterli olacaktır. Lütfen"
-"aşağıdaki boşluğa bu hesap için bir ad veriniz. Bu isim, sadece "
-"görüntüleme amaçlı olarak kullanılacaktır."
-
-#. set window title
-#: mail/mail-config-druid.c:638
-msgid "Evolution Account Assistant"
-msgstr "Evolution Hesap Sihirbazı"
-
-#: mail/mail-config.c:622
-#, c-format
-msgid "Account %d"
-msgstr "Hesap %d"
+"ve giden e-posta sunucunuz Evolution hesabınızı tanımlamak için yeterli "
+"olacaktır. Lütfenaşağıdaki boşluğa bu hesap için bir ad veriniz. Bu isim, "
+"sadece görüntüleme amaçlı olarak kullanılacaktır."
 
-#: mail/mail-config.c:2316
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Servis Denetleniyor"
 
-#: 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 "Sunucuya bağlantı kuruluyor..."
 
@@ -12149,14 +12427,10 @@ msgstr "(Evolution'un bu sürümünde SSL desteklenmiyor)"
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Evolution'un bu sürümünde SSL desteklenmiyor)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Ş_ifreli e-posta gönderirken kendime de şifrele"
 
-#: mail/mail-config.glade.h:7
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr "AaBbCcÇçDdEeFfGgĞğHhIıİiJjKkLlMmNnOoÖöPpQqRrSsTtUuÜüVvWwXxYyZz"
-
 #: mail/mail-config.glade.h:8
 msgid "Account Editor"
 msgstr "Hesap Düzenleyici"
@@ -12165,10 +12439,6 @@ msgstr "Hesap Düzenleyici"
 msgid "Account Information"
 msgstr "Hesap Bilgisi"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "Hesap Yöneticisi"
-
 #: mail/mail-config.glade.h:11
 msgid "Add Sc_ript"
 msgstr "_Betik Ekle"
@@ -12253,13 +12523,14 @@ msgid "Configuration"
 msgstr "Yapılandırma"
 
 #: 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 ""
 "Tebrikler, e-posta ayarları başarıyla tamamlandı.\n"
 "\n"
@@ -12297,7 +12568,7 @@ msgstr "İleti açılamadı"
 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 "Tamamlandı"
 
@@ -12325,6 +12596,10 @@ msgstr "_E-posta adresi:"
 msgid "Empty _trash folders on exit"
 msgstr "Programdan çı_karken çöp dizinini sil"
 
+#: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr "Evolution Hesap Sihirbazı"
+
 #: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Komut Çalıştır..."
@@ -12354,10 +12629,6 @@ msgstr "_Referansları "
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr "Kimlik"
-
 #: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Bağlantılı"
@@ -12391,6 +12662,11 @@ msgid "Message Display"
 msgstr "İleti Görünümü"
 
 #: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "İleti içerir"
+
+#: mail/mail-config.glade.h:76
 msgid "Microsoft"
 msgstr "Microsoft"
 
@@ -12405,166 +12681,159 @@ msgid ""
 msgstr ""
 
 #: mail/mail-config.glade.h:81
-msgid "On Screen fonts"
-msgstr "Ekran yazıtipleri"
-
-#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Seçimlik Bilgi"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:83
 msgid "Or_ganization:"
 msgstr "_Kurum:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Anahtar Numarası:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Bir renk seçin"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Sadece _Bcc alıcıların tanımlı olduğu iletileri gönderirken beni uyar"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:91
 msgid "Printed Fonts"
 msgstr "Yazdırılan Yazıtipleri"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr "Qmail dizini "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Quote original message"
 msgstr "İleti açılamadı"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quoted"
 msgstr "Not"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr "_Bu parolayı hatırla"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:96
 msgid "Re_ply-To:"
 msgstr "Cevapla:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr "İletiler Alınıyor"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:98
 msgid "Receiving _Options"
 msgstr "_Alma Seçenekleri"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:99
 msgid "Remember this _password"
 msgstr "_Bu parolayı hatırla"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "İstenen Bilgiler"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:101
 msgid "Restore Defaults"
 msgstr "Öntanımlı Değerlere Geri Dön"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:103
 msgid "S_ecurity"
 msgstr "_Güvenlik"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "Güvenli MIME (SMIME)"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr "HTML eşaralıklı yazıtipini seçin"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr "Yazdırma için HTML eşaralıklı yazıtipini seçin"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr "HTML değişken aralıklı yazıtipini seçin"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr "Yazdırmak için HTML değişken aralıklı yazıtipini seçin"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
 msgstr "İleti Gönderiliyor"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "_Gönderilen iletiler dizini:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "Gönderilen ve Taslak İletileri"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr "S_unucu kimlik denetimi istiyor"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Sunucu Yapılandırması"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "Su_nucu Türü: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:116
 msgid "Shortcuts _type:"
 msgstr "_Kısayol türü:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:117
 msgid "Specify _filename:"
 msgstr "_Dosya adı belirtin"
 
-#: mail/mail-config.glade.h:119
-msgid "Spell Checking Language"
-msgstr "İmla Denetimi Dili"
-
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr "İmla _Denetimi"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX posta kutusu dosyası"
 
-#: mail/mail-config.glade.h:122
+#: 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:125
+#: 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 ""
-"Bu sayfa imla denetimi ve bu denetim sırasında kullanılacak dili belirtmenizi "
-"sağlar. Buradaki liste, sözlüğü sistem kurulan dillerin oluşturduğu listedir."
+"Bu sayfa imla denetimi ve bu denetim sırasında kullanılacak dili "
+"belirtmenizi sağlar. Buradaki liste, sözlüğü sistem kurulan dillerin "
+"oluşturduğu listedir."
 
-#: mail/mail-config.glade.h:127
+#: 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\""
@@ -12572,177 +12841,184 @@ msgstr ""
 "Bu hesaba erişebileceğiniz bir isim verin.\n"
 "Örneğin: \"İş hesabım\" ya da \"Kişisel\" gibi."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "_Değişken genişlik:"
 
-#: mail/mail-config.glade.h:131
+#: 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 E-posta Yapılandırma Sihirbazına Hoşgeldiniz.\n"
 "\n"
 "Devam etmek için \"İleri\" düğmesine tıklayın."
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_İmza Ekle"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Resimleri her zaman ağdan indir"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Bu _hesabı kullanırken her zaman giden iletileri imzala"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Kimlik Denetim Türü: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Kimlik denetim türü: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "_Yeni iletileri otomatik denetle:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Gülme simgelerini otomatik ekle"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Yeni ileti geldiği zaman biple"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "_Sertifika No:"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr "_Bir dizini silmeden önce onayla"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Default signature:"
 msgstr "Ö_ntanımlı imza:"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Defaults"
 msgstr "Ön_tanımlılar"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Yeni ileti geldiğinde beni uyarma"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Enable"
 msgstr "_Etkinleştir"
 
-#: mail/mail-config.glade.h:154
-msgid "_Fixed-width:"
-msgstr "_Eş aralıklı:"
-
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
 msgid "_Forward style:"
 msgstr "Yö_nlendirme türü:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "_Tam isim:"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr "_HTML İleti"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr "_Kimlik"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "_Gönderici adres defterinde ise resimleri yükle"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "_Bunu öntanımlı hesabım yap"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "İ_letileri"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "İ_sim:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "R_esimleri hiç bir zaman ağdan indirme"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr "Y_eni ileti geldiğinde müzik çal"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "HTML iletileri istemeyen bağlantılara ileti gönderirken beni _uyar"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "İ_letileri konusuz gönderirken beni uyar"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr "_Alınan İletiler"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "_Cevaplama yöntemi:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr "Ö_ntanımlı değerlere geri dön"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Betik:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "Gönderilen İ_leti"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Canlandırmalı resimleri göster"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "İm_zalar"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "Sand Point"
+
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "Asıl Bağlantı:"
+
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "_Güvenli bağlantı (SSL) kullan:"
 
-#: mail/mail-config.glade.h:178
-msgid "_Variable-width:"
-msgstr "_Değişken aralıklı:"
+#: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:178
 msgid "_every"
 msgstr "_her"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr "renk"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "açıklama"
 
@@ -12766,7 +13042,7 @@ msgstr "S/MIME şifreli zarf içeriği oluşturulamıyor."
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME kodlama içeriği oluşturulamıyor."
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:193
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -12775,191 +13051,189 @@ msgstr ""
 "%s isimli bir dosya zaten var.\n"
 "Üzerine yazılsın mı?"
 
-#: mail/mail-display.c:326
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Eki Kaydet"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:406
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "%s geçici dizini yaratılamadı: %s"
 
-#: mail/mail-display.c:437
+#: mail/mail-display.c:454
 msgid "Save Attachment..."
 msgstr "Eki Kaydet..."
 
-#: mail/mail-display.c:438
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr "İzle"
 
-#: mail/mail-display.c:439
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "%s içinde aç..."
 
-#: mail/mail-display.c:499
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "İzle (%s kullanarak)"
 
-#: mail/mail-display.c:503
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "Gizle"
 
-#: mail/mail-display.c:524
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "Harici İzleyici"
 
-#: mail/mail-display.c:1320
+#: mail/mail-display.c:1365
 msgid "Downloading images"
 msgstr "Resimleri bilgisayara indir"
 
-#: mail/mail-display.c:1497
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "İleti içeriği yükleniyor"
 
-#: mail/mail-display.c:1784
+#: mail/mail-display.c:1879
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1788
+#: mail/mail-display.c:1883
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%d %b %l:%M %p"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Bağlantıyı Tarayıcıda Aç"
 
-#: mail/mail-display.c:2116
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Adresi Kopyala"
 
-#: mail/mail-display.c:2118
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Bağlantıyı Farklı Kaydet"
 
-#: mail/mail-display.c:2120
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Resmi Farklı Kaydet..."
 
-#: mail/mail-folder-cache.c:743
+#: mail/mail-folder-cache.c:744
 #, c-format
 msgid "Pinging %s"
 msgstr "%s adresine ping gönderiliyor"
 
-#: mail/mail-format.c:656
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr "%s ek"
 
-#: 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 iletisi açılamadı: Kaynak 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 "Tarih"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr "Hatalı Adres"
 
-#: 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önderen"
 
-#: mail/mail-format.c:917
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Yanıtla:"
 
-#: 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 "Alıcı"
 
-#: mail/mail-format.c:927
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Bilgi"
 
-#: mail/mail-format.c:932
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Gizli"
 
-#: mail/mail-format.c:963
-msgid "Mailer"
-msgstr "E-postalayıcı"
-
-#: mail/mail-format.c:1848
-msgid "This message is digitally signed. Click the lock icon for more information."
+#: mail/mail-format.c:1451
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Bu ileti dijital olarak imzalanmıştır ve güvenlidir. Daha fazla bilgi için "
 "kilit simgesi üzerine tıklayın."
 
-#: mail/mail-format.c:1875
+#: mail/mail-format.c:1479
 msgid "Could not create a PGP verfication context"
 msgstr "PGP onaylama dosyası oluşturulamadı."
 
-#: 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 ileti dijital olarak imzalanmıştır ve güvenlidir."
 
-#: 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 ileti dijital olarak imzalanmış, fakat güvenli olduğu kanıtlanmamıştır."
+msgstr ""
+"Bu ileti dijital olarak imzalanmış, fakat güvenli olduğu kanıtlanmamıştır."
 
-#: mail/mail-format.c:2157
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP adresine bağ (%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 yerel dosyasına bağ (\"%s\" adresinde geçerli)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerel dosyaya bağ (%s)"
 
-#: mail/mail-format.c:2205
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Uzak veri adresine bağ (%s)"
 
-#: mail/mail-format.c:2213
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Bilinmeyen harici veriye bağ (\"%s\" türünde)"
 
-#: mail/mail-format.c:2218
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr "Bozuk harici gövde"
 
-#: mail/mail-local.c:539 mail/mail-local.c:541
+#: mail/mail-local.c:537 mail/mail-local.c:539
 #, c-format
 msgid "Local folders/%s"
 msgstr "Yerel dizinler/%s"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr "Dizin yeniden yapılandırılıyor"
 
-#: 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
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "%s üzerinde dizin kilitlemesi yaratılamadı: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
@@ -12971,7 +13245,7 @@ msgstr ""
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" biçiminden \"%s\" biçimine geçiliyor"
 
-#: 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."
@@ -12979,12 +13253,12 @@ msgstr ""
 "Eğer bu dizini tekrar açamazsınız, elle \n"
 "düzeltme yapmak zorunda kalacaksınız."
 
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Yeniden Yapılandır/%s"
 
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "Bu çöp dizininden ileti kopyalayamazsınız."
@@ -13007,108 +13281,108 @@ msgstr ""
 "İşlem sırasında hata:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Çalışıyor"
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Dizin filtreleniyor"
 
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "İleti Alınıyor"
 
-#: 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 "Mesaj başarıyla gönderilmiştir."
 
-#: mail/mail-ops.c:618
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" gönderiliyor"
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ileti gönderiliyor"
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d/%d iletide hata"
 
-#: 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 "Tamamlandı."
 
-#: mail/mail-ops.c:853
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "İletiler dizine kaydediliyor"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İletiler %s'e taşınıyor"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İletiler %s'e kopyalanıyor"
 
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" içinde dizinler taranıyor"
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Yönlendirilmiş iletiler"
 
-#: mail/mail-ops.c:1277
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s dizini açılıyor"
 
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "%s deposu açılıyor"
 
-#: mail/mail-ops.c:1422
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s dizini siliniyor"
 
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "'%s' dizinine kaydediliyor"
 
-#: mail/mail-ops.c:1567
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Dizin tazeleniyor"
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1594
 msgid "Expunging folder"
 msgstr "Dizin siliniyor"
 
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s numaralı ileti alınıyor"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d ileti alınıyor"
 
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1801
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d ileti kaydediliyor"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13117,7 +13391,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13126,11 +13400,11 @@ msgstr ""
 "İletilerin kaydında hata: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "Ek kaydediliyor"
 
-#: mail/mail-ops.c:2041
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13139,54 +13413,54 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2071
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Veri yazılamadı: %s."
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s bağlantısı kesiliyor"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s adresine bağlantı kuruluyor"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "_Ara"
-
-#: mail/mail-search.c:137
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(Başlıksız İleti)"
 
-#: mail/mail-search.c:240
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "Başlıksız İleti"
 
-#: mail/mail-search.c:244
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "Boş İleti"
 
-#: mail/mail-search.c:291
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "İletide Bul"
 
-#: mail/mail-search.c:321
+#: mail/mail-search.c:285
+msgid "Search"
+msgstr "Ara"
+
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "Küçük/büyük Harfe Duyarlı"
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr "İleri Doğru Arat"
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "Bul:"
 
-#: mail/mail-search.c:346
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "Eşleşenler:"
 
@@ -13194,68 +13468,64 @@ msgstr "Eşleşenler:"
 msgid "Cancelling..."
 msgstr "İptal ediliyor..."
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Sunucu: %s, Tür: %s"
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Yol: %s, Tür: %s"
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:252
 #, c-format
 msgid "Type: %s"
 msgstr "Tür: %s"
 
-#: mail/mail-send-recv.c:293
+#: mail/mail-send-recv.c:297
 msgid "Send & Receive Mail"
 msgstr "İletileri Al ve Gönder"
 
-#: mail/mail-send-recv.c:295
+#: mail/mail-send-recv.c:299
 msgid "Cancel All"
 msgstr "Hepsini İptal Et"
 
-#: mail/mail-send-recv.c:355
+#: mail/mail-send-recv.c:378
 msgid "Updating..."
 msgstr "Güncelleniyor..."
 
-#: 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 "Bekleniyor..."
 
-#: mail/mail-session.c:221
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr "Kullanıcı işlemi iptal etti."
 
-#: mail/mail-session.c:272
-msgid "_Remember this password"
-msgstr "_Bu parolayı hatırla"
-
-#: mail/mail-session.c:273
-msgid "_Remember this password for the remainder of this session"
-msgstr "_Bu oturumun sonuna kadar girilen parolayı hatırla"
-
-#: mail/mail-session.c:330
+#: mail/mail-session.c:258
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s İçin Parolayı Girin"
 
-#: mail/mail-session.c:333
+#: mail/mail-session.c:260
 msgid "Enter Password"
 msgstr "Parolayı Girin"
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-session.c:280
+msgid "_Remember this password"
+msgstr "_Bu parolayı hatırla"
+
+#: mail/mail-session.c:281
+msgid "_Remember this password for the remainder of this session"
+msgstr "_Bu oturumun sonuna kadar girilen parolayı hatırla"
+
+#: mail/mail-signature-editor.c:80
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "İ_mza dosyası kaydedilemedi: %s"
 
-#: mail/mail-signature-editor.c:175
-msgid "Save signature"
-msgstr "İmzayı kaydet"
-
-#: 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"
@@ -13265,42 +13535,50 @@ msgstr ""
 "\n"
 "Değişiklikleri kaydetmek istiyor musunuz?"
 
-#: 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 "İmzayı kaydet"
+
+#: mail/mail-signature-editor.c:389
 msgid "Edit signature"
 msgstr "İmzayi düzenle"
 
-#: mail/mail-signature-editor.c:372
+#: mail/mail-signature-editor.c:429
 msgid "Enter a name for this signature."
 msgstr "Bu imza için bir isim girin."
 
-#: 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 "İsim:"
 
-#: mail/mail-tools.c:262
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Yönlendirilmiş ileti - %s"
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "Yönlendirilmiş ileti"
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "Yönlendirilmiş İleti"
 
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "VDizin yaratılıyor: %s"
 
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:210
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "\"%s\" içinde dizinler taranıyor"
 
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13309,97 +13587,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 "VDizin"
 
-#: mail/mail-vfolder.c:819
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "vDizinler"
 
-#: mail/mail-vfolder.c:861
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "VDizin Düzenle"
 
-#: 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 "Yeni VDizin"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(Konusuz)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - İleti"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:740
 msgid "Unseen"
 msgstr "Görünmeyen"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:741
 msgid "Seen"
 msgstr "Görünen"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr "Cevaplanan"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:743
 msgid "Multiple Unseen Messages"
 msgstr "Çoklu Görülmeyen İleti"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:744
 msgid "Multiple Messages"
 msgstr "Çoklu İletiler"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:748
 msgid "Lowest"
 msgstr "En Düşük"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:749
 msgid "Lower"
 msgstr "Düşük"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:753
 msgid "Higher"
 msgstr "Yüksek"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:754
 msgid "Highest"
 msgstr "En Yüksek"
 
-#: 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 "Dün %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 "İleti listesi oluşturuluyor"
 
@@ -13432,44 +13710,44 @@ msgstr "Alındı"
 msgid "Size"
 msgstr "Boyut"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr "Çağrı"
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:63
 msgid "Do Not Forward"
 msgstr "Yönlendirme"
 
-#: 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 "Bilginize"
 
-#: 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 "Yönlendir"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:67
 msgid "No Response Necessary"
 msgstr "Cevaba Gerek Yok"
 
-#: 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 "Cevapla"
 
-#: 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 "Herkese cevapla"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:71
 #, fuzzy
 msgid "Review"
 msgstr "Önizleme"
 
-#: 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 ""
 
@@ -13497,90 +13775,98 @@ msgstr "_Tarihe Göre:"
 msgid "_Flag:"
 msgstr "İşaretli"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "\"%s\" içinde dizinler taranıyor"
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, fuzzy, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "\"%s\" içinde dizinler taranıyor"
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "\"%s\" dizinine üye olunuyor"
 
-#: mail/subscribe-dialog.c:338
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" dizininden üyelik siliniyor"
 
-#: 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 "Dizin"
 
-#: mail/subscribe-dialog.c:1450
+#: mail/subscribe-dialog.c:1389
 #, fuzzy
 msgid "Scanning folders..."
 msgstr "Dizine kaydet..."
 
-#: mail/subscribe-dialog.c:1557
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Hiç sunucu seçilmedi"
 
-#: mail/subscribe-dialog.c:1621
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Lütfen bir sunucu seçiniz."
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "All folders"
-msgstr "Tüm dizinler"
-
-#: mail/subscribe-dialog.glade.h:4 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 ui/evolution-message-composer.h:15
+#: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Kapat"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "Display Options"
-msgstr "Görüntüleme Seçenekleri"
-
-#: mail/subscribe-dialog.glade.h:6
-msgid "Folders whose names begin with:"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:7
+#: mail/subscribe-dialog.glade.h:4
 msgid "Manage Subscriptions"
 msgstr "Üyelikleri Düzenle"
 
-#: mail/subscribe-dialog.glade.h:8 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Listeyi Tazele"
 
-#: mail/subscribe-dialog.glade.h:9
-#, fuzzy
-msgid "Refresh folder listing"
-msgstr "Dizin tazeleniyor"
-
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:6
 msgid "S_elect server: "
 msgstr "_Sunucuyu seçin:"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "_Üye ol"
 
-#: mail/subscribe-dialog.glade.h:12
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "Ü_yelikten çık"
 
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
+#, fuzzy
+msgid "Configure the appearance of the Evolution Summary here"
+msgstr "Evolution Özeti içeren dizin"
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Summary"
+msgstr "Evolution e-posta programı."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Summary component"
+msgstr "Evolution e-posta programı."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "E-posta özet bileşen mimarisi"
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Özet Ayarları"
+
 #: my-evolution/Locations.h:1
 msgid "Aarhus"
 msgstr "Aarhus"
@@ -16978,7 +17264,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 "Hail"
 
@@ -18671,6153 +18957,6144 @@ 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 " "
 
-#: 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 " "
 
-#: 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-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 "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 "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 "Muğla/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 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 "Naha 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 "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 "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 "North 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 "North 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 "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 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 " "
 
-#: 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 "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 "People's Republic of China"
 
-#: 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 "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 "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 " Geri"
 
-#: 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 " Özet"
 
-#: 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-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 "Russia"
 
-#: 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 "Şanlıurfa"
 
-#: 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-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 "Sitkaz"
 
-#: 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 " Gönderen"
 
-#: 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 "South 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
 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 "United Arab Emirates "
 
-#: 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 "Zürih"
 
-#: my-evolution/component-factory.c:51
+#: my-evolution/component-factory.c:56
 msgid "Folder containing the Evolution Summary"
 msgstr "Evolution Özeti içeren dizin"
 
-#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
+#: my-evolution/e-summary-calendar.c:380
 msgid "Appointments"
 msgstr "Randevular"
 
-#: my-evolution/e-summary-calendar.c:382
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
 msgstr "Randevu yok"
 
-#: 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 "Açıklama yok"
 
-#: my-evolution/e-summary-mail.c:153
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "İleti özeti"
 
-#: 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 "Yerel Dizinler"
 
-#. 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 "Günün Sözü"
 
-#: my-evolution/e-summary-preferences.c:840
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr "Yeni bir haber grubu ekle"
 
-#: 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 "Eklenecek haber grubunun adını buraya yazın"
 
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr "RDF indirirken bir hata oluştu"
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr "Haber Grubu"
 
-#: my-evolution/e-summary-shown.c:519
+#: my-evolution/e-summary-shown.c:518
 msgid "All"
 msgstr "Tümü"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:531
+#: my-evolution/e-summary-shown.c:530
 msgid "Add"
 msgstr "Ekle"
 
-#: 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 "Gösterilen"
 
-#: my-evolution/e-summary-tasks.c:328
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "Görev yok"
 
-#: my-evolution/e-summary-tasks.c:372
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(Açıklama Yok)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:73
 msgid "My Weather"
 msgstr "Hava Durumu"
 
-#: 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 Durumu"
 
-#: 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 "%e %B %A, %Y"
 
-#: my-evolution/e-summary.c:504
+#: my-evolution/e-summary.c:523
 msgid "Please wait..."
 msgstr "Lütfen bekleyiniz..."
 
-#: 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 "Yazdırma Özeti"
 
-#: my-evolution/e-summary.c:640
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Özetin yazdırılmasında hata"
 
-#: my-evolution/main.c:68
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "Bonobo başlatılamadı.\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 "knot"
 
-#: 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 "mil"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "kilometers"
 msgstr "kilometre"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Clear sky"
 msgstr "Açık gökyüzü"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Broken clouds"
 msgstr "Parçalı bulutlu"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Scattered clouds"
 msgstr "Dağınık bulutlu"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Few clouds"
 msgstr "Az bulutlu"
 
-#: 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 "Geçersiz"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Variable"
 msgstr "Değişken"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North"
 msgstr "Kuzey"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North - NorthEast"
 msgstr "Kuzey - Kuzeydoğu"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Northeast"
 msgstr "Kuzeydoğu"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - NorthEast"
 msgstr "Doğu - Kuzeydoğu"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East"
 msgstr "Doğu"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East - Southeast"
 msgstr "Doğu - Güneydoğu"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southeast"
 msgstr "Güneydoğu"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southeast"
 msgstr "Güney - Güneydoğu"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South"
 msgstr "Güney"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South - Southwest"
 msgstr "Güney - Güneybatı"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Southwest"
 msgstr "Güneybatı"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Southwest"
 msgstr "Batı - Güneybatı"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West"
 msgstr "Batı"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West - Northwest"
 msgstr "Batı - Kuzeybatı"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "Northwest"
 msgstr "Kuzeybatı"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "North - Northwest"
 msgstr "Kuzey - Kuzeybatı"
 
 #. DRIZZLE
-#: my-evolution/metar.c:127
+#: my-evolution/metar.c:128
 msgid "Drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:128
+#: my-evolution/metar.c:129
 #, fuzzy
 msgid "Drizzle in the vicinity"
 msgstr "Yer yer yağmurlu"
 
-#: my-evolution/metar.c:129
+#: my-evolution/metar.c:130
 #, fuzzy
 msgid "Light drizzle"
 msgstr "Hafif yağmurlu"
 
-#: my-evolution/metar.c:130
+#: my-evolution/metar.c:131
 #, fuzzy
 msgid "Moderate drizzle"
 msgstr "Orta yağmur"
 
-#: my-evolution/metar.c:131
+#: my-evolution/metar.c:132
 #, fuzzy
 msgid "Heavy drizzle"
 msgstr "Ağır yağmur"
 
-#: 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
 #, fuzzy
 msgid "Partial drizzle"
 msgstr "Kısmi yağmurlu"
 
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
 #, fuzzy
 msgid "Thunderstorm"
 msgstr "Anderson"
 
-#: 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 "saat"
 
-#: my-evolution/metar.c:138
+#: my-evolution/metar.c:139
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:139
+#: my-evolution/metar.c:140
 #, fuzzy
 msgid "Freezing drizzle"
 msgstr "Dondurucu yağmur"
 
 #. RAIN
-#: my-evolution/metar.c:142
+#: my-evolution/metar.c:143
 msgid "Rain"
 msgstr "Yağmurlu"
 
-#: my-evolution/metar.c:143
+#: my-evolution/metar.c:144
 msgid "Rain in the vicinity"
 msgstr "Yer yer yağmurlu"
 
-#: my-evolution/metar.c:144
+#: my-evolution/metar.c:145
 msgid "Light rain"
 msgstr "Hafif yağmurlu"
 
-#: my-evolution/metar.c:145
+#: my-evolution/metar.c:146
 msgid "Moderate rain"
 msgstr "Orta yağmur"
 
-#: my-evolution/metar.c:146
+#: my-evolution/metar.c:147
 msgid "Heavy rain"
 msgstr "Ağır yağmur"
 
-#: 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 "Kısmi yağmurlu"
 
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:152
 #, fuzzy
 msgid "Blowing rainfall"
 msgstr "Kısmi yağmurlu"
 
-#: my-evolution/metar.c:152
+#: my-evolution/metar.c:153
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:153
+#: my-evolution/metar.c:154
 #, fuzzy
 msgid "Drifting rain"
 msgstr "Dondurucu yağmur"
 
-#: my-evolution/metar.c:154
+#: my-evolution/metar.c:155
 msgid "Freezing rain"
 msgstr "Dondurucu yağmur"
 
 #. SNOW
-#: my-evolution/metar.c:157
+#: my-evolution/metar.c:158
 msgid "Snow"
 msgstr "Karlı"
 
-#: my-evolution/metar.c:158
+#: my-evolution/metar.c:159
 msgid "Snow in the vicinity"
 msgstr "Yer yer kar yağışı"
 
-#: my-evolution/metar.c:159
+#: my-evolution/metar.c:160
 msgid "Light snow"
 msgstr "Hafif kar yağışı"
 
-#: my-evolution/metar.c:160
+#: my-evolution/metar.c:161
 msgid "Moderate snow"
 msgstr "Orta şiddette kar yağışı"
 
-#: my-evolution/metar.c:161
+#: my-evolution/metar.c:162
 msgid "Heavy snow"
 msgstr "Ağır kar yağışı"
 
-#: my-evolution/metar.c:162
+#: my-evolution/metar.c:163
 #, fuzzy
 msgid "Shallow snow"
 msgstr "Show Low"
 
-#: 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
 #, fuzzy
 msgid "Partial snowfall"
 msgstr "Kısmi yağmurlu"
 
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr "Kar fırtınası"
 
-#: my-evolution/metar.c:166
+#: my-evolution/metar.c:167
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:167
+#: my-evolution/metar.c:168
 #, fuzzy
 msgid "Snow showers"
 msgstr "Kar fırtınası"
 
-#: my-evolution/metar.c:168
+#: my-evolution/metar.c:169
 #, fuzzy
 msgid "Drifting snow"
 msgstr "Dondurucu kar"
 
-#: my-evolution/metar.c:169
+#: my-evolution/metar.c:170
 msgid "Freezing snow"
 msgstr "Dondurucu kar"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:172
+#: my-evolution/metar.c:173
 #, fuzzy
 msgid "Snow grains"
 msgstr "Ayrıntıları Göster"
 
-#: my-evolution/metar.c:173
+#: my-evolution/metar.c:174
 #, fuzzy
 msgid "Snow grains in the vicinity"
 msgstr "Yer yer kar yağışı"
 
-#: my-evolution/metar.c:174
+#: my-evolution/metar.c:175
 #, fuzzy
 msgid "Light snow grains"
 msgstr "Hafif kar yağışı"
 
-#: my-evolution/metar.c:175
+#: my-evolution/metar.c:176
 #, fuzzy
 msgid "Moderate snow grains"
 msgstr "Orta şiddette kar yağışı"
 
-#: my-evolution/metar.c:176
+#: my-evolution/metar.c:177
 #, fuzzy
 msgid "Heavy snow grains"
 msgstr "Ağır kar yağışı"
 
-#: 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
 #, fuzzy
 msgid "Partial snow grains"
 msgstr "Kısmi yağmurlu"
 
-#: 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
 #, fuzzy
 msgid "Drifting snow grains"
 msgstr "Açıklama içeriği"
 
-#: my-evolution/metar.c:184
+#: my-evolution/metar.c:185
 #, fuzzy
 msgid "Freezing snow grains"
 msgstr "Dondurucu kar"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:187
+#: my-evolution/metar.c:188
 msgid "Ice crystals"
 msgstr "Buzlanma"
 
-#: my-evolution/metar.c:188
+#: my-evolution/metar.c:189
 msgid "Ice crystals in the vicinity"
 msgstr "Yer yer buzlanma"
 
-#: my-evolution/metar.c:189
+#: my-evolution/metar.c:190
 msgid "Few ice crystals"
 msgstr "Az derecede buzlanma"
 
-#: my-evolution/metar.c:190
+#: my-evolution/metar.c:191
 msgid "Moderate ice crystals"
 msgstr "Orta derecede buzlanma"
 
-#: my-evolution/metar.c:191
+#: my-evolution/metar.c:192
 #, fuzzy
 msgid "Heavy ice crystals"
 msgstr "Az derecede buzlanma"
 
-#: my-evolution/metar.c:193
+#: my-evolution/metar.c:194
 #, fuzzy
 msgid "Patches of ice crystals"
 msgstr "Orta derecede buzlanma"
 
-#: my-evolution/metar.c:194
+#: my-evolution/metar.c:195
 #, fuzzy
 msgid "Partial ice crystals"
 msgstr "Orta derecede buzlanma"
 
-#: 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
 #, fuzzy
 msgid "Blowing ice crystals"
 msgstr "Az derecede buzlanma"
 
-#: my-evolution/metar.c:197
+#: my-evolution/metar.c:198
 #, fuzzy
 msgid "Showers of ice crystals"
 msgstr "Orta derecede buzlanma"
 
-#: my-evolution/metar.c:198
+#: my-evolution/metar.c:199
 #, fuzzy
 msgid "Drifting ice crystals"
 msgstr "Orta derecede buzlanma"
 
-#: my-evolution/metar.c:199
+#: my-evolution/metar.c:200
 #, fuzzy
 msgid "Freezing ice crystals"
 msgstr "Az derecede buzlanma"
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:202
+#: my-evolution/metar.c:203
 msgid "Ice pellets"
 msgstr "Buz peltesi"
 
-#: my-evolution/metar.c:203
+#: my-evolution/metar.c:204
 #, fuzzy
 msgid "Ice pellets in the vicinity"
 msgstr "Yer yer buzlanma"
 
-#: my-evolution/metar.c:204
+#: my-evolution/metar.c:205
 #, fuzzy
 msgid "Few ice pellets"
 msgstr "Buz peltesi"
 
-#: my-evolution/metar.c:205
+#: my-evolution/metar.c:206
 #, fuzzy
 msgid "Moderate ice pellets"
 msgstr "Orta derecede buzlanma"
 
-#: my-evolution/metar.c:206
+#: my-evolution/metar.c:207
 #, fuzzy
 msgid "Heavy ice pellets"
 msgstr "Buz peltesi"
 
-#: my-evolution/metar.c:207
+#: my-evolution/metar.c:208
 #, fuzzy
 msgid "Shallow ice pellets"
 msgstr "Buz peltesi"
 
-#: my-evolution/metar.c:208
+#: my-evolution/metar.c:209
 #, fuzzy
 msgid "Patches of ice pellets"
 msgstr "Buz peltesi"
 
-#: my-evolution/metar.c:209
+#: my-evolution/metar.c:210
 #, fuzzy
 msgid "Partial ice pellets"
 msgstr "Buz peltesi"
 
-#: my-evolution/metar.c:210
+#: my-evolution/metar.c:211
 #, fuzzy
 msgid "Ice pellet storm"
 msgstr "Buz peltesi"
 
-#: my-evolution/metar.c:211
+#: my-evolution/metar.c:212
 #, fuzzy
 msgid "Blowing ice pellets"
 msgstr "Buz peltesi"
 
-#: my-evolution/metar.c:212
+#: my-evolution/metar.c:213
 #, fuzzy
 msgid "Showers of ice pellets"
 msgstr "Buz peltesi"
 
-#: my-evolution/metar.c:213
+#: my-evolution/metar.c:214
 #, fuzzy
 msgid "Drifting ice pellets"
 msgstr "Buz peltesi"
 
-#: my-evolution/metar.c:214
+#: my-evolution/metar.c:215
 #, fuzzy
 msgid "Freezing ice pellets"
 msgstr "Buz peltesi"
 
-#: my-evolution/metar.c:218
+#: my-evolution/metar.c:219
 #, fuzzy
 msgid "Hail in the vicinity"
 msgstr "Yer yer yağmurlu"
 
-#: 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 "Hafif yağmurlu"
 
-#: my-evolution/metar.c:220
+#: my-evolution/metar.c:221
 #, fuzzy
 msgid "Moderate hail"
 msgstr "Orta yağmur"
 
-#: my-evolution/metar.c:221
+#: my-evolution/metar.c:222
 #, fuzzy
 msgid "Heavy hail"
 msgstr "Ağır yağmur"
 
-#: my-evolution/metar.c:222
+#: my-evolution/metar.c:223
 #, fuzzy
 msgid "Shallow hail"
 msgstr "Ayrıntıları Göster"
 
-#: 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 "Kısmi yağmurlu"
 
-#: my-evolution/metar.c:225
+#: my-evolution/metar.c:226
 #, fuzzy
 msgid "Hailstorm"
 msgstr "Hamilton"
 
-#: my-evolution/metar.c:226
+#: my-evolution/metar.c:227
 #, fuzzy
 msgid "Blowing hail"
 msgstr "Bellingham"
 
-#: my-evolution/metar.c:227
+#: my-evolution/metar.c:228
 #, fuzzy
 msgid "Hail showers"
 msgstr "Alt dizinler"
 
-#: my-evolution/metar.c:228
+#: my-evolution/metar.c:229
 #, fuzzy
 msgid "Drifting hail"
 msgstr "İleti Alınıyor"
 
-#: my-evolution/metar.c:229
+#: my-evolution/metar.c:230
 #, fuzzy
 msgid "Freezing hail"
 msgstr "Dondurucu yağmur"
 
 #. 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
 #, fuzzy
 msgid "Small hail in the vicinity"
 msgstr "Yer yer yağmurlu"
 
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:236
 #, fuzzy
 msgid "Moderate small hail"
 msgstr "Orta derecede sisli"
 
-#: my-evolution/metar.c:236
+#: my-evolution/metar.c:237
 #, fuzzy
 msgid "Heavy small hail"
 msgstr "Ağır yağmur"
 
-#: my-evolution/metar.c:237
+#: my-evolution/metar.c:238
 #, fuzzy
 msgid "Shallow small hail"
 msgstr "Tüm _görevleri göster"
 
-#: 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
 #, fuzzy
 msgid "Partial small hail"
 msgstr "Bölüm bölüm sisli"
 
-#: 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
 #, fuzzy
 msgid "Freezing small hail"
 msgstr "Dondurucu yağmur"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:247
+#: my-evolution/metar.c:248
 #, fuzzy
 msgid "Unknown precipitation"
 msgstr "Bilinmeyen Alarm Seçenekleri"
 
-#: my-evolution/metar.c:248
+#: my-evolution/metar.c:249
 #, fuzzy
 msgid "Precipitation in the vicinity"
 msgstr "Yer yer yağmurlu"
 
-#: my-evolution/metar.c:249
+#: my-evolution/metar.c:250
 #, fuzzy
 msgid "Light precipitation"
 msgstr "Hafif yağmurlu"
 
-#: my-evolution/metar.c:250
+#: my-evolution/metar.c:251
 #, fuzzy
 msgid "Moderate precipitation"
 msgstr "Orta yağmur"
 
-#: my-evolution/metar.c:251
+#: my-evolution/metar.c:252
 #, fuzzy
 msgid "Heavy precipitation"
 msgstr "Ağır yağmur"
 
-#: 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
 #, fuzzy
 msgid "Partial precipitation"
 msgstr "Kısmi yağmurlu"
 
-#: my-evolution/metar.c:255
+#: my-evolution/metar.c:256
 #, fuzzy
 msgid "Unknown thunderstorm"
 msgstr "Bilinmeyen hata"
 
-#: 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 "Dondurucu yağmur"
 
 #. MIST
-#: my-evolution/metar.c:262
+#: my-evolution/metar.c:263
 msgid "Mist"
 msgstr "Sisli"
 
-#: my-evolution/metar.c:263
+#: my-evolution/metar.c:264
 msgid "Mist in the vicinity"
 msgstr "Yer yer sisli"
 
-#: my-evolution/metar.c:264
+#: my-evolution/metar.c:265
 msgid "Light mist"
 msgstr "Hafif sisli"
 
-#: my-evolution/metar.c:265
+#: my-evolution/metar.c:266
 msgid "Moderate mist"
 msgstr "Orta derecede sisli"
 
-#: my-evolution/metar.c:266
+#: my-evolution/metar.c:267
 msgid "Thick mist"
 msgstr "Kalın sisli"
 
-#: my-evolution/metar.c:267
+#: my-evolution/metar.c:268
 #, fuzzy
 msgid "Shallow mist"
 msgstr "Challis"
 
-#: 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 "Bölüm bölüm sisli"
 
-#: my-evolution/metar.c:271
+#: my-evolution/metar.c:272
 #, fuzzy
 msgid "Mist with wind"
 msgstr "Yer yer sisli"
 
-#: my-evolution/metar.c:273
+#: my-evolution/metar.c:274
 #, fuzzy
 msgid "Drifting mist"
 msgstr "E-posta listesi"
 
-#: my-evolution/metar.c:274
+#: my-evolution/metar.c:275
 #, fuzzy
 msgid "Freezing mist"
 msgstr "Dondurucu yağmur"
 
 #. FOG
-#: my-evolution/metar.c:277
+#: my-evolution/metar.c:278
 msgid "Fog"
 msgstr ""
 
-#: my-evolution/metar.c:278
+#: my-evolution/metar.c:279
 #, fuzzy
 msgid "Fog in the vicinity"
 msgstr "Yer yer kar yağışı"
 
-#: my-evolution/metar.c:279
+#: my-evolution/metar.c:280
 #, fuzzy
 msgid "Light fog"
 msgstr "Hafif kar yağışı"
 
-#: my-evolution/metar.c:280
+#: my-evolution/metar.c:281
 #, fuzzy
 msgid "Moderate fog"
 msgstr "Orta şiddette kar yağışı"
 
-#: my-evolution/metar.c:281
+#: my-evolution/metar.c:282
 #, fuzzy
 msgid "Thick fog"
 msgstr "Kalın sisli"
 
-#: my-evolution/metar.c:282
+#: my-evolution/metar.c:283
 #, fuzzy
 msgid "Shallow fog"
 msgstr "Show Low"
 
-#: 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
 #, fuzzy
 msgid "Partial fog"
 msgstr "Bölüm bölüm sisli"
 
-#: my-evolution/metar.c:286
+#: my-evolution/metar.c:287
 #, fuzzy
 msgid "Fog with wind"
 msgstr "Bu pencereyi kapat"
 
-#: my-evolution/metar.c:288
+#: my-evolution/metar.c:289
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:289
+#: my-evolution/metar.c:290
 #, fuzzy
 msgid "Freezing fog"
 msgstr "Dondurucu kar"
 
 #. SMOKE
-#: my-evolution/metar.c:292
+#: my-evolution/metar.c:293
 #, fuzzy
 msgid "Smoke"
 msgstr "Spokane"
 
-#: my-evolution/metar.c:293
+#: my-evolution/metar.c:294
 #, fuzzy
 msgid "Smoke in the vicinity"
 msgstr "Yer yer kar yağışı"
 
-#: my-evolution/metar.c:294
+#: my-evolution/metar.c:295
 #, fuzzy
 msgid "Thin smoke"
 msgstr "China Lake"
 
-#: my-evolution/metar.c:295
+#: my-evolution/metar.c:296
 #, fuzzy
 msgid "Moderate smoke"
 msgstr "Orta şiddette kar yağışı"
 
-#: my-evolution/metar.c:296
+#: my-evolution/metar.c:297
 #, fuzzy
 msgid "Thick smoke"
 msgstr "Kalın sisli"
 
-#: 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
 #, fuzzy
 msgid "Partial smoke"
 msgstr "Bölüm bölüm sisli"
 
-#: 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 "Bu pencereyi kapat"
 
-#: 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 "Volkanik kül"
 
-#: my-evolution/metar.c:308
+#: my-evolution/metar.c:309
 msgid "Volcanic ash in the vicinity"
 msgstr "Yer yer volkanik kül"
 
-#: my-evolution/metar.c:310
+#: my-evolution/metar.c:311
 msgid "Moderate volcanic ash"
 msgstr "Orta derecede volkanik kül"
 
-#: my-evolution/metar.c:311
+#: my-evolution/metar.c:312
 msgid "Thick volcanic ash"
 msgstr "Kalın volkanik kül"
 
-#: my-evolution/metar.c:312
+#: my-evolution/metar.c:313
 #, fuzzy
 msgid "Shallow volcanic ash"
 msgstr "Kısmi volkanik kül"
 
-#: my-evolution/metar.c:313
+#: my-evolution/metar.c:314
 #, fuzzy
 msgid "Patches of volcanic ash"
 msgstr "Kısmi volkanik kül"
 
-#: my-evolution/metar.c:314
+#: my-evolution/metar.c:315
 msgid "Partial volcanic ash"
 msgstr "Kısmi volkanik kül"
 
-#: my-evolution/metar.c:315
+#: my-evolution/metar.c:316
 #, fuzzy
 msgid "Thunderous volcanic ash"
 msgstr "Kalın volkanik kül"
 
-#: my-evolution/metar.c:316
+#: my-evolution/metar.c:317
 #, fuzzy
 msgid "Blowing volcanic ash"
 msgstr "Kalın volkanik kül"
 
-#: my-evolution/metar.c:317
+#: my-evolution/metar.c:318
 #, fuzzy
 msgid "Showers of volcanic ash"
 msgstr "Orta derecede volkanik kül"
 
-#: my-evolution/metar.c:318
+#: my-evolution/metar.c:319
 #, fuzzy
 msgid "Drifting volcanic ash"
 msgstr "Kısmi volkanik kül"
 
-#: my-evolution/metar.c:319
+#: my-evolution/metar.c:320
 #, fuzzy
 msgid "Freezing volcanic ash"
 msgstr "Kısmi volkanik kül"
 
 #. SAND
-#: my-evolution/metar.c:322
+#: my-evolution/metar.c:323
 msgid "Sand"
 msgstr "Kumlu"
 
-#: my-evolution/metar.c:323
+#: my-evolution/metar.c:324
 #, fuzzy
 msgid "Sand in the vicinity"
 msgstr "Yer yer yağmurlu"
 
-#: my-evolution/metar.c:324
+#: my-evolution/metar.c:325
 #, fuzzy
 msgid "Light sand"
 msgstr "Hafif yağmurlu"
 
-#: my-evolution/metar.c:325
+#: my-evolution/metar.c:326
 #, fuzzy
 msgid "Moderate sand"
 msgstr "Orta şiddette kar yağışı"
 
-#: my-evolution/metar.c:326
+#: my-evolution/metar.c:327
 #, fuzzy
 msgid "Heavy sand"
 msgstr "Ağır yağmur"
 
-#: 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
 #, fuzzy
 msgid "Partial sand"
 msgstr "Bölüm bölüm sisli"
 
-#: my-evolution/metar.c:331
+#: my-evolution/metar.c:332
 #, fuzzy
 msgid "Blowing sand"
 msgstr "Block Island"
 
-#: my-evolution/metar.c:333
+#: my-evolution/metar.c:334
 #, fuzzy
 msgid "Drifting sand"
 msgstr "Barking Sand"
 
 #. HAZE
-#: my-evolution/metar.c:337
+#: my-evolution/metar.c:338
 #, fuzzy
 msgid "Haze"
 msgstr "Havre"
 
-#: my-evolution/metar.c:338
+#: my-evolution/metar.c:339
 #, fuzzy
 msgid "Haze in the vicinity"
 msgstr "Yer yer yağmurlu"
 
-#: my-evolution/metar.c:339
+#: my-evolution/metar.c:340
 #, fuzzy
 msgid "Light haze"
 msgstr "Hafif yağmurlu"
 
-#: my-evolution/metar.c:340
+#: my-evolution/metar.c:341
 #, fuzzy
 msgid "Moderate haze"
 msgstr "Orta yağmur"
 
-#: my-evolution/metar.c:341
+#: my-evolution/metar.c:342
 #, fuzzy
 msgid "Thick haze"
 msgstr "Kalın sisli"
 
-#: 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
 #, fuzzy
 msgid "Partial haze"
 msgstr "Bölüm bölüm sisli"
 
-#: 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
 #, fuzzy
 msgid "Drifting haze"
 msgstr "Dillingham"
 
-#: my-evolution/metar.c:349
+#: my-evolution/metar.c:350
 #, fuzzy
 msgid "Freezing haze"
 msgstr "Dondurucu yağmur"
 
 #. SPRAY
-#: my-evolution/metar.c:352
+#: my-evolution/metar.c:353
 #, fuzzy
 msgid "Spray"
 msgstr "Cumartesi"
 
-#: my-evolution/metar.c:353
+#: my-evolution/metar.c:354
 #, fuzzy
 msgid "Spray in the vicinity"
 msgstr "Yer yer kar yağışı"
 
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
 #, fuzzy
 msgid "Light spray"
 msgstr "Hafif yağmurlu"
 
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
 #, fuzzy
 msgid "Moderate spray"
 msgstr "Orta yağmur"
 
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
 #, fuzzy
 msgid "Heavy spray"
 msgstr "Ağır yağmur"
 
-#: 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
 #, fuzzy
 msgid "Partial spray"
 msgstr "Bölüm bölüm sisli"
 
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
 #, fuzzy
 msgid "Blowing spray"
 msgstr "Bowling Green"
 
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
 msgid "Drifting spray"
 msgstr ""
 
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
 #, fuzzy
 msgid "Freezing spray"
 msgstr "Dondurucu yağmur"
 
 #. 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
 #, fuzzy
 msgid "Dust in the vicinity"
 msgstr "Yer yer sisli"
 
-#: my-evolution/metar.c:369
+#: my-evolution/metar.c:370
 #, fuzzy
 msgid "Light dust"
 msgstr "Hafif sisli"
 
-#: my-evolution/metar.c:370
+#: my-evolution/metar.c:371
 #, fuzzy
 msgid "Moderate dust"
 msgstr "Orta derecede sisli"
 
-#: my-evolution/metar.c:371
+#: my-evolution/metar.c:372
 #, fuzzy
 msgid "Heavy dust"
 msgstr "Ağır kar yağışı"
 
-#: 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
 #, fuzzy
 msgid "Partial dust"
 msgstr "Bölüm bölüm sisli"
 
-#: my-evolution/metar.c:376
+#: my-evolution/metar.c:377
 #, fuzzy
 msgid "Blowing dust"
 msgstr "Bloomington"
 
-#: 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
 #, fuzzy
 msgid "Squall"
 msgstr "Aquadilla"
 
-#: my-evolution/metar.c:383
+#: my-evolution/metar.c:384
 #, fuzzy
 msgid "Squall in the vicinity"
 msgstr "Yer yer yağmurlu"
 
-#: my-evolution/metar.c:384
+#: my-evolution/metar.c:385
 #, fuzzy
 msgid "Light squall"
 msgstr "Hafif kar yağışı"
 
-#: my-evolution/metar.c:385
+#: my-evolution/metar.c:386
 #, fuzzy
 msgid "Moderate squall"
 msgstr "Orta derecede sisli"
 
-#: my-evolution/metar.c:386
+#: my-evolution/metar.c:387
 #, fuzzy
 msgid "Heavy squall"
 msgstr "Ağır kar yağışı"
 
-#: my-evolution/metar.c:389
+#: my-evolution/metar.c:390
 #, fuzzy
 msgid "Partial squall"
 msgstr "Kısmi yağmurlu"
 
-#: 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
 #, fuzzy
 msgid "Freezing squall"
 msgstr "Dondurucu yağmur"
 
 #. SANDSTORM
-#: my-evolution/metar.c:397
+#: my-evolution/metar.c:398
 #, fuzzy
 msgid "Sandstorm"
 msgstr "Kar fırtınası"
 
-#: my-evolution/metar.c:398
+#: my-evolution/metar.c:399
 #, fuzzy
 msgid "Sandstorm in the vicinity"
 msgstr "Yer yer kar yağışı"
 
-#: my-evolution/metar.c:399
+#: my-evolution/metar.c:400
 #, fuzzy
 msgid "Light standstorm"
 msgstr "Dondurucu toz fırtınası"
 
-#: my-evolution/metar.c:400
+#: my-evolution/metar.c:401
 #, fuzzy
 msgid "Moderate sandstorm"
 msgstr "Orta şiddette kar yağışı"
 
-#: my-evolution/metar.c:401
+#: my-evolution/metar.c:402
 #, fuzzy
 msgid "Heavy sandstorm"
 msgstr "Ağır kar yağışı"
 
-#: my-evolution/metar.c:402
+#: my-evolution/metar.c:403
 #, fuzzy
 msgid "Shallow sandstorm"
 msgstr "Kar fırtınası"
 
-#: my-evolution/metar.c:404
+#: my-evolution/metar.c:405
 #, fuzzy
 msgid "Partial sandstorm"
 msgstr "Bölüm bölüm sisli"
 
-#: my-evolution/metar.c:405
+#: my-evolution/metar.c:406
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:406
+#: my-evolution/metar.c:407
 #, fuzzy
 msgid "Blowing sandstorm"
 msgstr "Dondurucu toz fırtınası"
 
-#: my-evolution/metar.c:408
+#: my-evolution/metar.c:409
 #, fuzzy
 msgid "Drifting sandstorm"
 msgstr "Dondurucu toz fırtınası"
 
-#: my-evolution/metar.c:409
+#: my-evolution/metar.c:410
 msgid "Freezing sandstorm"
 msgstr "Dondurucu toz 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
 #, fuzzy
 msgid "Duststorm in the vicinity"
 msgstr "Yer yer sisli"
 
-#: my-evolution/metar.c:414
+#: my-evolution/metar.c:415
 #, fuzzy
 msgid "Light duststorm"
 msgstr "Toz fırtınası"
 
-#: my-evolution/metar.c:415
+#: my-evolution/metar.c:416
 #, fuzzy
 msgid "Moderate duststorm"
 msgstr "Orta derecede sisli"
 
-#: my-evolution/metar.c:416
+#: my-evolution/metar.c:417
 #, fuzzy
 msgid "Heavy duststorm"
 msgstr "Toz fırtınası"
 
-#: my-evolution/metar.c:417
+#: my-evolution/metar.c:418
 #, fuzzy
 msgid "Shallow duststorm"
 msgstr "Toz fırtınası"
 
-#: my-evolution/metar.c:419
+#: my-evolution/metar.c:420
 #, fuzzy
 msgid "Partial duststorm"
 msgstr "Bölüm bölüm sisli"
 
-#: my-evolution/metar.c:420
+#: my-evolution/metar.c:421
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:421
+#: my-evolution/metar.c:422
 #, fuzzy
 msgid "Blowing duststorm"
 msgstr "Toz fırtınası"
 
-#: my-evolution/metar.c:423
+#: my-evolution/metar.c:424
 #, fuzzy
 msgid "Drifting duststorm"
 msgstr "Toz fırtınası"
 
-#: my-evolution/metar.c:424
+#: my-evolution/metar.c:425
 #, fuzzy
 msgid "Freezing duststorm"
 msgstr "Dondurucu toz fırtınası"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
+#: my-evolution/metar.c:428
 #, fuzzy
 msgid "Funnel cloud"
 msgstr "Az bulutlu"
 
-#: my-evolution/metar.c:428
+#: my-evolution/metar.c:429
 #, fuzzy
 msgid "Funnel cloud in the vicinity"
 msgstr "Yer yer kar yağışı"
 
-#: 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
 #, fuzzy
 msgid "Moderate funnel cloud"
 msgstr "Orta şiddette kar yağışı"
 
-#: 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 "Kasırga"
 
-#: my-evolution/metar.c:443
+#: my-evolution/metar.c:444
 msgid "Tornado in the vicinity"
 msgstr "Yer yer kasırga"
 
-#: my-evolution/metar.c:445
+#: my-evolution/metar.c:446
 msgid "Moderate tornado"
 msgstr "Orta şiddette kasırga"
 
-#: my-evolution/metar.c:446
+#: my-evolution/metar.c:447
 #, fuzzy
 msgid "Raging tornado"
 msgstr "Orta şiddette kasırga"
 
-#: my-evolution/metar.c:449
+#: my-evolution/metar.c:450
 #, fuzzy
 msgid "Partial tornado"
 msgstr "Kısmi yağmurlu"
 
-#: my-evolution/metar.c:450
+#: my-evolution/metar.c:451
 #, fuzzy
 msgid "Thunderous tornado"
 msgstr "Orta şiddette kasırga"
 
-#: my-evolution/metar.c:453
+#: my-evolution/metar.c:454
 #, fuzzy
 msgid "Drifting tornado"
 msgstr "Orta şiddette kasırga"
 
-#: my-evolution/metar.c:454
+#: my-evolution/metar.c:455
 #, fuzzy
 msgid "Freezing tornado"
 msgstr "Dondurucu kar"
 
 #. 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
 #, fuzzy
 msgid "Dust whirls in the vicinity"
 msgstr "Yer yer sisli"
 
-#: 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
 #, fuzzy
 msgid "Moderate dust whirls"
 msgstr "Orta şiddette kar yağışı"
 
-#: 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
 #, fuzzy
 msgid "Partial dust whirls"
 msgstr "Bölüm bölüm sisli"
 
-#: 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 ""
 
@@ -24915,31 +25192,33 @@ msgstr "_Zamanlama"
 msgid "_Weather"
 msgstr "_Hava Durumu"
 
-#: 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 "Evolution Shell"
+msgstr "Evolution kabuğu."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "E-posta özet bileşen mimarisi"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
 msgid "Folder Settings"
 msgstr "Dizin Ayarları"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "The Evolution shell."
-msgstr "Evolution kabuğu."
-
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr "Ayrıntıları Göster"
 
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
 msgid "Cancel Operation"
 msgstr "İşlemi İ_ptal Et"
 
-#: shell/e-folder-dnd-bridge.c:53
+#: shell/e-folder-dnd-bridge.c:55
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24948,55 +25227,37 @@ msgstr ""
 "Dizin aktarılamadı:\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
 #, c-format
 msgid "\"%s\" in \"%s\""
 msgstr ""
 
-#: shell/e-folder-list.c:312
+#: shell/e-folder-list.c:338
 msgid "Add a Folder"
 msgstr "Dizin Ekle"
 
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: 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 "Gelen"
 
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:181
 msgid "Outbox"
 msgstr "Giden"
 
-#: shell/e-local-storage.c:181
+#: shell/e-local-storage.c:182
 msgid "Sent"
 msgstr "Gönderilen"
 
-#: shell/e-setup.c:126
-msgid "Evolution installation"
-msgstr "Evolution kurulumu"
-
-#: shell/e-setup.c:130
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Evolution'un bu yeni sürümü kişisel Evolution dizinine ek dosya\n"
-"yerleştirilmesini gerektirir."
-
-#: shell/e-setup.c:131
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Dosyaları kurmak için \"Tamam\" düğmesine, ya da işlemi durdurmak için "
-"\"İptal\" düğmesine tıklayın."
-
-#: shell/e-setup.c:171
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "Dosyalar düzgün bir şekilde güncellenemedi"
 
-#: shell/e-setup.c:194
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -25007,7 +25268,7 @@ msgstr ""
 "\n"
 "Hata: %s"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -25016,40 +25277,7 @@ msgstr ""
 "Dosyalar aşağıdaki dizine kopyalanırken hata oluştu\n"
 "`%s'."
 
-#: shell/e-setup.c:282
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Evolution aşağıdaki dizini oluşturamadı:\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 dizini\n"
-"doğru izinlere sahip değil. Öncelikle bu dizini\n"
-"okunabilir ve yazılabilir yapın, daha sonra Evolution'u çalıştırın."
-
-#: 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 dosyası\n"
-"Evolution programının düzgün çalışabilmesi için silinmelidir.\n"
-"Lütfen bu dosyayı silin ve Evolution'u yeniden çalıştırın."
-
-#: shell/e-setup.c:329
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -25060,16 +25288,7 @@ msgstr ""
 "Evolution kullanıcı dosyalarının yüklenmesi\n"
 "bunu silmelisiniz."
 
-#: 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"
@@ -25084,25 +25303,25 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Yazarlar"
 
-#: shell/e-shell-config-autocompletion.c:106
+#: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
 msgstr "Tamamlanma Tarihi"
 
-#: shell/e-shell-config-default-folders.c:133
+#: shell/e-shell-config-default-folders.c:149
 msgid "Select Default Folder"
 msgstr "Öntanımlı Dizini Seçin"
 
-#: shell/e-shell-config-folder-settings.c:71
+#: shell/e-shell-config-folder-settings.c:70
 msgid "Default Folders"
 msgstr "Öntanımlı Dizinler"
 
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
 #, fuzzy
 msgid "Offline Folders"
 msgstr "Dizin filtreleniyor"
 
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 msgid "Autocompletion Folders"
 msgstr "Otomatik Tamamlama Dizini"
 
@@ -25111,43 +25330,43 @@ msgstr "Otomatik Tamamlama Dizini"
 msgid "Cannot copy folder: %s"
 msgstr "Dizin kopyalanamadı: %s"
 
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
 #, c-format
 msgid "Cannot move folder: %s"
 msgstr "Dizin taşınamadı: %s"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr "Bir dizin kendi üzerine taşınamaz."
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr "Bir dizin üzerine kopyalanamaz."
 
-#: shell/e-shell-folder-commands.c:206
+#: shell/e-shell-folder-commands.c:204
 #, fuzzy
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Bir dizin kendi üzerine taşınamaz."
 
-#: 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\" dizinini kopyalamak için bir dizin adı verin:"
 
-#: shell/e-shell-folder-commands.c:325
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr "Dizini kopyala"
 
-#: 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\" dizinini taşımak için bir dizin adı verin:"
 
-#: shell/e-shell-folder-commands.c:369
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "Dizini taşı"
 
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25156,17 +25375,17 @@ msgstr ""
 "Dizin silinemedi:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:406
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Sil: \"%s\""
-
-#: shell/e-shell-folder-commands.c:407
+#: shell/e-shell-folder-commands.c:405
 #, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "Gerçekten \"%s\" dizini silinsin mi?"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:412
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Sil: \"%s\""
+
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25175,26 +25394,26 @@ msgstr ""
 "Dizin yeniden adlandırılamadı:\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\" dizinini yeniden adlandır:"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr "Dizini yeniden adlandır"
 
-#: 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 "Bu dizin adı geçersiz: %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 "Seçilen dizin başka bir kullanıcıya ait değil"
 
-#: shell/e-shell-folder-commands.c:589
+#: shell/e-shell-folder-commands.c:586
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25203,7 +25422,7 @@ msgstr ""
 "Dizin silinemedi:\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"
@@ -25212,23 +25431,19 @@ msgstr ""
 "Belirlenen dizin yaratılamadı:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:308
 msgid "Create New Folder"
 msgstr "Yeni Bir Dizin Yarat"
 
-#: shell/e-shell-folder-selection-dialog.c:393
-msgid "New..."
-msgstr "Yeni..."
-
-#: shell/e-shell-folder-title-bar.c:637 shell/e-shell-folder-title-bar.c:638
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(isimsiz)"
 
-#: 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"
@@ -25242,11 +25457,11 @@ msgstr ""
 "Eğer dosya türünü bilmiyorsanız \"Otomatik\" seçeneğini işaretleyin. Bu "
 "durumda Evolution dosya türünü bulmaya çalışacaktı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 ""
 
-#: 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"
@@ -25255,21 +25470,21 @@ msgstr ""
 "%s alınıyor\n"
 "%d öğesi alınıyor."
 
-#: shell/e-shell-importer.c:355
+#: shell/e-shell-importer.c:351
 msgid "Select importer"
 msgstr "Aktarıcıyı Seçin"
 
-#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "%s dosyası bulunamadı."
 
-#: 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 Hatası"
 
-#: 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"
@@ -25278,11 +25493,11 @@ msgstr ""
 "Bunu açabilecek hiç bir filtre bulunamadı:\n"
 "%s"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "Alınıyor"
 
-#: shell/e-shell-importer.c:522
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25291,17 +25506,17 @@ msgstr ""
 "%s alınıyor.\n"
 "%s başlatılıyor"
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "%s başlatırken hata oluştu"
 
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "%s yüklenirken hata oluştu"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25310,32 +25525,32 @@ msgstr ""
 "%s alınıyor\n"
 "1. öğe alınıyor."
 
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Dosya adı:"
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Bir dosya seçin"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Dosya türü:"
 
-#: shell/e-shell-importer.c:716
+#: shell/e-shell-importer.c:710
 #, fuzzy
 msgid "Import data and settings from older programs"
 msgstr "Diğer programlardan veri al"
 
-#: shell/e-shell-importer.c:720
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "Tek dosya aktar"
 
-#: 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"
@@ -25343,32 +25558,32 @@ msgstr ""
 "Lütfen bekleyiniz...\n"
 "Mevcut ayarlar aranıyor"
 
-#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Akıllı Aktarımcılar Başlatılıyor"
 
-#: 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 "Dizini 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 veriyi almak için hedef dizin 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 "Aktar"
 
-#: shell/e-shell-offline-handler.c:582
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "Bağlantılar kesiliyor..."
 
-#: shell/e-shell-offline-sync.c:161
+#: shell/e-shell-offline-sync.c:163
 #, fuzzy, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
@@ -25377,36 +25592,44 @@ msgstr ""
 "'%s' sırasında hata:\n"
 "%s"
 
-#: shell/e-shell-offline-sync.c:239
+#: shell/e-shell-offline-sync.c:232
 #, fuzzy
 msgid "Syncing Folder"
 msgstr "Dizin eşzamanlı hale getiriliyor"
 
 #. 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:327
+#: shell/e-shell-settings-dialog.c:345
 msgid "Evolution Settings"
 msgstr "Evolution Ayarları"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:362
+#. 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 "Lütfen bir sunucu seçiniz."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 msgid "Opening Folder"
 msgstr "Dizin Açılıyor"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:369
+#: shell/e-shell-shared-folder-picker-dialog.c:380
 #, c-format
 msgid "Opening Folder \"%s\""
 msgstr "\"%s\" Dizini Açılıyor"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:374
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, c-format
 msgid "in \"%s\" ..."
 msgstr "%s içinde..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:460
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Paylaşımlı dizin açılamadı: %s"
@@ -25415,115 +25638,111 @@ msgstr "Paylaşımlı dizin açılamadı: %s"
 msgid "Cannot find the specified shared folder."
 msgstr "Belirlenen paylaşımlı dizin açılamadı."
 
-#: shell/e-shell-startup-wizard.c:159
-#, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-"Evolution Posta Asistanı arayüzü başlatılamadı\n"
-"(%s)"
-
-#: shell/e-shell-startup-wizard.c:169
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "Evolution Posta Asistanı arayüzü başlatılamadı\n"
-
-#: shell/e-shell-user-creatable-items-handler.c:583
-#: shell/e-shell-user-creatable-items-handler.c:637
-#: ui/evolution-addressbook.h:14 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 "Dizin adı belirtilmedi"
 
-#: shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr "Dizin içinde yeni satır karakteri bulunamaz."
 
-#: shell/e-shell-utils.c:127
-msgid "Folder name cannot contain slashes."
-msgstr "Dizin içinde bölü karakteri bulunamaz."
+#: shell/e-shell-utils.c:129
+#, fuzzy
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "Dizin içinde yeni satır karakteri bulunamaz."
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "Dizin içinde yeni satır karakteri bulunamaz."
+
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ve '..' dizin isimleri için ayrılmıştı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 "Bu sistemde GNOME Pilot araçları kurulu değil."
 
-#: shell/e-shell-view-menu.c:102
+#: shell/e-shell-view-menu.c:97
 #, c-format
 msgid "Error executing %s."
 msgstr "%s çalıştırırken bir hata oldu."
 
-#: shell/e-shell-view-menu.c:196
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug-buddy $PATH dizininde bulunamadı."
+#: shell/e-shell-view-menu.c:193
+#, fuzzy
+msgid "Bug buddy is not installed."
+msgstr "Bug-buddy çalıştırılamadı."
 
-#: shell/e-shell-view-menu.c:204
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy çalıştırılamadı."
 
-#: shell/e-shell-view-menu.c:248
+#: shell/e-shell-view-menu.c:247
 msgid "About Ximian Evolution"
 msgstr "Ximian Evolution Hakkında"
 
-#: shell/e-shell-view-menu.c:503
+#: shell/e-shell-view-menu.c:502
 msgid "Go to folder..."
 msgstr "Dizine git..."
 
-#: 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çmak istediğiniz dizini seçin"
 
-#: shell/e-shell-view-menu.c:625
+#: shell/e-shell-view-menu.c:617
 msgid "Create New Shortcut"
 msgstr "Yeni Bir Kısayol 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 "Kısayolu işaret etmek istediğiniz dizini seçin:"
 
-#: shell/e-shell-view-menu.c:788
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr "Ç_evrimiçi Çalış"
 
-#: 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 "Çe_vrimdışı Çalış"
 
-#: 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 "Çevrimdışı Çalış"
 
-#: shell/e-shell-view.c:226
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "(dizin gösterilmiyor)"
 
-#: 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 "(Hiçbiri)"
 
-#: shell/e-shell-view.c:1910
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
+#: shell/e-shell-view.c:2091
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution çevrimiçi çlışıyor. Bu düğmeye tıklayarak çevrimdışı "
 "çalışmasını sağlayı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 çevrimdışı çalışmak üzere hazırlanıyor."
 
-#: shell/e-shell-view.c:1923
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
+#: shell/e-shell-view.c:2104
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution çevrimdışı çalışıyor. Bu düğmeye tıklayarak çevrimiçi "
 "çalışmasını sağlayın."
@@ -25540,12 +25759,12 @@ msgstr ""
 "Etkinleştirme sisteminden gelen mesaj:\n"
 "%s"
 
-#: shell/e-shell.c:739
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Yerel kayıt kurulamadı -- %s"
 
-#: shell/e-shell.c:1877
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25553,148 +25772,142 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2178
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Geçersiz argümanlar"
 
-#: shell/e-shell.c:2180
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "OAF'a kayıt yapılamadı"
 
-#: shell/e-shell.c:2182
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "Yapılandırma Veritabanı bulunamadı"
 
-#: shell/e-shell.c:2184 shell/e-storage.c:571
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Genel hata"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:80
 msgid "Create new shortcut group"
 msgstr "Yeni bir kısayol grubu yarat"
 
-#: shell/e-shortcuts-view.c:77
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
 msgstr "Grup 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 ""
 "Kısayol çubuğundan `%s' grubunu \n"
 "kaldırmak istiyor musunuz?"
 
-#: shell/e-shortcuts-view.c:178
-msgid "Don't remove"
-msgstr "Silme"
-
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr "Kısayol Grubunu Yeniden İsimlendir"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr "Seçili kısayol grubunu yeniden isimlendir:"
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "_Küçük Simgeler"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr "Kısayolları küçük simgeler olarak göster"
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr "_Büyük Simgeler"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr "Kısayolları büyük simgeler olarak göster"
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr "Yeni _Grup..."
 
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr "Yeni bir kısayol grubu yarat"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
 msgstr "B_u Grubu Sil..."
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr "Bu kısayol grubunu sil"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
 msgstr "_Bu Grubu Yeniden Adlandır..."
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr "Bu kısayol grubunu yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr "Kısayol Çubuğunu _Gizle"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr "Kısayol çubuğunu gizle"
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:281
 msgid "Create _Default Shortcuts"
 msgstr "Ö_ntanımlı Kısayolları Oluştur"
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:282
 msgid "Create Default Shortcuts"
 msgstr "Öntanımlı Kısayolları Oluştur"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr "Kısayolu yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr "Seçili kısayolları yeniden isimlendir:"
 
-#: shell/e-shortcuts-view.c:408
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr "Bu kısayola bağlı dizini 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 "Y_eni Pencerede 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 kısayola bağlı dizini yeni pencerede aç"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr "_Yeniden adlandır"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr "Bu kısayolu yeniden isimlendir"
 
-#: 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 kısayolu kısayol çubuğundan sil"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr "Kısayolları kaydederken hata oldu."
 
-#: shell/e-shortcuts.c:1080
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr "Kısayollar"
 
@@ -25702,73 +25915,73 @@ msgstr "Kısayollar"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:569
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "Hata yok"
 
-#: shell/e-storage.c:573
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr "Aynı isimli bir dizin zaten var"
 
-#: shell/e-storage.c:575
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr "Belirtilen dizin türü geçerli değildir"
 
-#: shell/e-storage.c:577
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "G/Ç hatası"
 
-#: shell/e-storage.c:579
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr "Dizin yaratmak için gerekli disk alanı yok"
 
-#: shell/e-storage.c:581
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr "Dizin boş değil"
 
-#: shell/e-storage.c:583
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr "Belirtilen dizin bulunamadı"
 
-#: shell/e-storage.c:585
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr "Fonksiyon desteklenmiyor"
 
-#: shell/e-storage.c:589
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr "İşlem desteklenmiyor"
 
-#: shell/e-storage.c:591
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr "Bu kayıtta belirtilen tip desteklenmiyor"
 
-#: shell/e-storage.c:593
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr "Belirtilen dizin düzenlenemedi ya da silinemedi"
 
-#: 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 "Bu isimde bir dizin yaratılamadı"
 
-#: 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 tamamlandı)"
 
-#: shell/evolution-folder-selector-button.c:94
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<bir dizin seçmek için tıklayın>"
 
@@ -25809,85 +26022,82 @@ msgstr ""
 "Etkinleştirme sisteminden gelen mesaj:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1145
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "CORBA hatası"
 
-#: shell/evolution-shell-component.c:1147
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Kesintiye uğradı"
 
-#: shell/evolution-shell-component.c:1149
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Geçersiz argüman"
 
-#: 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 "Sahibi yok"
 
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Bulunamadı"
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Desteklenmeyen tür"
 
-#: shell/evolution-shell-component.c:1159
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Desteklenmeyen şema"
 
-#: shell/evolution-shell-component.c:1161
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Desteklenmeyen işlem"
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "İç hata"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Bulunur"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "Geçersiz URI"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Alt dizinler"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Hiç boş alan kalmadı"
 
-#: 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 "Test türü"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr "Etkin bağlantılar"
+#: shell/evolution-test-component.c:703
+#, fuzzy
+msgid "Evolution Test Component"
+msgstr "Evolution e-posta programı."
 
-#: 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ı kapatmak ve İnternet bağlantısını ayırmak için Tamam "
 "düğmesine tıklayın"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "Makina"
-
-#: 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 "Halen aşağıdaki bağlantılar etkin durumda:"
 
@@ -25907,15 +26117,15 @@ msgstr "İ_leti:"
 msgid "_Tasks:"
 msgstr "_Görevler:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder name:"
 msgstr "Dizin 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 "Dizin türü:"
 
-#: 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 "Dizinin nerede yaratılacağını belirtin:"
 
@@ -25935,29 +26145,30 @@ msgstr "_Dizin Adı:"
 msgid "_User:"
 msgstr "_Kullanıcı:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Kurulum Yardımcısı"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Dosyalar Alınıyor"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Zaman Dilimi "
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Hoşgeldiniz"
 
-#: 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'a hoşgeldiniz. Biraz sonra göreceğiniz bir kaç ekran,\n"
 "Evolution'un e-posta hesaplarınıza erişmesi ve diğer uygulamalardan\n"
@@ -25965,12 +26176,13 @@ msgstr ""
 "\n"
 "Lütfen devam etmek için \"İleri\" düğmesine tıklayı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'u kurmak için gereken tüm bilgileri girdiniz.\n"
 "\n"
@@ -26009,182 +26221,158 @@ msgstr ""
 "Evolution dosya aktarma yardımcı programına hoşgeldiniz\n"
 "Bu sihirbaz ile harici dosyaları Evolution'a dahil edebileceksiniz."
 
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
 msgid "Importers"
 msgstr "Alıcılar"
 
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Alma"
 
-#: shell/importer/intelligent.c:198
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Tekrar sorma"
 
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution, aşağıdaki dosyalardan veri alabilir:"
 
-#: shell/main.c:98
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:104
+#: shell/main.c:118
 msgid "Evolution is now exiting ..."
 msgstr "Evolution'dan çıkılıyor..."
 
-#: shell/main.c:330
+#. 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 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 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"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:290
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
+
+#: shell/main.c:298
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Tekrar sorma"
+
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution Kabuğuna erişilemedi."
 
-#: shell/main.c:339
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution Kabuğu başlatılamadı: %s"
 
-#: shell/main.c:421
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Açılış ekranıni gösterme"
 
-#: shell/main.c:423
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Aktarma işlemi başlıyor"
 
-#: shell/main.c:425
+#: shell/main.c:532
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Akıllı Aktarımcılar Başlatılıyor"
 
-#: shell/main.c:427
+#: 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 "Tüm hata ayıklama verilerini bir dosyaya yazdır."
 
-#: shell/main.c:429
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr ""
 
-#: shell/main.c:447
+#: 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:478
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Bonobo parçalar sistemi başlatılamadı."
-
-#: 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 "Öntanımlı adres defteri yüklenemedi."
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Girdi Dosyası"
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "Çıktı Dosyası"
-
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Dosya adı belirtilmedi."
 
-#: tools/evolution-launch-composer.c:322
+#: tools/evolution-launch-composer.c:324
 #, fuzzy
 msgid "An attachment to add."
 msgstr "Dosya ekle..."
 
-#: tools/evolution-launch-composer.c:323
+#: tools/evolution-launch-composer.c:325
 msgid "Content type of the attachment."
 msgstr ""
 
-#: tools/evolution-launch-composer.c:324
+#: tools/evolution-launch-composer.c:326
 msgid "The filename to display in the mail."
 msgstr ""
 
-#: tools/evolution-launch-composer.c:325
+#: tools/evolution-launch-composer.c:327
 #, fuzzy
 msgid "Description of the attachment."
 msgstr "Açıklama içeriği"
 
-#: tools/evolution-launch-composer.c:326
+#: tools/evolution-launch-composer.c:328
 msgid "Mark attachment to be shown inline by default."
 msgstr ""
 
-#: tools/evolution-launch-composer.c:327
+#: tools/evolution-launch-composer.c:329
 #, fuzzy
 msgid "Default subject for the message."
 msgstr "Seçili iletileri kes"
 
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
 #.
-#. *  This file is autogenerated from evolution-addressbook.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-addressbook.h:9
-#, fuzzy
-msgid "_Print Contacts..."
-msgstr "_Bağlantılar..."
-
-#: ui/evolution-addressbook.h:10
-#, fuzzy
-msgid "As _Table"
-msgstr "Kapat"
-
-#: ui/evolution-addressbook.h:11
-#, fuzzy
-msgid "_New Contact"
-msgstr "Yeni Bağlantı"
-
-#: ui/evolution-addressbook.h:12 ui/evolution-mail-message.xml.h:113
-#: ui/evolution.xml.h:65
-msgid "_Tools"
-msgstr "_Araçlar"
-
-#: ui/evolution-addressbook.h:13
-#, fuzzy
-msgid "_Search for contacts"
-msgstr "Bağ_lantıları Ara"
-
-#: ui/evolution-addressbook.h:17
-#, fuzzy
-msgid "Find a contact"
-msgstr "Gönderen içerir"
-
-#: ui/evolution-addressbook.h:19
-#, fuzzy
-msgid "Print contacts"
-msgstr "Seçili bağlantıları yazdır"
-
-#: ui/evolution-addressbook.h:21
-#, fuzzy
-msgid "Delete a contact"
-msgstr "Bağlantıyı Sil?"
-
-#: ui/evolution-addressbook.h:22
-#, fuzzy
-msgid "View All"
-msgstr "İzle"
-
-#: ui/evolution-addressbook.h:23
-#, fuzzy
-msgid "View all contacts"
-msgstr "Tüm Bağlantıkları Seç"
-
-#: ui/evolution-addressbook.h:24 ui/evolution-addressbook.xml.h:26
-msgid "Stop"
-msgstr "Dur"
+#: tools/killev.c:63
+#, fuzzy, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "'%s' adı değiştirilemedi: %s"
 
-#: ui/evolution-addressbook.h:25 ui/evolution-addressbook.xml.h:27
-msgid "Stop Loading"
-msgstr "Yüklemeyi Durdur"
+#: tools/killev.c:78
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr ""
 
 #: ui/evolution-addressbook.xml.h:3
 #, fuzzy
@@ -26260,6 +26448,14 @@ msgstr "Bağlantıya ileti gönder"
 msgid "Send selected contacts to another person."
 msgstr "Seçilen bağlantıları başkasına gönder."
 
+#: ui/evolution-addressbook.xml.h:26
+msgid "Stop"
+msgstr "Dur"
+
+#: ui/evolution-addressbook.xml.h:27
+msgid "Stop Loading"
+msgstr "Yüklemeyi Durdur"
+
 #: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
@@ -26271,7 +26467,7 @@ msgstr "şimdiki zaman"
 #: 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 "_Eylemler"
 
@@ -26390,9 +26586,8 @@ msgstr "Yazdırılacak olan öğeyi önizle"
 msgid "Print this item"
 msgstr "Bu öğeyi yazdır"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.h:11
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save"
 msgstr "Kaydet"
 
@@ -26416,10 +26611,10 @@ msgstr "Bu öğeyi diske kaydet"
 
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
-#: ui/evolution-mail-messagedisplay.xml.h:7 ui/evolution-message-composer.h:31
+#: 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 "_Dosya"
 
@@ -26428,7 +26623,7 @@ msgid "Print En_velope..."
 msgstr "_Zarfı Yazdır..."
 
 #: ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5 ui/evolution-message-composer.h:34
+#: ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "_Farklı Kaydet..."
@@ -26443,7 +26638,7 @@ msgstr "B_ağlantıya Mesaj Gönder..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.h:33 ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:47
 #: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Kaydet"
@@ -26607,7 +26802,8 @@ msgid "Hide _Read Messages"
 msgstr "_Okunan İletileri Gizle"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr "Silinen iletileri üzerine çizgi çekmek yerine gizle"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -26672,7 +26868,7 @@ msgstr "Konumlandırılan İleti listesi"
 msgid "_Expunge"
 msgstr "_Sil"
 
-#: 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 "_Dizin"
 
@@ -27105,6 +27301,10 @@ msgstr ""
 msgid "_Resend..."
 msgstr "Y_eniden İsimlendir..."
 
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
+msgid "_Tools"
+msgstr "_Araçlar"
+
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Silme"
@@ -27113,162 +27313,29 @@ msgstr "_Silme"
 msgid "Close this window"
 msgstr "Bu pencereyi kapat"
 
-#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution-message-composer.h:39
+#: 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 "_Kapat"
 
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-message-composer.h:42
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
 msgid "_View"
 msgstr "_Göster"
 
-#.
-#. *  This file is autogenerated from evolution-message-composer.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-message-composer.h:9 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Aç"
-
-#: ui/evolution-message-composer.h:10 ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "Bir dosya aç"
-
-#: ui/evolution-message-composer.h:12 ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:7
-msgid "Save the current file"
-msgstr "Şimdiki zamanı kaydet"
-
-#: ui/evolution-message-composer.h:13 ui/evolution-message-composer.xml.h:17
-msgid "Save As"
-msgstr "Farklı Kaydet"
-
-#: ui/evolution-message-composer.h:14 ui/evolution-message-composer.xml.h:22
-msgid "Save the current file with a different name"
-msgstr "Güncel dosyayı farklı bir isimle kaydet"
-
-#: ui/evolution-message-composer.h:16 ui/evolution-message-composer.xml.h:4
-#: ui/evolution-signature-editor.xml.h:2
-msgid "Close the current file"
-msgstr "Güncel dosyayı kapat"
-
-#: ui/evolution-message-composer.h:17 ui/evolution-message-composer.xml.h:20
-msgid "Save in folder..."
-msgstr "Dizine kaydet..."
-
-#: ui/evolution-message-composer.h:18 ui/evolution-message-composer.xml.h:23
-msgid "Save the message in a specified folder"
-msgstr "İletiyi belirtilen dizine kaydet"
-
-#: ui/evolution-message-composer.h:19
-msgid "Insert text file..."
-msgstr "Metin dosyası yerleştir..."
-
-#: ui/evolution-message-composer.h:20
-msgid "Insert a file as text into the message"
-msgstr "İletiye bir metin dosyası ekle"
-
-#: ui/evolution-message-composer.h:21 ui/evolution-message-composer.h:37
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Gönder"
-
-#: ui/evolution-message-composer.h:22
-#, fuzzy
-msgid "Send the message now"
-msgstr "Bu iletiyi şimdi gönder"
-
-#: ui/evolution-message-composer.h:23
-msgid "Send _later"
-msgstr "_Sonra gönder"
-
-#: ui/evolution-message-composer.h:24
-msgid "Send the message later"
-msgstr "Bu iletiyi sonra gönder"
-
-#: ui/evolution-message-composer.h:25 ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Ekle"
 
-#: ui/evolution-message-composer.h:27
-#, fuzzy
-msgid "HTML"
-msgstr "H_TML"
-
-#: ui/evolution-message-composer.h:28 ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:9
-msgid "Send the mail in HTML format"
-msgstr "İletiyi HTML olarak gönder"
-
-#: ui/evolution-message-composer.h:29 ui/evolution-message-composer.xml.h:29
-msgid "Show attachments"
-msgstr "Ekleri göster"
-
-#: ui/evolution-message-composer.h:30 ui/evolution-message-composer.xml.h:27
-msgid "Show / hide attachments"
-msgstr "Ekleri göster/gizle"
-
-#: ui/evolution-message-composer.h:32 ui/evolution-message-composer.xml.h:45
-msgid "_Open..."
-msgstr "_Aç..."
-
-#: ui/evolution-message-composer.h:35
-#, fuzzy
-msgid "Save in _folder... (FIXME)"
-msgstr "Dizine kaydet..."
-
-#: ui/evolution-message-composer.h:36
-#, fuzzy
-msgid "_Insert text file... (FIXME)"
-msgstr "Metin dosyası yerleştir..."
-
-#: ui/evolution-message-composer.h:38
-msgid "Send _Later"
-msgstr "_Sonra Gönder"
-
-#: ui/evolution-message-composer.h:41
-#, fuzzy
-msgid "F_ormat"
-msgstr "Biçim"
-
-#: ui/evolution-message-composer.h:43 ui/evolution-message-composer.xml.h:28
-msgid "Show _attachments"
-msgstr "Ekleri _göster"
-
-#: ui/evolution-message-composer.h:44 ui/evolution-signature-editor.xml.h:13
-#: ui/evolution.xml.h:54
-msgid "_Help"
-msgstr "_Yardım"
-
-#: ui/evolution-message-composer.h:45
-#, fuzzy
-msgid "_About..."
-msgstr "_Yazıtipi..."
-
-#: ui/evolution-message-composer.h:46
-#, fuzzy
-msgid "_Debug"
-msgstr "Dyersburg"
-
-#: ui/evolution-message-composer.h:47
-#, fuzzy
-msgid "Send this message now"
-msgstr "Bu iletiyi şimdi gönder"
-
-#: ui/evolution-message-composer.h:48
-#, fuzzy
-msgid "Bold"
-msgstr "Gövde"
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Bir dosya ekle"
 
-#: ui/evolution-message-composer.h:49
-msgid "Sets something as bold"
-msgstr ""
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
+msgid "Close the current file"
+msgstr "Güncel dosyayı kapat"
 
 #: ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
@@ -27291,6 +27358,14 @@ msgstr "Biçi_m"
 msgid "HT_ML"
 msgstr "H_TML"
 
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Aç"
+
+#: ui/evolution-message-composer.xml.h:11
+msgid "Open a file"
+msgstr "Bir dosya aç"
+
 #: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP Şifre"
@@ -27307,15 +27382,57 @@ msgstr "S/MIME Şifreleme"
 msgid "S/MIME Sign"
 msgstr "S/MIME İmza"
 
+#: ui/evolution-message-composer.xml.h:17
+msgid "Save As"
+msgstr "Farklı Kaydet"
+
 #: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "_Taslağı Kaydet"
 
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save in folder..."
+msgstr "Dizine kaydet..."
+
+#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-signature-editor.xml.h:7
+msgid "Save the current file"
+msgstr "Şimdiki zamanı kaydet"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save the current file with a different name"
+msgstr "Güncel dosyayı farklı bir isimle kaydet"
+
+#: ui/evolution-message-composer.xml.h:23
+msgid "Save the message in a specified folder"
+msgstr "İletiyi belirtilen dizine kaydet"
+
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Gönder"
+
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
+msgid "Send the mail in HTML format"
+msgstr "İletiyi HTML olarak gönder"
+
 #: ui/evolution-message-composer.xml.h:26
 #, fuzzy
 msgid "Send this message"
 msgstr "Bu iletiyi şimdi gönder"
 
+#: ui/evolution-message-composer.xml.h:27
+msgid "Show / hide attachments"
+msgstr "Ekleri göster/gizle"
+
+#: ui/evolution-message-composer.xml.h:28
+msgid "Show _attachments"
+msgstr "Ekleri _göster"
+
+#: ui/evolution-message-composer.xml.h:29
+msgid "Show attachments"
+msgstr "Ekleri göster"
+
 #: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "PGP anahtarıyla bu iletiyi imzala"
@@ -27365,6 +27482,10 @@ msgstr "_Gönderen Alanı"
 msgid "_Insert"
 msgstr "_Ekle"
 
+#: ui/evolution-message-composer.xml.h:45
+msgid "_Open..."
+msgstr "_Aç..."
+
 #: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "_Yanıtla Alanı"
@@ -27382,6 +27503,10 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Öğeyi kaydet ve iletişim penceresini kapat"
 
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:52
+msgid "_Help"
+msgstr "_Yardım"
+
 #: ui/evolution-signature-editor.xml.h:16
 #, fuzzy
 msgid "_Signature editor"
@@ -27564,127 +27689,118 @@ msgid "Pi_lot Settings..."
 msgstr "_Pilot Ayarları..."
 
 #: ui/evolution.xml.h:27
-#, fuzzy
-msgid "Pilot Con_duit Settings..."
-msgstr "_Pilot Ayarları..."
-
-#: 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 "Al / Gönder"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Kuyruktaki iletileri gönder ve yeni iletileri al"
 
-#: ui/evolution.xml.h:31
-msgid "Set up Pilot conduit configuration"
-msgstr ""
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "İleti Yapılandırması"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr "Ximian Evolution hakkında bilgi ver"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Hata Raporu Gönder"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "_Hata Raporu Gönder"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy kullanarak bir hata raporu gönderin"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "Aç/kapat"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "Dizin çubuğunu göster/gizle"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Kısayol çubuğunu göster/gizle"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr "Çevrimiçi/çevrimdışı çalış."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "Seçili dizini göster"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _SSS"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 msgid "_About Ximian Evolution..."
 msgstr "Ximian _Evolution Hakkında..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "_Kopyala..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Dizin Çubuğu"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Folder..."
 msgstr "_Dizin"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "Dizine _Git..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr "_Al..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "_Taşı..."
 
-#: 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 Dizin"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Remove Other User's Folder"
 msgstr "Dizine _Taşı"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "Y_eniden İsimlendir..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "_Gönder / Al"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "_Kısayol Çubuğu"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "_Kısayol"
@@ -27771,9 +27887,8 @@ msgstr "Kategori ile"
 msgid "_Tasks"
 msgstr "_Görev"
 
-#. 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"
 
@@ -27798,21 +27913,21 @@ msgstr ""
 "Zaman dilimini seçebilmek için farenin sol tuşu ile haritaya yakınlaşın. \n"
 "Haritadan uzaklaşmak için farenin sağ tuşunu kullanın."
 
-#: widgets/menus/gal-view-menus.c:295
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr "Ş_imdiki Görünüm"
 
 #. 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 "Ş_imdiki Görünüm"
 
-#: 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ümleri Tanımla"
 
@@ -27823,19 +27938,19 @@ msgid "MTWTFSS"
 msgstr "PSÇPCCP"
 
 #. 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 "Şimdi"
 
-#: 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 biçiminde girilmelidir."
@@ -27844,81 +27959,81 @@ msgstr "Gün %s biçiminde girilmelidir."
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Yüzde değeri 0 ile 100 arasında bulunmalıdır."
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "Baltık"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "Orta Avrupa"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "Çince"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "Kiril"
 
-#: 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 "Japonca"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "Korece"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: 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 "Batı Avrupa"
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "Geleneksel"
 
-#: 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 "Basitleştirilmiş"
 
-#: 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 "Visalia"
 
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Bilinmeyen karakter seti: %s"
 
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr "Kullanılacak karakter setini girin"
 
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "Diğer..."
 
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr "Karakter Kodlaması"
 
@@ -27926,11 +28041,12 @@ msgstr "Karakter Kodlaması"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:189
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr "Arama Düzenleyici"
 
-#: widgets/misc/e-filter-bar.c:211
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "Aramayı Kaydet"
 
@@ -27949,108 +28065,662 @@ msgstr "_Kayıtlı Aramalara Ekle..."
 msgid "_Advanced..."
 msgstr "Gelişmiş..."
 
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
 msgid "Information"
 msgstr "Bilgi"
 
-#: widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:168
 msgid "Error"
 msgstr "Hata"
 
-#: widgets/misc/e-messagebox.c:173
+#: widgets/misc/e-messagebox.c:175
 msgid "Question"
 msgstr "Soru"
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
 msgid "Message"
 msgstr "İleti"
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
-msgstr "Bu mesajı bir daha gösterme."
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "_Ara"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:537
 #, fuzzy
 msgid "_Find Now"
 msgstr "Şimdi Bul"
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 #, fuzzy
 msgid "_Clear"
 msgstr "Temizle"
 
-#: 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 "Temizle"
 
-#: widgets/misc/e-search-bar.c:897
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Şimdi Bul"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Kişisel Adres Defteri Sunucusu"
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Evolution Adres Defteri mini kart görüntüleyici"
+
+#: 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 takvim özet bileşeni."
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Evolution Adres Defteri mini kart görüntüleyici"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "LDIF dosyalarını Evolution'a aktarım mimarisi."
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "LDIF dosyalarını Evolution'a aktarır."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "VCard dosyalarını Evolution'a aktarım mimarisi."
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "Kişisel Takvim Sunucusu"
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "VCard dosyalarını Evolution'a aktarır."
 
-#: wombat/wombat.c:199
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): GNOME-VFS başlatılamadı"
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "Adres menüsü için Bonobo denetleyici"
 
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): GNOME başlatılamadı"
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Adres gösteren örnek bir Bonobo denetleyici"
 
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): Bonobo başlatılamadı"
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Adres defteri gösteren örnek bir Bonobo denetleyici"
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Evolution adres defteri mini kartını gösteren denetleyici."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Bağlantıları düzenleyen Evolution bileşeni."
+
+#~ msgid "Factory for the Addressbook Minicard control"
+#~ msgstr "Adres defteri mini kart mimarisi"
+
+#~ msgid "Factory for the Addressbook's address displayer"
+#~ msgstr "Adres defteri isim gösterim arayüzü mimarisi"
+
+#~ msgid "Factory for the sample Addressbook control"
+#~ msgstr "Örnek adres defteri kontrol mimarisi"
+
+#~ msgid "1234"
+#~ msgstr "1234"
+
+#~ msgid "380"
+#~ msgstr "380"
+
+#~ msgid "666"
+#~ msgstr "666"
+
+#~ msgid "<- _Remove"
+#~ msgstr "<- _Sil"
+
+#~ msgid "<< Fewer Options"
+#~ msgstr "<< Daha Az Seçenek"
+
+#~ msgid "Associated LDAP Attribute"
+#~ msgstr "Verilen LDAP Özniteliği"
+
+#~ msgid "Attribute"
+#~ msgstr "Öznitelik"
+
+#~ msgid "DN Customization"
+#~ msgstr "DN Yapılandırması"
+
+#~ msgid "Evolution Attribute"
+#~ msgstr "Evolution Özniteliği"
+
+#~ msgid "LDAP Attribute"
+#~ msgstr "LDAP Özniteliği"
 
 #, fuzzy
-#~ msgid "Apri file"
-#~ msgstr "Nisan"
+#~ msgid "Mappings"
+#~ msgstr "Marjin"
+
+#~ msgid "Select"
+#~ msgstr "Seç"
+
+#~ msgid "_Add ->"
+#~ msgstr "_Ekle ->"
 
 #, fuzzy
-#~ msgid "Salve file"
-#~ msgstr "Bir dosya seçin"
+#~ msgid "_Add Mapping"
+#~ msgstr "Eylem ekle"
 
 #, fuzzy
-#~ msgid "Configuration control for the Evolution Summary."
-#~ msgstr "Evolution Özeti içeren dizin"
+#~ msgid "_Add to DN"
+#~ msgstr "Eylem ekle"
+
+#~ msgid "_Always"
+#~ msgstr "_Her zaman"
 
 #, fuzzy
-#~ msgid "Configure the appearance of the Evolution Summary here"
-#~ msgstr "Evolution Özeti içeren dizin"
+#~ msgid "_Delete Mapping"
+#~ msgstr "He_psini sil"
+
+#~ msgid "_Don't use SSL/TLS"
+#~ msgstr "_SSL/TLS kullanma"
 
 #, fuzzy
-#~ msgid "Evolution Summary component."
-#~ msgstr "Evolution e-posta programı."
+#~ msgid "_Edit Mapping"
+#~ msgstr "_Toplantıyı düzenle"
 
 #, fuzzy
-#~ msgid "Factory for Evolution Summary's configuration control."
-#~ msgstr "E-posta özet bileşen mimarisi"
+#~ msgid "_Evolution attribute:"
+#~ msgstr "Evolution Alarmı"
+
+#~ msgid "_If necessary "
+#~ msgstr "İ_htiyaç anında"
+
+#~ msgid "_LDAP attribute:"
+#~ msgstr "_LDAP özniteliği:"
+
+#~ msgid "_LDAP attributes:"
+#~ msgstr "_LDAP öznitelikleri:"
+
+#~ msgid "_More Options >>"
+#~ msgstr "_Daha Çok Seçenek >>"
+
+#~ msgid "_Restore Defaults"
+#~ msgstr "_Öntanımlı Değerlere Geri Dön"
+
+#~ msgid "account-druid"
+#~ msgstr "hesap-sihirbazı"
+
+#~ msgid "account-editor"
+#~ msgstr "hesap-düzenleyici"
+
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr "Adres defteri isim seçim arayüzü mimarisi"
+
+#~ msgid "Edit Contact List"
+#~ msgstr "Bağ_lantı Listesini Düzenle"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "İsimsiz Bağlantı Listesi"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d adet gösterilmiyor)"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "_Bağlantılar..."
+
+#~ msgid "Phone Types"
+#~ msgstr "Telefon Türleri"
+
+#~ msgid "Delete Contact?"
+#~ msgstr "Bağlantıyı Sil?"
+
+#~ msgid "Confirm Overwrite"
+#~ msgstr "Üzerine Yazılsın mı?"
 
 #, fuzzy
-#~ msgid "Factory for the Evolution Summary component."
+#~ msgid "Display Cards?"
+#~ msgstr "Görüntüleme"
+
+#, fuzzy
+#~ msgid "Display Cards"
+#~ msgstr "Görüntüleme"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Görev listesi gösteren örnek bir Bonobo denetleyici."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Takvim gösteren örnek bir Bonobo denetleyici."
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Evolution e-posta programı mimarisi."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Takvimi düzenleyen Evolution bileşeni."
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Tasks control"
+#~ msgstr "Evolution e-posta programı mimarisi."
+
+#~ msgid "Factory for the calendar iTip view control"
+#~ msgstr "Takvim iTip görüntü kontrolü mimarisi"
+
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr "Örnek Takvim kontrolü mimarisi"
+
+#, fuzzy
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr "Örnek Takvim kontrolü mimarisi"
+
+#, fuzzy
+#~ msgid "Factory to create a component editor factory"
+#~ msgstr "Bileşen düzenleyici mimarisi oluşturulamadı."
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Alarm bilgilendirme servisi"
+
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "GNOME başlatılamıyor"
+
+#~ msgid "st"
+#~ msgstr "."
+
+#~ msgid "nd"
+#~ msgstr "."
+
+#~ msgid "rd"
+#~ msgstr "."
+
+#~ msgid "th"
+#~ msgstr "."
+
+#~ msgid "Could not activate Bonobo"
+#~ msgstr "Bonobo başlatılamadı"
+
+#~ msgid "Could not create the component editor factory"
+#~ msgstr "Bileşen düzenleyici mimarisi oluşturulamadı."
+
+#~ msgid "Print Calendar"
+#~ msgstr "Takvimi Yazdır"
+
+#~ msgid ""
+#~ "Could not create the tasks view.  Please check your ORBit and OAF setup."
+#~ msgstr ""
+#~ "Takvim görünümü yaratılamadı. ORBit ve OAF kurulumunu gözden geçirin."
+
+#~ msgid ""
+#~ "Evolution has taken the tasks that were in your calendar folder and "
+#~ "automatically migrated them to the new tasks folder."
+#~ msgstr ""
+#~ "Evolution takvim dizininde bulunan tüm görevleri görevler dizinine "
+#~ "aktardı."
+
+#~ 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 takvim dizininde bulunan görevleri yeni görevler dizinine "
+#~ "göndermeyi denedi, ancak bazı görevler taşınamadı. Bu işlemi daha sonra "
+#~ "tekrar deneyiniz."
+
+#~ msgid ""
+#~ "Could not open `%s'; no items from the calendar folder will be migrated "
+#~ "to the tasks folder."
+#~ msgstr ""
+#~ "`%s' açılamadı. Takvim dizininden görevler dizinine gönderilecek öğe "
+#~ "bulunmuyor."
+
+#~ 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üklemek için gereken yöntem desteklemiyor."
+
+#, fuzzy
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "VCard dosyalarını Evolution'a aktarım mimarisi."
+
+#, fuzzy
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "VCard dosyalarını Evolution'a aktarır."
+
+#, fuzzy
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "VCard dosyalarını Evolution'a aktarır."
+
+#, fuzzy
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr ""
+#~ "%s iletisi %s dizininden alınamadı\n"
+#~ "  %s"
+
+#~ msgid "Warning!"
+#~ msgstr "Uyarı!"
+
+#~ msgid ""
+#~ "Could not create composer window, because you have not yet\n"
+#~ "configured any identities in the mail component."
+#~ msgstr ""
+#~ "E-posta düzenleme penceresi açılmadı, çünkü adınızı ve\n"
+#~ "e-posta bilgilerinizi girmediniz."
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "Evolution posta programı açılamadı."
+
+#~ msgid "minute"
+#~ msgstr "dakika"
+
+#~ msgid "hour"
+#~ msgstr "saat"
+
+#~ msgid "week"
+#~ msgstr "hafta"
+
+#~ msgid "year"
+#~ msgstr "yılda bir güncelle"
+
+#~ msgid "Add action"
+#~ msgstr "Eylem ekle"
+
+#~ msgid "Add criterion"
+#~ msgstr "Sınıf ekle"
+
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Evolution yazıtipleri için yapılandırma denetimi."
+
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Evolution posta hesabı için yapılandırma denetimi."
+
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Evolution e-posta servisi için yapılandırma denetimi."
+
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Evolution İleti Düzenleyici için yapılandırma denetimi"
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "E-posta alma va gönderme için Evolution bileşeni"
+
+#~ msgid "Evolution mail folder factory component."
+#~ msgstr "Evolution e-posta dizin bileşeni"
+
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr "Evolution e-posta programı mimarisi."
+
+#~ msgid "Factory for the Mail Summary component."
 #~ msgstr "E-posta özet bileşen mimarisi"
 
+#~ msgid "Warning: Unsent Messages"
+#~ msgstr "Uyarı: Gönderilmeyen İletiler"
+
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "Evolution posta programı başlatılamadı."
+
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "Evolution'ın ileti yapılandırma bileşeni başlatılamadı."
+
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Evolution'ın ileti dizin bilgi bileşeni başlatılamadı."
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Mbox dosyalarını Evolution'a aktarım mimarisi"
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Mbox dosyalarını Evolution'a aktarır"
+
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "Outlook Express 4 iletilerini Evolution'a aktarım mimarisi"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Outlook Express dosyalarını Evolution'a aktarır"
+
+#~ msgid "Really delete account?"
+#~ msgstr "Gerçekten hesap silinsin mi?"
+
 #, fuzzy
-#~ msgid "Summary Preferences"
-#~ msgstr "Özet Ayarları"
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "Sonraki okunmamış iletiyi göster"
+
+#~ msgid "US-Letter"
+#~ msgstr "Zarf"
+
+#~ msgid "Add Signature"
+#~ msgstr "İmza Ekle"
+
+#~ msgid "Account %d"
+#~ msgstr "Hesap %d"
+
+#~ msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+#~ msgstr "AaBbCcÇçDdEeFfGgĞğHhIıİiJjKkLlMmNnOoÖöPpQqRrSsTtUuÜüVvWwXxYyZz"
+
+#~ msgid "On Screen fonts"
+#~ msgstr "Ekran yazıtipleri"
+
+#~ msgid "Spell Checking Language"
+#~ msgstr "İmla Denetimi Dili"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "_Eş aralıklı:"
+
+#~ msgid "_Variable-width:"
+#~ msgstr "_Değişken aralıklı:"
+
+#~ msgid "All folders"
+#~ msgstr "Tüm dizinler"
+
+#~ msgid "Display Options"
+#~ msgstr "Görüntüleme Seçenekleri"
 
 #, fuzzy
+#~ msgid "Refresh folder listing"
+#~ msgstr "Dizin tazeleniyor"
+
+#~ msgid "Marquette"
+#~ msgstr "Marquette"
+
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "Bonobo başlatılamadı.\n"
+
+#~ msgid "Evolution installation"
+#~ msgstr "Evolution kurulumu"
+
+#~ msgid ""
+#~ "This new version of Evolution needs to install additional files\n"
+#~ "into your personal Evolution directory"
+#~ msgstr ""
+#~ "Evolution'un bu yeni sürümü kişisel Evolution dizinine ek dosya\n"
+#~ "yerleştirilmesini gerektirir."
+
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr ""
+#~ "Dosyaları kurmak için \"Tamam\" düğmesine, ya da işlemi durdurmak için "
+#~ "\"İptal\" düğmesine tıklayın."
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Evolution aşağıdaki dizini oluşturamadı:\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 dizini\n"
+#~ "doğru izinlere sahip değil. Öncelikle bu dizini\n"
+#~ "okunabilir ve yazılabilir yapın, daha sonra Evolution'u çalıştırın."
+
+#~ msgid ""
+#~ "File %s\n"
+#~ "should be removed to allow Evolution to work correctly.\n"
+#~ "Please remove this file and restart Evolution."
+#~ msgstr ""
+#~ "%s dosyası\n"
+#~ "Evolution programının düzgün çalışabilmesi için silinmelidir.\n"
+#~ "Lütfen bu dosyayı silin ve Evolution'u yeniden çalıştırın."
+
+#~ msgid "New..."
+#~ msgstr "Yeni..."
+
 #~ msgid ""
-#~ "Thanks\n"
-#~ "The Ximian Evolution Team\n"
-#~ msgstr "Ximian Evolution"
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Evolution Posta Asistanı arayüzü başlatılamadı\n"
+#~ "(%s)"
+
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr "Evolution Posta Asistanı arayüzü başlatılamadı\n"
+
+#~ msgid "Folder name cannot contain slashes."
+#~ msgstr "Dizin içinde bölü karakteri bulunamaz."
+
+#~ msgid "Bug buddy was not found in your $PATH."
+#~ msgstr "Bug-buddy $PATH dizininde bulunamadı."
+
+#~ msgid "Don't remove"
+#~ msgstr "Silme"
+
+#~ msgid "Active connections"
+#~ msgstr "Etkin bağlantılar"
+
+#~ msgid "Host"
+#~ msgstr "Makina"
+
+#~ msgid "Cannot initialize the Bonobo component system."
+#~ msgstr "Bonobo parçalar sistemi başlatılamadı."
+
+#~ msgid "Output File"
+#~ msgstr "Çıktı Dosyası"
+
+#, fuzzy
+#~ msgid "_Print Contacts..."
+#~ msgstr "_Bağlantılar..."
 
 #, fuzzy
-#~ msgid "Don't tell me again"
-#~ msgstr "Tekrar sorma"
+#~ msgid "As _Table"
+#~ msgstr "Kapat"
+
+#, fuzzy
+#~ msgid "_New Contact"
+#~ msgstr "Yeni Bağlantı"
+
+#, fuzzy
+#~ msgid "_Search for contacts"
+#~ msgstr "Bağ_lantıları Ara"
+
+#, fuzzy
+#~ msgid "Find a contact"
+#~ msgstr "Gönderen içerir"
+
+#, fuzzy
+#~ msgid "Print contacts"
+#~ msgstr "Seçili bağlantıları yazdır"
+
+#, fuzzy
+#~ msgid "Delete a contact"
+#~ msgstr "Bağlantıyı Sil?"
+
+#, fuzzy
+#~ msgid "View All"
+#~ msgstr "İzle"
+
+#, fuzzy
+#~ msgid "View all contacts"
+#~ msgstr "Tüm Bağlantıkları Seç"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Metin dosyası yerleştir..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "İletiye bir metin dosyası ekle"
+
+#, fuzzy
+#~ msgid "Send the message now"
+#~ msgstr "Bu iletiyi şimdi gönder"
+
+#~ msgid "Send _later"
+#~ msgstr "_Sonra gönder"
+
+#~ msgid "Send the message later"
+#~ msgstr "Bu iletiyi sonra gönder"
+
+#, fuzzy
+#~ msgid "HTML"
+#~ msgstr "H_TML"
+
+#, fuzzy
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Dizine kaydet..."
+
+#, fuzzy
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "Metin dosyası yerleştir..."
+
+#~ msgid "Send _Later"
+#~ msgstr "_Sonra Gönder"
+
+#, fuzzy
+#~ msgid "F_ormat"
+#~ msgstr "Biçim"
+
+#, fuzzy
+#~ msgid "_About..."
+#~ msgstr "_Yazıtipi..."
+
+#, fuzzy
+#~ msgid "_Debug"
+#~ msgstr "Dyersburg"
+
+#, fuzzy
+#~ msgid "Send this message now"
+#~ msgstr "Bu iletiyi şimdi gönder"
+
+#, fuzzy
+#~ msgid "Bold"
+#~ msgstr "Gövde"
+
+#, fuzzy
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "_Pilot Ayarları..."
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Kişisel Adres Defteri Sunucusu"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "Kişisel Takvim Sunucusu"
+
+#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
+#~ msgstr "setup_vfs(): GNOME-VFS başlatılamadı"
+
+#~ msgid "init_corba(): could not initialize GNOME"
+#~ msgstr "init_corba(): GNOME başlatılamadı"
+
+#~ msgid "init_bonobo(): could not initialize Bonobo"
+#~ msgstr "init_bonobo(): Bonobo başlatılamadı"
+
+#, fuzzy
+#~ msgid "Apri file"
+#~ msgstr "Nisan"
+
+#, fuzzy
+#~ msgid "Salve file"
+#~ msgstr "Bir dosya seçin"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Evolution Özeti içeren dizin"
+
+#, fuzzy
+#~ msgid "Factory for the Evolution Summary component."
+#~ msgstr "E-posta özet bileşen mimarisi"
 
 #, fuzzy
 #~ msgid "_Configure..."
@@ -28231,9 +28901,6 @@ msgstr "init_bonobo(): Bonobo başlatılamadı"
 #~ msgid "Advanced"
 #~ msgstr "Gelişmiş"
 
-#~ msgid "Al_l stations:"
-#~ msgstr "Tüm _istasyonlar:"
-
 #~ msgid "All _folders:"
 #~ msgstr "Tüm _dizinler"
 
@@ -28324,9 +28991,6 @@ msgstr "init_bonobo(): Bonobo başlatılamadı"
 #~ msgid "Default Forward style is: "
 #~ msgstr "Öntanımlı _Yönlendirme biçemi: "
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "Adres Defterini Düzenle"
-
 #~ msgid "Edit..."
 #~ msgstr "Düzenle..."
 
@@ -28339,15 +29003,6 @@ msgstr "init_bonobo(): Bonobo başlatılamadı"
 #~ msgid "Evolution - Create new folder"
 #~ msgstr "Evolution - Yeni bir dizin yarat"
 
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Evolution Aktarma Yardımcısı"
-
-#~ msgid "Evolution News Editor"
-#~ msgstr "Evolution Haber Grubu Düzenleyici"
-
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr "Evolution takvim özet bileşeni."
-
 #~ msgid "Filter on Mailing List"
 #~ msgstr "E-posta Listesine Göre Filtrele"
 
@@ -28417,9 +29072,6 @@ msgstr "init_bonobo(): Bonobo başlatılamadı"
 #~ msgid "New Contact _List"
 #~ msgstr "Yeni Bağlantı _Listesi"
 
-#~ msgid "New List"
-#~ msgstr "Yeni Liste"
-
 #~ msgid "New _Contact"
 #~ msgstr "Yeni _Bağlantı"
 
@@ -28471,9 +29123,6 @@ msgstr "init_bonobo(): Bonobo başlatılamadı"
 #~ msgid "Show contacts matching the following criteria:"
 #~ msgstr "Aşağıdaki sınıflandırmalara uyan bağlantıları göster:"
 
-#~ msgid "Source"
-#~ msgstr "Kaynak"
-
 #~ msgid "Sources"
 #~ msgstr "Kaynaklar"
 
@@ -28561,4 +29210,3 @@ msgstr "init_bonobo(): Bonobo başlatılamadı"
 
 #~ msgid "seconds."
 #~ msgstr "saniye sonra okunmuş işaretle"
-
diff --git a/po/uk.po b/po/uk.po
index 4a195e70a5..56c12523d5 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0.5\n"
-"POT-Creation-Date: 2003-04-02 13:07+0300\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-04-02 10:54--500\n"
 "Last-Translator: Yuriy Syrota <yuri@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -16,20 +16,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 "Майстер імпорту файлів LDIF у Evolutuion."
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Редактор пошти Evolutuion."
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "Імпорт файлів LDIF у 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 "Майстер імпорту файлів VCard у Evolutuion."
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Редактор пошти Evolutuion."
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Імпорт файлів VCard у Evolution."
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Редактор пошти Evolutuion."
+
+#: 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
@@ -199,14 +206,14 @@ msgid "TTY"
 msgstr "TTY"
 
 #: 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 "Ел.пошта 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"
@@ -393,8 +400,7 @@ msgstr "Організаційна одиниця"
 msgid "Role"
 msgstr "Роль"
 
-#: addressbook/backend/ebook/e-card.c:1431
-#: mail/mail-format.c:935
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
 msgid "Mailer"
 msgstr "Поштова програма"
 
@@ -496,83 +502,84 @@ msgstr "Отримання результатів пошуку на LDAP..."
 msgid "Error performing search"
 msgstr "Помилка виконання пошуку"
 
-#: addressbook/conduit/address-conduit.c:296
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Типова адреса синхронізації:"
 
-#: addressbook/conduit/address-conduit.c:539
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Неможливо завантажити курсор\n"
 
-#: addressbook/conduit/address-conduit.c:552
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "Неможливо завантажити EBook\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 "Не вдалося запустити сервер 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 "Не вдалось запустити 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 "Не вдалося зчитати блок адреса програми \"Пілот\""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Елемент керування Bonobo для вікна адреси."
+msgid "Configure access to LDAP directory servers here"
+msgstr "Налаштування доступу до серверів каталогів LDAP"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Елемент керування Bonobo для відображення адреси."
+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 "Приклад елементу керування Bonobo для відображення книги адрес."
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Переглядач мінікартки адресної книги Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr "Елемент керування для налаштовування сховищ адресних книг Evolution."
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Інтерфейс вибору імені у книзі адрес Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure access to LDAP directory servers here"
-msgstr "Налаштування доступу до серверів каталогів LDAP"
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Переглядач мінікартки адресної книги Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Визначає, що відображує мінікартка книги адрес Evolution. "
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Переглядач мінікартки адресної книги Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Directory Servers"
-msgstr "Сервери каталогів"
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Переглядач мінікартки адресної книги Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Переглядач мінікартки адресної книги Evolution"
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Перевірочний компонент Evolutuion."
 
 #: 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"
+#, 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
+#: 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 "Контакти"
 
@@ -665,9 +672,11 @@ msgid "Other Contacts"
 msgstr "Інші контакти"
 
 #: addressbook/gui/component/addressbook.c:512
-msgid "We were unable to open this addressbook.  Please check that the\n"
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
-msgstr "Неможливо відкрити книгу адрес. Перевірте чи існує згаданий шлях,\n"
+msgstr ""
+"Неможливо відкрити книгу адрес. Перевірте чи існує згаданий шлях,\n"
 "та чи ви маєте потрібні права доступу до нього."
 
 #: addressbook/gui/component/addressbook.c:522
@@ -675,7 +684,8 @@ 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 "Не вдається відкрити книгу адрес. Це означає, що або ви\n"
+msgstr ""
+"Не вдається відкрити книгу адрес. Це означає, що або ви\n"
 "вказали неправильний URI, або не працює сервер LDAP"
 
 #: addressbook/gui/component/addressbook.c:527
@@ -695,7 +705,8 @@ 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 "Не вдається відкрити книгу адрес. Це означає, що або ви\n"
+msgstr ""
+"Не вдається відкрити книгу адрес. Це означає, що або ви\n"
 "вказали неправильний URI, або не працює сервер LDAP"
 
 #: addressbook/gui/component/addressbook.c:557
@@ -776,7 +787,7 @@ 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 "Будь-яка категорія"
 
@@ -789,46 +800,46 @@ msgstr "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 "(немає)"
 
-#: 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 "Головна ел. пошта"
 
-#: 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 "Створити новий контакт \"%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 "Додати адресу до існуючого контакту \"%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:997
+#: 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: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 "Додати до контактів"
 
-#: addressbook/gui/component/e-address-popup.c:1051
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Об'єднати ел.адреси"
 
@@ -842,8 +853,7 @@ 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
+#: mail/mail-config.glade.h:1 mail/subscribe-dialog.glade.h:1
 msgid "\n"
 msgstr "\n"
 
@@ -858,8 +868,7 @@ msgstr " Показати підтримувані бази "
 #: 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
+#: 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 "*"
@@ -896,8 +905,7 @@ msgstr "Додати cервер LDAP"
 msgid "Addressbook Sources"
 msgstr "Джерело адресної книги"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
-#: mail/mail-account-gui.c:61
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
 #: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Завжди"
@@ -911,7 +919,8 @@ msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
 "\n"
-"Please click the \"Finish\" button to save the settings you have entered here."
+"Please click the \"Finish\" button to save the settings you have entered "
+"here."
 msgstr ""
 "Вітаємо, ви закінчили налаштовування LDAP серверу. Тепер\n"
 "ви готові отримати доступ до цього каталогу.\n"
@@ -940,11 +949,15 @@ msgstr "Електронна адреса:"
 
 #: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Для автентифікації на сервері Evolution буде використовувати це відокремлене ім'я"
+msgstr ""
+"Для автентифікації на сервері Evolution буде використовувати це відокремлене "
+"ім'я"
 
 #: addressbook/gui/component/ldap-config.glade.h:25
-msgid "Evolution will use this email address to authenticate you with the server"
-msgstr "Для автентифікації на сервері Evolution буде використовувати електрону адресу"
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"Для автентифікації на сервері Evolution буде використовувати електрону адресу"
 
 #: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Finished"
@@ -959,21 +972,26 @@ msgstr "Загальне"
 msgid "LDAP Configuration Assistant"
 msgstr "Майстер налаштовування LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
-#: mail/mail-account-gui.c:63
-#: mail/mail-config.glade.h:76
+#: 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:30
 msgid ""
-"Now, you must specify how you want to connect to the LDAP server. The SSL (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."
-msgstr ""
-"Тепер вам слід вказати яким чином з'єднуватись з сервером LDAP. Для криптографічного захисту з'єднань\n"
-"деякими серверами використовуються пртоколи SSL (Secure Sockets Layer) та TLS (Transport Layer Security).\n"
-"Спитайте системного адміністратора, чи підтримує ваш сервер LDAP ці протоколи."
+"Now, you must specify how you want to connect to the LDAP server. The SSL "
+"(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."
+msgstr ""
+"Тепер вам слід вказати яким чином з'єднуватись з сервером LDAP. Для "
+"криптографічного захисту з'єднань\n"
+"деякими серверами використовуються пртоколи SSL (Secure Sockets Layer) та "
+"TLS (Transport Layer Security).\n"
+"Спитайте системного адміністратора, чи підтримує ваш сервер LDAP ці "
+"протоколи."
 
 #: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
@@ -985,9 +1003,8 @@ msgstr "Простір по_шуку: "
 
 #. 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 "Пошук"
 
@@ -996,40 +1013,62 @@ msgid "Selected:"
 msgstr "Вибрано:"
 
 #: addressbook/gui/component/ldap-config.glade.h:37
-msgid "Selecting this option means that Evolution will only connect to your LDAP server if\n"
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if\n"
 "your LDAP server supports SSL or TLS."
-msgstr "Вибір цього параметру означатиме, що Evolution з'єднуватиметься з сервером LDAP лише, якщо\n"
+msgstr ""
+"Вибір цього параметру означатиме, що Evolution з'єднуватиметься з сервером "
+"LDAP лише, якщо\n"
 "він підтримує SSL або TLS."
 
 #: 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"
-"insecure environment. For example, if you and your LDAP server are behind a firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection is already\n"
+"Selecting this option means that Evolution will only try to use SSL/TLS if "
+"you are in a \n"
+"insecure environment. For example, if you and your LDAP server are behind a "
+"firewall\n"
+"at work, then Evolution doesn't need to use SSL/TLS because your connection "
+"is already\n"
 "secure."
 msgstr ""
-"Вибір цього параметру означатиме, що Evolution намагатиметься використовувати SSL/TLS\n"
-"лише у випадку, якщо ви у небезпечному середовищі. Наприклад, якщо ви, та ваш сервер LDAP\n"
-"захищені корпоративним брандмауером, тоді Evolution не використовуватиме SSL/TLS, бо\n"
+"Вибір цього параметру означатиме, що Evolution намагатиметься "
+"використовувати SSL/TLS\n"
+"лише у випадку, якщо ви у небезпечному середовищі. Наприклад, якщо ви, та "
+"ваш сервер LDAP\n"
+"захищені корпоративним брандмауером, тоді Evolution не використовуватиме SSL/"
+"TLS, бо\n"
 "ваше з'єднання вже захищене."
 
 #: 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"
-"means that your connection will be insecure, and that you will be vulnerable to security\n"
+"Selecting this option means that your server does not support either SSL or "
+"TLS.  This \n"
+"means that your connection will be insecure, and that you will be vulnerable "
+"to security\n"
 "exploits. "
-msgstr "Вибір цього параметру означатиме, цо ваш сервер не підтримує ані SSL, ані TLS. Це означає\n"
-"що ваше з'єднання не буде безпечним, та ви будете уразливі до порушення безпеки."
+msgstr ""
+"Вибір цього параметру означатиме, цо ваш сервер не підтримує ані SSL, ані "
+"TLS. Це означає\n"
+"що ваше з'єднання не буде безпечним, та ви будете уразливі до порушення "
+"безпеки."
 
 #: addressbook/gui/component/ldap-config.glade.h:46
-msgid "Selecting this option will let you change Evolution's default settings for LDAP\n"
+msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
 "searches, and for creating and editing contacts. "
-msgstr "Вибір цього параметру дозволить вам змінити типові параметри Evolution\n"
+msgstr ""
+"Вибір цього параметру дозволить вам змінити типові параметри Evolution\n"
 "для виконання пошуку в LDAP, створення та виправлення контактів. "
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Specifying a display name is the last required step in configuring an LDAP server."
-msgstr "Вказання відображуваного імені є останнім короком у налаштовуванні сервера LDAP."
+msgid ""
+"Specifying a display name is the last required step in configuring an LDAP "
+"server."
+msgstr ""
+"Вказання відображуваного імені є останнім короком у налаштовуванні сервера "
+"LDAP."
 
 #: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 1: Server Information"
@@ -1056,36 +1095,57 @@ msgid "Supported Search Bases"
 msgstr "Підтримувані бази пошуку"
 
 #: 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"
-"information. Please ask your system administrator if you are unsure of this information."
-msgstr "Перший крок у налаштовуванні сервера LDAP — вказати його назву та інформацію про підключення\n"
+msgid ""
+"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 ""
+"Перший крок у налаштовуванні сервера LDAP — вказати його назву та інформацію "
+"про підключення\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 ""
-"Параметри цієї сторінки визначають кількість елементів, які слід включати під час\n"
-"виконання пошуку, та час який займатиме пошук. Якщо ви хочете змінити ці параметри,\n"
+"Параметри цієї сторінки визначають кількість елементів, які слід включати "
+"під час\n"
+"виконання пошуку, та час який займатиме пошук. Якщо ви хочете змінити ці "
+"параметри,\n"
 "зверніться до системного адміністратора."
 
 #: 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"
-"begin. If you leave this blank, the search will begin at the root of the directory tree."
-msgstr "База пошуку — це відокремлене ім'я (ВІ) елементу, з якого починатиметься пошук. Якщо ви\n"
-"залишите це поле порожнім - пошук виконуватиметься з кореневого елементу сервера."
+msgid ""
+"The search base is the distinguished name (DN)  of the entry where your "
+"searches will \n"
+"begin. If you leave this blank, the search will begin at the root of the "
+"directory tree."
+msgstr ""
+"База пошуку — це відокремлене ім'я (ВІ) елементу, з якого починатиметься "
+"пошук. Якщо ви\n"
+"залишите це поле порожнім - пошук виконуватиметься з кореневого елементу "
+"сервера."
 
 #: 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.\n"
-msgstr ""
-"Простір пошуку визначає як глибоко ви бажаєте розширити пошук по дереву каталогів.\n"
-"Простір пошуку \"Всі нижчі рівні\" включає усі елементи, які знаходяться нижче за базу пошуку\n"
-"Простір пошуку \"Один рівень\" включає тільки елементи, які знаходяться на один рівень нижче\n"
+"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.\n"
+msgstr ""
+"Простір пошуку визначає як глибоко ви бажаєте розширити пошук по дереву "
+"каталогів.\n"
+"Простір пошуку \"Всі нижчі рівні\" включає усі елементи, які знаходяться "
+"нижче за базу пошуку\n"
+"Простір пошуку \"Один рівень\" включає тільки елементи, які знаходяться на "
+"один рівень нижче\n"
 
 #: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
@@ -1100,32 +1160,49 @@ msgstr ""
 "використовуючи сервери LDAP (Lightweight Directory Access Protocol). \n"
 "\n"
 "Додавання нового сервера LDAP потребує спеціальної інформації про сервер.\n"
-"Будь ласка, зв'яжіться з вашім системним адміністратором, якщо вам потрібна допомога\n"
+"Будь ласка, зв'яжіться з вашім системним адміністратором, якщо вам потрібна "
+"допомога\n"
 "для отримання цієї інформації."
 
 #: addressbook/gui/component/ldap-config.glade.h:72
-msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
+msgid ""
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr "Повна назва вашого сервера LDAP. Наприклад, \"ldap.mycompany.com\"."
 
 #: addressbook/gui/component/ldap-config.glade.h:73
-msgid "This is the maximum number of entries to download. Setting this number to be \n"
+msgid ""
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
-msgstr "Максимальна кількість елементів для завантаження. Встановлення занадто великого\n"
+msgstr ""
+"Максимальна кількість елементів для завантаження. Встановлення занадто "
+"великого\n"
 "значення сповільнить роботу записної книжки."
 
 #: 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 "Це метод, яким evolution буде вас автентифікувати. Зверніть увагу, якщо ви оберете тут \"Ел.адреса\" ви мусите мати анонімний доступ до вашого сервера LDAP"
+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 ""
+"Це метод, яким evolution буде вас автентифікувати. Зверніть увагу, якщо ви "
+"оберете тут \"Ел.адреса\" ви мусите мати анонімний доступ до вашого сервера "
+"LDAP"
 
 #: 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"
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list.\n"
 "It is for display purposes only. "
-msgstr "Назва цього сервера, що буде показана в вашому списку тек Evolution.\n"
+msgstr ""
+"Назва цього сервера, що буде показана в вашому списку тек Evolution.\n"
 "Воно використовується тільки для показу."
 
 #: 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"
+"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 ""
@@ -1149,8 +1226,7 @@ msgstr "Використовувати відокремлену назву (DN)"
 msgid "Using email address"
 msgstr "Використовувати електронну адресу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
-#: mail/mail-account-gui.c:62
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
 #: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Усякий раз коли можливо"
@@ -1158,10 +1234,8 @@ msgstr "Усякий раз коли можливо"
 #: 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
+#: 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 "_Додати"
 
@@ -1173,16 +1247,12 @@ msgstr "_Назва для відображення:"
 msgid "_Download limit:"
 msgstr "_Межа завантаження:"
 
-#: 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
+#: 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
-#: ui/evolution-signature-editor.xml.h:11
-#: ui/evolution-subscribe.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Редагування"
@@ -1227,47 +1297,36 @@ 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."
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
 msgstr "Інтерфейс вибору імені у книзі адрес Evolution"
 
-#: 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: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 "Видалити"
 
-#: 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 "Надіслати ел.пошту у HTML?"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:300
-msgid "View Contact Info"
-msgstr "Показати контактну інформацію"
-
-#: 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 "Показати список контактів"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:417
-msgid "Unnamed Contact List"
-msgstr "Неназваний контактний список"
+#: 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)"
-msgstr "(%d не показано)"
+#: 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:500
+#: addressbook/gui/component/select-names/e-select-names-popup.c:350
 msgid "Unnamed Contact"
 msgstr "Неназваний контакт"
 
@@ -1276,11 +1335,11 @@ msgstr "Неназваний контакт"
 msgid "Source"
 msgstr "Джерело"
 
-#: 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 "Знайти контакт у"
 
@@ -1301,9 +1360,11 @@ msgid "Show Contacts"
 msgstr "Показати контакти"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Type a name into the entry, or\n"
+msgid ""
+"Type a name into the entry, or\n"
 "select one from the list below:"
-msgstr "Введіть ім'я або\n"
+msgstr ""
+"Введіть ім'я або\n"
 "виберіть один з варіантів зі списку:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:8
@@ -1368,9 +1429,12 @@ msgid "Full _Name..."
 msgstr "Повне ім'я..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "If this person publishes free/busy or other calendar information on the Internet, enter the address\n"
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
 "of that information here."
-msgstr "Якщо ця людина публікує в Інтернет відомості про свій стан зайнятості,\n"
+msgstr ""
+"Якщо ця людина публікує в Інтернет відомості про свій стан зайнятості,\n"
 "Введіть адресу цих відомостей."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
@@ -1403,18 +1467,12 @@ msgstr "Хоче отримувати листи в 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
-#: 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
+#: 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 "Стерти"
@@ -1449,10 +1507,10 @@ msgstr "Адреса сторінки WWW:"
 #: 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 "Редаговане"
 
@@ -2482,7 +2540,7 @@ msgstr "Зімбабве"
 #: 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 "Книга"
@@ -2490,7 +2548,7 @@ 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:186
+#: addressbook/gui/widgets/e-minicard.c:190
 msgid "Card"
 msgstr "Картка"
 
@@ -2519,15 +2577,19 @@ msgid "Save Contact as VCard"
 msgstr "Зберегти контакти як VCard"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:1056
-msgid "Are you sure you want\n"
+msgid ""
+"Are you sure you want\n"
 "to delete these contacts?"
-msgstr "Ви впевнені, що хочете\n"
+msgstr ""
+"Ви впевнені, що хочете\n"
 "стерти ці контакти?"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:1059
-msgid "Are you sure you want\n"
+msgid ""
+"Are you sure you want\n"
 "to delete this contact?"
-msgstr "Ви впевнені, що хочете\n"
+msgstr ""
+"Ви впевнені, що хочете\n"
 " стерти ці контакти?"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:1751
@@ -2567,9 +2629,11 @@ msgstr "список"
 
 #: addressbook/gui/contact-editor/e-contact-save-as.c:206
 #, c-format
-msgid "%s already exists\n"
+msgid ""
+"%s already exists\n"
 "Do you want to overwrite it?"
-msgstr "%s вже існує\n"
+msgstr ""
+"%s вже існує\n"
 "Хочете переписати?"
 
 #: addressbook/gui/contact-editor/e-contact-save-as.c:210
@@ -2686,15 +2750,15 @@ msgstr "Члени"
 
 #: 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 "Наберіть ел.адресу або перетягніть контактну інформацію у нижчий список:"
+msgstr ""
+"Наберіть ел.адресу або перетягніть контактну інформацію у нижчий список:"
 
 #: 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:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: filter/filter.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "Видалити"
 
@@ -2737,9 +2801,11 @@ msgid "Original Contact:"
 msgstr "Оригінальний контакт:"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
-msgid "The name or email address of this contact already exists\n"
+msgid ""
+"The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
-msgstr "Назва чи електронна адреса цього контакту вже існує\n"
+msgstr ""
+"Назва чи електронна адреса цього контакту вже існує\n"
 "у цій теці.  Чи хочете ви додати його все одно?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
@@ -2755,9 +2821,11 @@ msgid "Conflicting Contact:"
 msgstr "Конфліктний контакт:"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
-msgid "The changed email or name of this contact already\n"
+msgid ""
+"The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
-msgstr "Змінена назва чи електронна адреса цього контакту\n"
+msgstr ""
+"Змінена назва чи електронна адреса цього контакту\n"
 "існує у вже теці.  Бажаєте додати його все одно?"
 
 #. FIXME: get the toplevel window...
@@ -2782,7 +2850,7 @@ msgstr "Карток: %d"
 #: 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 "Запит"
@@ -2797,12 +2865,12 @@ msgstr "Модель"
 
 #: 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 "Помилка модифікації картки"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr "Успішно"
 
@@ -2810,9 +2878,8 @@ msgstr "Успішно"
 #: 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:529 shell/e-shell.c:2075
+#: shell/e-storage.c:602 shell/evolution-shell-component.c:1217
 msgid "Unknown error"
 msgstr "Невідома помилка"
 
@@ -2820,9 +2887,8 @@ msgstr "Невідома помилка"
 msgid "Repository offline"
 msgstr "Репозиторій поза мережею"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
-#: shell/e-storage.c:588
-#: shell/evolution-shell-component.c:1193
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr "Доступ заборонено"
 
@@ -2839,15 +2905,11 @@ 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
-#: camel/camel-service.c:849
-#: camel/camel-service.c:892
+#: 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"
@@ -2906,9 +2968,11 @@ msgstr "Помилка видалення картки"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
-msgid "Opening %d cards will open %d new windows as well.\n"
+msgid ""
+"Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
-msgstr "При відкритті картки %d  буде також відкрито нове вікно %d.\n"
+msgstr ""
+"При відкритті картки %d  буде також відкрито нове вікно %d.\n"
 "Ви справді бажаєте відкрити всі ці картки?"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:328
@@ -2944,8 +3008,7 @@ msgid "Type"
 msgstr "Тип"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:394
-#: importers/evolution-gnomecard-importer.c:228
-#: importers/pine-importer.c:642
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Адресна книга"
@@ -2994,12 +3057,9 @@ msgstr "Переслати контакт"
 msgid "Send Message to Contact"
 msgstr "Відіслати повідомлення за контактом"
 
-#: 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
+#: 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 "Друкувати"
@@ -3017,38 +3077,30 @@ msgid "Move to folder..."
 msgstr "Перенести в теку..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:897
-#: ui/evolution-addressbook.xml.h:6
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Вирізати"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:898
-#: ui/evolution-addressbook.xml.h:2
-#: ui/evolution-mail-message.xml.h:8
+#: 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:899
-#: ui/evolution-addressbook.xml.h:13
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Вставити"
 
-#: 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
+#: 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: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 "Поточний вигляд"
 
@@ -3152,38 +3204,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 "Ширина стовпчика"
 
@@ -3215,11 +3267,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 "Має курсор"
 
@@ -3333,8 +3385,7 @@ msgstr "Поля"
 msgid "Number of columns:"
 msgstr "Кількість стовпчиків:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
-#: mail/mail-config.glade.h:82
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr "Параметри"
 
@@ -3419,183 +3470,146 @@ msgstr "Шрифт..."
 msgid "Untitled appointment"
 msgstr "Зустріч без назви"
 
-#: calendar/cal-util/cal-recur.c:3985
-#: calendar/gui/print.c:478
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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/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
+#: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
 msgid "High"
 msgstr "Високий"
 
-#: calendar/cal-util/cal-util.c:552
-#: calendar/cal-util/cal-util.c:574
-#: calendar/gui/calendar-model.c:1701
+#: 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
+#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
 msgstr "Звичайний"
 
-#: calendar/cal-util/cal-util.c:554
-#: calendar/cal-util/cal-util.c:576
+#: 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
+#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
 msgid "Low"
 msgstr "Низький"
 
@@ -3606,71 +3620,74 @@ msgstr "Низький"
 msgid "Undefined"
 msgstr "Невизначено"
 
-#: 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 "Помилка під час обміну з календарним сервером"
 
-#: 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
 msgid "Default Priority:"
 msgstr "Типовий пріоритет:"
 
-#: 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 "Керуючий елемент Bonobo, що показує список завдань."
+msgid "Calendar and Tasks"
+msgstr "Календар та завдання"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Приклад керуючого елементу bonobo, що показує календар."
+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 "Календар та завдання"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Центр керування Календарем Evolution."
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Компонент відображення поштової теки Evolutuion."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Налаштуйте ваш часовий пояс, Календар та Список завдань "
+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 "Переглядач iTip/iMip з календарю Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Компонент Evolution для керування календарем."
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Переглядач iTip/iMip з календарю Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Factory for the Evolution Calendar objects"
-msgstr "Конструктор об'єктів Календарю Evolution."
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Переглядач iTip/iMip з календарю Evolution"
 
 #: 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"
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
 msgstr "Конструктор для послуги сповіщення"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
@@ -3717,8 +3734,7 @@ msgstr "Немає опису."
 
 #: 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
+#: calendar/gui/tasks-control.c:463 widgets/misc/e-messagebox.c:161
 msgid "Warning"
 msgstr "Попередження"
 
@@ -3737,7 +3753,8 @@ msgstr ""
 #: calendar/gui/alarm-notify/alarm-queue.c:875
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -3774,8 +3791,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 "Інше"
 
@@ -3785,23 +3801,18 @@ 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/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:409
-#: calendar/gui/calendar-commands.c:414
+#: 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:427
-#: calendar/gui/calendar-commands.c:434
-#: calendar/gui/calendar-commands.c:440
-#: calendar/gui/calendar-commands.c:442
+#: 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"
 
@@ -3809,21 +3820,18 @@ 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"
 
 #: calendar/gui/calendar-commands.c:799
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Неможливо створити вікно календарю. Перевірте параметри ORBit та OAF. "
 
-#: 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
+#: 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 "Календар"
@@ -3838,19 +3846,15 @@ 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:617
-#: 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
+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 "Завдання"
 
@@ -3914,20 +3918,17 @@ msgstr "_Щоденна зустріч"
 msgid "Create a new all-day appointment"
 msgstr "Створити нову щоденну зустріч"
 
-#: 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 "Приватне"
 
-#: 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 "Конфіденційне"
 
-#: calendar/gui/calendar-model.c:410
-#: calendar/gui/e-calendar-table.c:371
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
 msgid "Public"
 msgstr "Загальне"
 
@@ -3947,46 +3948,37 @@ msgstr "Сх"
 msgid "W"
 msgstr "Зх"
 
-#: 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 "Вільний"
 
-#: 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/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: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
+#: 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
+#: 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
+#: 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"
@@ -3997,41 +3989,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
-#: 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
+#: 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
+#: 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: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/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:544
+#: 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: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 "Ні"
@@ -4069,32 +4052,32 @@ msgstr "Відказано в доступі при відкриття кале�
 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:473
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Параметри звукових сповіщень"
 
-#: calendar/gui/dialogs/alarm-options.c:482
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Параметри сигнальних повідомлень"
 
-#: calendar/gui/dialogs/alarm-options.c:491
+#: calendar/gui/dialogs/alarm-options.c:438
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "Параметри поштових сповіщень"
 
-#: calendar/gui/dialogs/alarm-options.c:500
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Програмні параметри сповіщення"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Невідомі параметри сповіщення"
 
@@ -4132,22 +4115,24 @@ msgstr "Відправити"
 msgid "With these arguments:"
 msgstr "З цими аргументами:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: 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: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:12
-#: 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:13
-#: filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
 msgid "minutes"
 msgstr "хвилини"
 
@@ -4161,13 +4146,11 @@ msgstr "Основи"
 msgid "Date/Time:"
 msgstr "Дата й час:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/e-alarm-list.c:461
+#: 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
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
 msgid "Play a sound"
 msgstr "Відтворити звук"
 
@@ -4175,8 +4158,7 @@ msgstr "Відтворити звук"
 msgid "Reminders"
 msgstr "Нагадування"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#: calendar/gui/e-alarm-list.c:469
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
 msgid "Run a program"
 msgstr "Запустити програму"
 
@@ -4187,8 +4169,7 @@ msgstr "Відіслати пошту"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1050
-#: 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 "Зведення:"
 
@@ -4217,8 +4198,7 @@ msgstr "кінець зустрічі"
 msgid "hour(s)"
 msgstr "годин(а)"
 
-#: 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 "хвилин"
 
@@ -4246,8 +4226,7 @@ msgstr "30 хвилин"
 msgid "60 minutes"
 msgstr "60 хвилин"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-#: mail/mail-config.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
 msgid "Alerts"
 msgstr "Сповіщення"
 
@@ -4399,7 +4378,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 "Загальне"
 
@@ -4440,24 +4419,36 @@ msgid "before every appointment"
 msgstr "Перед початком кожної зустрічі"
 
 #: calendar/gui/dialogs/cancel-comp.c:58
-msgid "The event being deleted is a meeting, would you like to send a cancellation notice?"
-msgstr "Ви намагаєтесь видалити засідання, бажаєте відправити повідомлення про відміну?"
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
+"Ви намагаєтесь видалити засідання, бажаєте відправити повідомлення про "
+"відміну?"
 
 #: 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:67
-msgid "The task being deleted is assigned, would you like to send a cancellation notice?"
-msgstr "Ви намагаєтесь видалити назначене завдання, бажаєте відіслати повідомлення про відміну?"
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+"Ви намагаєтесь видалити назначене завдання, бажаєте відіслати повідомлення "
+"про відміну?"
 
 #: 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:76
-msgid "The journal entry being deleted is published, would you like to send a cancellation notice?"
-msgstr "Ви намагаєтесь видалити журнальний запис, який вже опубліковано, бажаєте відіслати повідомлення про відміну?"
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+"Ви намагаєтесь видалити журнальний запис, який вже опубліковано, бажаєте "
+"відіслати повідомлення про відміну?"
 
 #: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
@@ -4512,28 +4503,23 @@ msgstr "%s  Ви не зробили змін, поновити вікно ре�
 msgid "Validation error: %s"
 msgstr "Помилка під час перевірки: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187
-#: calendar/gui/print.c:2226
+#: 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
+#: 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
+#: 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
+#: 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
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2239
 msgid "Due "
 msgstr "Обумовлені завдання "
 
@@ -4577,10 +4563,8 @@ msgid "No summary"
 msgstr "Немає зведення"
 
 #: 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-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 "Зберегти як..."
 
@@ -4589,7 +4573,9 @@ msgstr "Зберегти як..."
 #: calendar/gui/dialogs/comp-editor.c:1379
 #, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr "Внесені в цей елемент зміни може бути скасовано, якщо прийде оновлення по ел.пошті"
+msgstr ""
+"Внесені в цей елемент зміни може бути скасовано, якщо прийде оновлення по ел."
+"пошті"
 
 #: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
@@ -4649,8 +4635,7 @@ msgstr "Доручити:"
 msgid "Enter Delegate"
 msgstr "Ввести делегата"
 
-#: calendar/gui/dialogs/event-editor.c:199
-#: calendar/gui/print.c:2265
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2265
 msgid "Appointment"
 msgstr "Зустріч"
 
@@ -4670,25 +4655,23 @@ msgstr "Планування"
 
 #: 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
+#: calendar/gui/dialogs/event-editor.c:437 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Засідання"
 
-#: 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
 msgid "Start time is wrong"
 msgstr "Неправильний час початку:"
 
-#: calendar/gui/dialogs/event-page.c:694
+#: calendar/gui/dialogs/event-page.c:640
 msgid "End time is wrong"
 msgstr "Неправильний час закінчення"
 
@@ -4745,15 +4728,10 @@ msgid "Su_mmary:"
 msgstr "З_ведення:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Контакти..."
-
-#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_End time:"
 msgstr "Час _завершення:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "Час _початку:"
 
@@ -4813,15 +4791,14 @@ msgid "Member"
 msgstr "Член"
 
 #: 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 "Зацікавлена персона"
 
 #: 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
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Стан"
@@ -4836,7 +4813,7 @@ msgid "_Change Organizer"
 msgstr "Змінити організатора"
 
 #: 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 "Запросити інших..."
 
@@ -4849,7 +4826,8 @@ 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?"
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
 #: calendar/gui/dialogs/recur-comp.c:72
@@ -4866,7 +4844,8 @@ msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Ця зустріч містить правила повторення, які Evolution не може редагувати."
+msgstr ""
+"Ця зустріч містить правила повторення, які Evolution не може редагувати."
 
 #: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
@@ -5033,11 +5012,9 @@ msgstr "Призначення"
 msgid "Due date is wrong"
 msgstr "Неправильна дата виконання"
 
-#: 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
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Опис:"
 
@@ -5045,6 +5022,10 @@ 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 "Дата ви_конання:"
@@ -5143,61 +5124,68 @@ 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:2838
-#: calendar/gui/e-week-view.c:1906
+#: 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:950
-#: calendar/gui/e-day-view.c:3705
-#: calendar/gui/e-week-view.c:3557
-#: mail/folder-browser.c:1756
-#: shell/e-shortcuts-view.c:415
-#: 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 "Відкрити"
 
@@ -5205,46 +5193,31 @@ msgstr "Відкрити"
 msgid "_Save as..."
 msgstr "З_берегти як..."
 
-#: 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
-#: 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
+#: 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:956
-#: calendar/gui/e-day-view.c:3712
-#: calendar/gui/e-week-view.c:3564
-#: ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.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:957
-#: calendar/gui/e-day-view.c:3713
-#: calendar/gui/e-week-view.c:3565
-#: ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:26
-#: ui/evolution-mail-list.xml.h:24
+#: 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: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
-#: ui/evolution-calendar.xml.h:29
-#: ui/evolution-mail-list.xml.h:29
+#: 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 "Вставити"
@@ -5269,9 +5242,8 @@ msgstr "Позначити вибрані завдання як _виконан�
 msgid "_Delete Selected Tasks"
 msgstr "Стерти вибрані завдання"
 
-#: calendar/gui/e-calendar-table.c:1244
-#: calendar/gui/e-day-view.c:7635
-#: calendar/gui/e-week-view.c:4265
+#: 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 "Оновити об'єкти"
 
@@ -5284,8 +5256,7 @@ msgstr "Клацніть щоб додати завдання"
 msgid "Alarms"
 msgstr "Сповіщення"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
-#: camel/camel-filter-driver.c:1156
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
 #: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Виконано"
@@ -5315,8 +5286,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 "Зведення"
@@ -5326,15 +5296,13 @@ msgid "Task sort"
 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:166
+#: 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:161
+#: 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"
@@ -5357,31 +5325,26 @@ 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: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-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:268
-#: calendar/gui/e-day-view.c:1409
-#: calendar/gui/e-week-view-main-item.c:336
+#: 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:611
-#: calendar/gui/e-week-view.c:343
+#: 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/e-day-view.c:614 calendar/gui/e-week-view.c:346
 #: calendar/gui/print.c:815
 msgid "pm"
 msgstr "пп"
@@ -5390,78 +5353,63 @@ msgstr "пп"
 msgid "New _Appointment"
 msgstr "Нова зустріч"
 
-#: 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 "Нова щоденна подія"
 
-#: 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 "Нове засідання"
 
-#: 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 "Нове завдання"
 
-#: calendar/gui/e-day-view.c:3673
-#: 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: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 "Перейти на дату..."
 
-#: 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 "Опублікувати інформацію про зайнятість"
 
-#: 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 "_Параметри..."
 
-#: calendar/gui/e-day-view.c:3706
-#: calendar/gui/e-week-view.c:3558
-#: mail/folder-browser.c:1758
-#: 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: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 "За_планувати зустріч..."
 
-#: 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 "Переслати як 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 "Зробити цей екземпляр рухомим"
 
-#: 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 "Стерти всі екземпляри"
 
@@ -5553,8 +5501,7 @@ msgstr "<b>Виконано:</b> "
 msgid "<b>Due:</b> "
 msgstr "<b>Обумовлена дата:</b> "
 
-#: calendar/gui/e-itip-control.c:898
-#: calendar/gui/e-itip-control.c:951
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 msgid "iCalendar Information"
 msgstr "Інформація iCalendar"
 
@@ -5563,378 +5510,350 @@ msgstr "Інформація iCalendar"
 msgid "iCalendar Error"
 msgstr "Помилка iCalendar"
 
-#: 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
+#: 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:1033
-msgid "<br> Please review the following information, and then select an action from the menu below."
-msgstr "<br> Будь ласка перегляньте наступну інформацію, потім оберіть дію з нижнього меню."
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Будь ласка перегляньте наступну інформацію, потім оберіть дію з "
+"нижнього меню."
 
 #: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Немає</i>"
 
-#: calendar/gui/e-itip-control.c:1058
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "Розташування:"
 
-#: calendar/gui/e-itip-control.c:1072
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr "Стан:"
 
-#: calendar/gui/e-itip-control.c:1077
-#: 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/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:1081
-#: calendar/gui/itip-utils.c:416
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Експериментальний"
 
-#: calendar/gui/e-itip-control.c:1085
-#: 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/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:1089
-#: calendar/gui/e-itip-control.c:1297
-#: 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
+#: 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
+#: 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: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 "Обрати дію:"
 
-#: calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Оновити"
 
-#: 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 "Гаразд"
 
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr "Прийнято"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Прийняти для проби"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Відхилено"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Опублікувати інформацію про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Оновити стан учасників"
 
-#: calendar/gui/e-itip-control.c:1225
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Надіслати останню інформацію"
 
-#: 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 "Скасувати"
 
-#: 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> опублікував відомості про засідання."
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Інформація про засідання"
 
-#: 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> запитує присутність %s на засіданні."
 
-#: 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> запитує вашу присутність на засіданні."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "План засідання"
 
-#: 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> бажає прийняти участь у засіданні."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Оновлення засідання"
 
-#: 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> бажає отримати останню інформацію про засідання"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "Запит на оновлення засідання"
 
-#: 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> відповів на запит про участь у засіданні."
 
-#: calendar/gui/e-itip-control.c:1346
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Відповідь про засідання"
 
-#: 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> скасував засідання."
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Скасування засідання"
 
-#: 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> надіслав незрозуміле повідомлення."
 
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Неправильне повідомлення про засідання"
 
-#: 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> опублікував відомості про завдання."
 
-#: calendar/gui/e-itip-control.c:1387
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Інформація про завдання"
 
-#: 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> пропонує %s виконати завдання."
 
-#: 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> пропонує вам виконати завдання."
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "План завдання"
 
-#: 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> бажає прийняти участь у виконанні завдання."
 
-#: calendar/gui/e-itip-control.c:1400
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Оновлення завдання"
 
-#: 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> бажає отримувати останню інформацію про завдання."
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Запит на оновлення завдання"
 
-#: 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> відповів на призначення завдання."
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Відповідь по завданню"
 
-#: 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> скасував завдання."
 
-#: calendar/gui/e-itip-control.c:1421
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Скасування завдання"
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Неправильне повідомлення про завдання"
 
-#: 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> опублікував відомості про зайнятість."
 
-#: calendar/gui/e-itip-control.c:1449
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Інформація про зайнятість"
 
-#: 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> запитує відомості про зайнятість."
 
-#: calendar/gui/e-itip-control.c:1454
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Відповісти про зайнятість"
 
-#: 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> відповів про зайнятість."
 
-#: calendar/gui/e-itip-control.c:1459
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Відповісти про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1464
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Неправильне повідомлення про зайнятість"
 
-#: 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 "Повідомлення сформовано неправильно"
 
-#: calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "Повідомлення містить тільки відповіді, що підтримуються"
 
-#: 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 "Долучений файл не містить правильно сформованого повідомлення"
 
-#: calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "Долучений файл не містить елементів календаря, які можна переглянути"
 
-#: 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 "Об'єкт є неправильним і не може бути оновлений\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 "Трапилась помилка в системі 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 "Неможливо знайти об'єкт\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 "Ви не маєте прав для оновлення календаря\n"
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Оновлення виконано\n"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "Неможливо оновити календарний файл!\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 "Неможливо оновити стан учасника, бо елемент вже не існує"
 
-#: 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 "Ця відповідь не від поточного учасника. Додати його як учасника?"
 
-#: 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 "Неможливо оновити стан учасника, бо поточний стан не правильний!\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 "Ви не маєте прав для оновлення календарю\n"
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Стан учасника оновлено!\n"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "Неможливо оновити стан учасника!\n"
 
-#: calendar/gui/e-itip-control.c:2048
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Видалення завершено"
 
-#: 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 "Елемент відіслано!\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 "Елемент не може бути відіслано!\n"
 
-#: calendar/gui/e-itip-control.c:2205
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr "Виберіть теку для календаря"
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr "Вибір теки"
 
@@ -5979,8 +5898,7 @@ msgstr "дата-початку"
 msgid "Chair Persons"
 msgstr "Головуючі"
 
-#: calendar/gui/e-meeting-model.c:81
-#: calendar/gui/e-meeting-model.c:1695
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
 msgid "Required Participants"
 msgstr "Потрібні учасники"
 
@@ -5992,177 +5910,154 @@ msgstr "Необов'язкові учасники"
 msgid "Resources"
 msgstr "Ресурси"
 
-#: 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
+#: 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:209
-#: calendar/gui/e-meeting-model.c:226
+#: 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:211
-#: calendar/gui/e-meeting-model.c:228
+#: 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:213
-#: calendar/gui/e-meeting-model.c:230
+#: 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:242
-#: calendar/gui/e-meeting-model.c:259
+#: 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:244
-#: calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:542
-#: 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:246
-#: calendar/gui/e-meeting-model.c:263
+#: 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:248
-#: calendar/gui/e-meeting-model.c:265
+#: 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:294
-#: calendar/gui/e-meeting-model.c:317
-#: calendar/gui/e-meeting-model.c:550
-#: calendar/gui/e-meeting-model.c:851
+#: 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:407
+#: 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:302
-#: calendar/gui/e-meeting-model.c:325
+#: 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:306
-#: calendar/gui/e-meeting-model.c:329
+#: 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:2080
+#: 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:2113
-#: e-util/e-time-utils.c:189
-#: e-util/e-time-utils.c:282
-#: e-util/e-time-utils.c:370
+#: 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
+#: 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: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 "Параметри"
 
-#: 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 "Час завершення зібрання:"
 
-#: calendar/gui/e-tasks.c:357
-#: 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:386
-#: calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Не вдалося завантажити завдання в \"%s\""
@@ -6172,18 +6067,18 @@ msgstr "Не вдалося завантажити завдання в \"%s\""
 msgid "The method required to load `%s' is not supported"
 msgstr "Метод, необхідний для завантаження \"%s\", не підтримується"
 
-#: calendar/gui/e-tasks.c:415
-#: 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:483
-#: 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"
+msgid ""
+"Error on %s:\n"
 " %s"
-msgstr "Помилка на %s:\n"
+msgstr ""
+"Помилка на %s:\n"
 " %s"
 
 #: calendar/gui/e-tasks.c:554
@@ -6198,7 +6093,7 @@ msgstr "Стирання вибраних об'єктів"
 msgid "Expunging"
 msgstr "Викреслення"
 
-#: calendar/gui/e-week-view.c:3525
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Нова зустріч..."
 
@@ -6304,62 +6199,57 @@ msgstr "Жовтень"
 msgid "September"
 msgstr "Вересень"
 
-#: 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 "Потрібно вказати організатора."
 
-#: calendar/gui/itip-utils.c:297
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "Потрібен хоча б один учасник"
 
-#: 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 "Інформація про подію"
 
-#: 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 "Інформація про завдання"
 
-#: 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 "Інформація про журнал"
 
-#: 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 "Інформація про зайнятість"
 
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Календарна інформація"
 
-#: calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr "Оновлено"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr "Оновити"
 
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr "Контрпропозиція"
 
-#: calendar/gui/itip-utils.c:512
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Інформація про зайнятість (%s до %s)"
 
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "Інформація iCalendar"
 
-#: calendar/gui/itip-utils.c:672
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Ви маєте бути відвідувачем події."
 
@@ -6396,8 +6286,7 @@ msgstr "Сбт"
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Поточний день (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1910
-#: calendar/gui/print.c:1914
+#: calendar/gui/print.c:1910 calendar/gui/print.c:1914
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
@@ -6405,8 +6294,7 @@ msgstr "%a %b %d"
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1915
-#: calendar/gui/print.c:1917
+#: 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"
@@ -6459,11 +6347,9 @@ msgstr "Категорії: %s"
 msgid "Contacts: "
 msgstr "Контакти:"
 
-#: 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
+#: 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 "Перегляд друку"
 
@@ -6481,11 +6367,13 @@ msgstr "URI, що буде показано у теці завдань"
 
 #: 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"
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Ця операція назавжди зітре всі завдання, позначені як завершені. Якщо ви продовжите: ви не зможете відновити ці завдання.\n"
+"Ця операція назавжди зітре всі завдання, позначені як завершені. Якщо ви "
+"продовжите: ви не зможете відновити ці завдання.\n"
 "\n"
 "Дійсно стерти ці завдання?"
 
@@ -6497,38 +6385,51 @@ msgstr "Не питати знову."
 msgid "Print Tasks"
 msgstr "Надрукувати завдання"
 
-#: calendar/gui/weekday-picker.c:280
-#: calendar/gui/weekday-picker.c:388
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:388
 msgid "SMTWTFS"
 msgstr "НПВСЧПС"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "Майстер імпорту файлів iCalendar у Evolution"
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Переглядач iTip/iMip з календарю Evolution"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "Імпортує файли iCalendar у Evolution"
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Переглядач iTip/iMip з календарю Evolution"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "Імпортує файли vCalendar у Evolution"
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Переглядач iTip/iMip з календарю Evolution"
 
-#: calendar/importers/icalendar-importer.c:391
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+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
 msgid "Reminder!!"
 msgstr "Нагадування!"
 
-#: calendar/importers/icalendar-importer.c:610
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "Календарні події"
 
-#: calendar/importers/icalendar-importer.c:635
-msgid "Evolution has found Gnome Calendar files.\n"
+#: calendar/importers/icalendar-importer.c:663
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
-msgstr "Evolution знайшов файли  Gnome Calendar.\n"
+msgstr ""
+"Evolution знайшов файли  Gnome Calendar.\n"
 "Бажаєте імпортувати їх у Evolution?"
 
-#: calendar/importers/icalendar-importer.c:642
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr "Календар GNOME"
 
@@ -6609,16 +6510,24 @@ msgid "contains? expects argument 2 to be a string"
 msgstr "contains? очікує, що 2 аргумент буде символьного типу"
 
 #: calendar/pcs/query.c:734
-msgid "contains? expects argument 1 to be one of \"any\", \"summary\", \"description\""
-msgstr "contains? очікує, що 1 аргумент буде одним з \"any\", \"summary\", \"description\""
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+"contains? очікує, що 1 аргумент буде одним з \"any\", \"summary\", "
+"\"description\""
 
 #: calendar/pcs/query.c:776
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? очікує принаймні 1 аргумент"
 
 #: calendar/pcs/query.c:788
-msgid "has-categories? expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
-msgstr "has-categories? очікує, що усі аргументи будуть символьного типу, або єдиний аргумент логічного типу - хибність (#f)"
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+"has-categories? очікує, що усі аргументи будуть символьного типу, або єдиний "
+"аргумент логічного типу - хибність (#f)"
 
 #: calendar/pcs/query.c:876
 msgid "is-completed? expects 0 arguments"
@@ -8237,15 +8146,13 @@ msgstr "Готуємо теку '%s' для переходу в режим offli
 msgid "You must be working online to complete this operation"
 msgstr "Ви маєте працювати в мережі для завершення цієї операції"
 
-#: camel/camel-filter-driver.c:667
-#: camel/camel-filter-search.c:511
+#: 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-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"
@@ -8256,19 +8163,16 @@ msgstr "Неможливо створити дочірній процес '%s':
 msgid "Invalid message stream received from %s: %s"
 msgstr "Отримано неправильний потік повідомлень з %s: %s"
 
-#: camel/camel-filter-driver.c:923
-#: camel/camel-filter-driver.c:932
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Синхронізація тек"
 
-#: camel/camel-filter-driver.c:1021
-#: camel/camel-filter-driver.c:1394
+#: 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:1030
-#: camel/camel-filter-driver.c:1400
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Помилка виконання фільтра: %s: %s"
@@ -8290,14 +8194,12 @@ msgstr "Отримання повідомлення %d (%d%%)"
 msgid "Cannot open message"
 msgstr "Неможливо відкрити повідомлення"
 
-#: camel/camel-filter-driver.c:1126
-#: camel/camel-filter-driver.c:1138
+#: 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:1152
-#: camel/camel-filter-driver.c:1246
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Синхронізація теки"
 
@@ -8323,28 +8225,30 @@ msgstr "Неправильні аргументи до (system-flag)"
 msgid "Invalid arguments to (user-tag)"
 msgstr "Неправильні аргументи до (user-tag)"
 
-#: camel/camel-filter-search.c:657
-#: camel/camel-filter-search.c:665
+#: 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:346
 #, c-format
-msgid "Cannot parse search expression: %s:\n"
+msgid ""
+"Cannot parse search expression: %s:\n"
 "%s"
-msgstr "Неможливо проаналізувати пошуковий вираз: %s:\n"
+msgstr ""
+"Неможливо проаналізувати пошуковий вираз: %s:\n"
 "%s"
 
 #: camel/camel-folder-search.c:356
 #, c-format
-msgid "Error executing search expression: %s:\n"
+msgid ""
+"Error executing search expression: %s:\n"
 "%s"
-msgstr "Помилка виконання пошукового виразу: %s:\n"
+msgstr ""
+"Помилка виконання пошукового виразу: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:573
-#: camel/camel-folder-search.c:601
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr "(співпадають всі) потребує єдиного логічного результату"
 
@@ -8366,7 +8270,8 @@ msgstr "Операція не підтримується: пошук за вир
 #: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
-msgstr "Операція не підтримується: пошук за ідентифікаторами користувачів: для %s"
+msgstr ""
+"Операція не підтримується: пошук за ідентифікаторами користувачів: для %s"
 
 #: camel/camel-folder.c:1319
 msgid "Moving messages"
@@ -8397,17 +8302,16 @@ msgstr "Неможливо проаналізувати запит паролю
 
 #: camel/camel-gpg-context.c:769
 #, c-format
-msgid "You need a passphrase to unlock the key for\n"
+msgid ""
+"You need a passphrase to unlock the key for\n"
 "user: \"%s\""
-msgstr "Потрібен пароль, щоб відкрити ключ для \n"
+msgstr ""
+"Потрібен пароль, щоб відкрити ключ для \n"
 "користувача: \"%s\""
 
-#: 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
+#: 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 "Відмінено."
 
@@ -8444,26 +8348,24 @@ msgstr ""
 msgid "Failed to GPG %s: %s\n"
 msgstr "Збій GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1240
-#: camel/camel-gpg-context.c:1533
+#: 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: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
+#: 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:1333
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "Неможливо перевірити підпис повідомлення: не вдалося створити тимчасовий файл: %s"
+msgstr ""
+"Неможливо перевірити підпис повідомлення: не вдалося створити тимчасовий "
+"файл: %s"
 
 #: camel/camel-lock-client.c:111
 #, c-format
@@ -8475,8 +8377,7 @@ msgstr "Не вдалося створити канал до блокірато�
 msgid "Cannot fork locking helper: %s"
 msgstr "Не вдалося запустити блокіратор: %s"
 
-#: camel/camel-lock-client.c:202
-#: camel/camel-lock-client.c:225
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Неможливо заблокувати '%s': помилка протоколу з блокиратором"
@@ -8486,8 +8387,7 @@ msgstr "Неможливо заблокувати '%s': помилка прот�
 msgid "Could not lock '%s'"
 msgstr "Не вдалося заблокувати %s"
 
-#: camel/camel-lock.c:92
-#: camel/camel-lock.c:113
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Не вдалося створити файл блокування для %s: %s"
@@ -8556,14 +8456,12 @@ msgstr "Помилка зчитування файлу пошти: %s"
 msgid "Error writing mail temp file: %s"
 msgstr "Помилка запису пошти у тимчасовий файл: %s"
 
-#: camel/camel-movemail.c:465
-#: camel/camel-movemail.c:532
+#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Помилка копіювання тимчасового поштового файлу: %s"
 
-#: camel/camel-multipart-encrypted.c:259
-#: camel/camel-multipart-encrypted.c:274
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Неможливо декодувати секцію MIME: помилка протоколу"
 
@@ -8586,7 +8484,8 @@ msgstr "помилка аналізу"
 #: camel/camel-provider.c:132
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "Неможливо завантажити %s: Ця система не підтримує завантаження модулів."
+msgstr ""
+"Неможливо завантажити %s: Ця система не підтримує завантаження модулів."
 
 #: camel/camel-provider.c:141
 #, c-format
@@ -8606,28 +8505,32 @@ msgstr "Анонім"
 msgid "This option will connect to the server using an anonymous login."
 msgstr "Під'єднуватись до сервера анонімно (anonymous)."
 
-#: camel/camel-sasl-anonymous.c:110
-#: camel/camel-sasl-plain.c:87
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "Збій автентифікації."
 
 #: camel/camel-sasl-anonymous.c:119
 #, c-format
-msgid "Invalid email address trace information:\n"
+msgid ""
+"Invalid email address trace information:\n"
 "%s"
-msgstr "Неправильна інформація трасування ел.адреси:\n"
+msgstr ""
+"Неправильна інформація трасування ел.адреси:\n"
 "%s"
 
 #: camel/camel-sasl-anonymous.c:131
 #, c-format
-msgid "Invalid opaque trace information:\n"
+msgid ""
+"Invalid opaque trace information:\n"
 "%s"
-msgstr "Неправильна прихована інформація трасування:\n"
+msgstr ""
+"Неправильна прихована інформація трасування:\n"
 "%s"
 
 #: camel/camel-sasl-anonymous.c:143
 #, c-format
-msgid "Invalid trace information:\n"
+msgid ""
+"Invalid trace information:\n"
 "%s"
 msgstr "Помилка завантаження файлу: %s"
 
@@ -8636,16 +8539,24 @@ msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
 #: camel/camel-sasl-cram-md5.c:37
-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
-msgstr "Під'єднуватись до серверу з використанням протоколу ідентифікації CRAM-MD5, якщо сервер його підтримує."
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"Під'єднуватись до серверу з використанням протоколу ідентифікації CRAM-MD5, "
+"якщо сервер його підтримує."
 
 #: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 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."
-msgstr "Під'єднуватись до серверу з використанням зашифрованих паролів DIGEST-MD5, якщо сервер його підтримує."
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"Під'єднуватись до серверу з використанням зашифрованих паролів DIGEST-MD5, "
+"якщо сервер його підтримує."
 
 #: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
@@ -8680,27 +8591,43 @@ msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "Під'єднуватись до серверу з використанням Kerberos 5 автентифікації."
 
 #: camel/camel-sasl-gssapi.c:148
-msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
-msgstr "Зазначений механізм не підтримується встановленими мандатом або має невпізнану реалізацію."
+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 "Зазначений параметр target_name було ill-форматовано."
 
 #: camel/camel-sasl-gssapi.c:156
-msgid "The provided target_name parameter contained an invalid or unsupported type of name."
-msgstr "Зазначений параметр target_name містив неправильний або непідтримуваний тип імені."
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+"Зазначений параметр target_name містив неправильний або непідтримуваний тип "
+"імені."
 
 #: camel/camel-sasl-gssapi.c:160
-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
+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 "Вхідний маркер input_token містить неправильний підпис або підпис який не може бути перевірено."
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+"Вхідний маркер input_token містить неправильний підпис або підпис який не "
+"може бути перевірено."
 
 #: 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."
+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
@@ -8710,7 +8637,9 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:177
 #, fuzzy
 msgid "The consistency checks performed on the input_token failed."
-msgstr "Свідчить, що перевірка вхідного маркера на відповідність закінчилася невдачею."
+msgstr ""
+"Свідчить, що перевірка вхідного маркера на відповідність закінчилася "
+"невдачею."
 
 #: camel/camel-sasl-gssapi.c:180
 msgid "The consistency checks performed on the credential failed."
@@ -8720,10 +8649,8 @@ msgstr "Перевірка мандату на відповідність зак
 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-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."
@@ -8748,17 +8675,18 @@ msgstr "Під'єднуватись до серверу з використан�
 
 #: camel/camel-sasl-kerberos4.c:162
 #, c-format
-msgid "Could not get Kerberos ticket:\n"
+msgid ""
+"Could not get Kerberos ticket:\n"
 "%s"
-msgstr "Не вдалося отримати білет Kerberos:\n"
+msgstr ""
+"Не вдалося отримати білет Kerberos:\n"
 "%s"
 
 #: camel/camel-sasl-login.c:32
 msgid "Login"
 msgstr "Login"
 
-#: camel/camel-sasl-login.c:34
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr "Під'єднуватись до серверу з використанням незашифрованого паролю."
 
@@ -8771,8 +8699,12 @@ msgid "NTLM / SPA"
 msgstr ""
 
 #: camel/camel-sasl-ntlm.c:33
-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
-msgstr "Під'єднуватись до серверів на базі Windows з використанням NTLM / Secure Password Authentication."
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+"Під'єднуватись до серверів на базі Windows з використанням NTLM / Secure "
+"Password Authentication."
 
 #: camel/camel-sasl-plain.c:32
 msgid "PLAIN"
@@ -8823,8 +8755,7 @@ msgstr "URL '%s' потребує компонент шляху"
 msgid "Resolving: %s"
 msgstr "Розв'язання: %s"
 
-#: camel/camel-service.c:773
-#: camel/camel-service.c:887
+#: camel/camel-service.c:773 camel/camel-service.c:887
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Помилка при розв'язанні імені: %s"
@@ -8859,17 +8790,18 @@ msgstr "Постачальник віртуальних папок ел.пошт
 msgid "For reading mail as a query of another set of folders"
 msgstr "Для читання пошти як запиту до іншого набору тек "
 
-#: camel/camel-session.c:354
-#: camel/camel-session.c:422
+#: 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:548
 #, c-format
-msgid "Could not create directory %s:\n"
+msgid ""
+"Could not create directory %s:\n"
 "%s"
-msgstr "Не вдалося створити каталог %s:\n"
+msgstr ""
+"Не вдалося створити каталог %s:\n"
 "%s"
 
 #: camel/camel-smime-context.c:171
@@ -8891,10 +8823,8 @@ msgstr "Сертифікату підпису \"%s\" не існує."
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "Сертифікату шифрування \"%s\" не існує."
 
-#: camel/camel-smime-context.c:417
-#: camel/camel-smime-context.c:428
-#: camel/camel-smime-context.c:534
-#: camel/camel-smime-context.c:544
+#: 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\"."
@@ -9035,8 +8965,7 @@ msgstr "Використання ключа не підтримує підпис
 msgid "Error in application verification"
 msgstr "Помилка при перевірці додатку"
 
-#: camel/camel-tcp-stream-openssl.c:699
-#: camel/camel-tcp-stream-ssl.c:823
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9049,13 +8978,11 @@ msgstr ""
 "Відбиток:       %s\n"
 "Підпис:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:705
-#: camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr "ГАРАЗД"
 
-#: camel/camel-tcp-stream-openssl.c:705
-#: camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr "НЕПРАВИЛЬНИЙ"
 
@@ -9096,30 +9023,38 @@ msgstr ""
 
 #: camel/camel-tcp-stream-ssl.c:877
 #, c-format
-msgid "Certificate problem: %s\n"
+msgid ""
+"Certificate problem: %s\n"
 "Issuer: %s"
-msgstr "Проблема сертифікату: %s\n"
+msgstr ""
+"Проблема сертифікату: %s\n"
 "Подавець: %s"
 
 #: camel/camel-tcp-stream-ssl.c:929
 #, c-format
-msgid "Bad certificate domain: %s\n"
+msgid ""
+"Bad certificate domain: %s\n"
 "Issuer: %s"
-msgstr "Сертифікат має неправильний домен: %s\n"
+msgstr ""
+"Сертифікат має неправильний домен: %s\n"
 "Подавець: %s"
 
 #: camel/camel-tcp-stream-ssl.c:947
 #, c-format
-msgid "Certificate expired: %s\n"
+msgid ""
+"Certificate expired: %s\n"
 "Issuer: %s"
-msgstr "Строк дії сертифікату вийшов: %s\n"
+msgstr ""
+"Строк дії сертифікату вийшов: %s\n"
 "Подавець: %s"
 
 #: camel/camel-tcp-stream-ssl.c:964
 #, c-format
-msgid "Certificate revocation list expired: %s\n"
+msgid ""
+"Certificate revocation list expired: %s\n"
 "Issuer: %s"
-msgstr "Вийшов строк дії списку скасування сертифікатів: %s\n"
+msgstr ""
+"Вийшов строк дії списку скасування сертифікатів: %s\n"
 "Подавець: %s"
 
 #: camel/camel-url.c:290
@@ -9137,8 +9072,7 @@ msgstr "Помилка збереження \"%s\": %s"
 msgid "No such message %s in %s"
 msgstr "Неправильне повідомлення %s в %s"
 
-#: camel/camel-vee-folder.c:819
-#: camel/camel-vee-folder.c:825
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Неможливо скопіювати або перенести повідомлення до Віртуальної Теки"
 
@@ -9178,9 +9112,11 @@ msgstr "Сервер несподівано розірвав з'єднання:
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:326
 #, c-format
-msgid "Alert from IMAP server %s@%s:\n"
+msgid ""
+"Alert from IMAP server %s@%s:\n"
 "%s"
-msgstr "Повідомлення з IMAP серверу %s@%s:\n"
+msgstr ""
+"Повідомлення з IMAP серверу %s@%s:\n"
 "%s"
 
 #: camel/providers/imap/camel-imap-command.c:395
@@ -9240,9 +9176,11 @@ msgstr "Неможливо знайти повідомлення: %s"
 #: camel/providers/local/camel-mh-folder.c:211
 #: camel/providers/local/camel-mh-folder.c:220
 #, c-format
-msgid "Cannot get message: %s\n"
+msgid ""
+"Cannot get message: %s\n"
 "  %s"
-msgstr "Неможливо отримати повідомлення: %s\n"
+msgstr ""
+"Неможливо отримати повідомлення: %s\n"
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1910
@@ -9292,8 +9230,7 @@ msgstr "Перевіряти нову пошту"
 msgid "Check for new messages in all folders"
 msgstr "Перевіряти нову пошту в усіх теках"
 
-#: 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 "Теки"
 
@@ -9311,7 +9248,8 @@ msgstr "Простір назв"
 
 #: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
-msgstr "Застосувати фільтри до нових повідомлень у теці \"Вхідні\" на цьому сервері"
+msgstr ""
+"Застосувати фільтри до нових повідомлень у теці \"Вхідні\" на цьому сервері"
 
 #: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
@@ -9323,8 +9261,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:86
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr "Пароль"
 
@@ -9411,7 +9348,8 @@ msgstr "Теки \"%s\" не існує"
 
 #: camel/providers/imap/camel-imap-store.c:1839
 #, c-format
-msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Ім'я теки \"%s\" не є коректним тому, що містить символ \"%c\""
 
 #: camel/providers/imap/camel-imap-store.c:1851
@@ -9459,8 +9397,12 @@ msgid "Local delivery"
 msgstr "Локальна доставка"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving (moving) local mail from standard mbox formated spools into folders managed by Evolution."
-msgstr "Для отримання (перенесення) локальної пошти з стандартного накопичувача у форматі mbox в теки, які використовує Evolution."
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
+msgstr ""
+"Для отримання (перенесення) локальної пошти з стандартного накопичувача у "
+"форматі mbox в теки, які використовує Evolution."
 
 #: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
@@ -9484,9 +9426,13 @@ msgid "Standard Unix mbox spool or directory"
 msgstr "Стандартні накопичувачі Unix mbox або каталог"
 
 #: camel/providers/local/camel-local-provider.c:102
-msgid "For reading and storing local mail in external standard mbox spool files.\n"
+msgid ""
+"For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
-msgstr "Для зчитування та збереження локальної пошти у стандартних накопичувальних файлах mbox.Також може бути використано для читання дерева тек в стилі  Elm, Pine або Mutt."
+msgstr ""
+"Для зчитування та збереження локальної пошти у стандартних накопичувальних "
+"файлах mbox.Також може бути використано для читання дерева тек в стилі  Elm, "
+"Pine або Mutt."
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
@@ -9516,8 +9462,7 @@ msgstr "локальне сховище не містить тека Вхідн�
 msgid "Local mail file %s"
 msgstr "Файл локальної пошти %s"
 
-#: camel/providers/local/camel-local-store.c:308
-#: mail/mail-local.c:905
+#: 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"
@@ -9564,9 +9509,11 @@ msgstr "Неправильний вміст повідомлення"
 #: camel/providers/local/camel-mh-store.c:202
 #: camel/providers/local/camel-spool-store.c:163
 #, c-format
-msgid "Could not open folder `%s':\n"
+msgid ""
+"Could not open folder `%s':\n"
 "%s"
-msgstr "Не вдалось відкрити теку \"%s\":\n"
+msgstr ""
+"Не вдалось відкрити теку \"%s\":\n"
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
@@ -9581,9 +9528,11 @@ msgstr "Теки \"%s\" не існує."
 #: camel/providers/local/camel-mh-store.c:216
 #: camel/providers/local/camel-spool-store.c:172
 #, c-format
-msgid "Could not create folder `%s':\n"
+msgid ""
+"Could not create folder `%s':\n"
 "%s"
-msgstr "Не вдалось створити теку \"%s\":\n"
+msgstr ""
+"Не вдалось створити теку \"%s\":\n"
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:132
@@ -9655,9 +9604,11 @@ msgstr "Неможливо додати повідомлення до файлу
 #: 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"
+msgid ""
+"Cannot get message: %s from folder %s\n"
 "  %s"
-msgstr "Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
+msgstr ""
+"Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:401
@@ -9670,16 +9621,20 @@ msgstr "Збій побудови повідомлення: зіпсовано �
 
 #: camel/providers/local/camel-mbox-store.c:94
 #, c-format
-msgid "Could not open file `%s':\n"
+msgid ""
+"Could not open file `%s':\n"
 "%s"
-msgstr "Не вдалося відкрити файл \"%s\":\n"
+msgstr ""
+"Не вдалося відкрити файл \"%s\":\n"
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:110
 #, c-format
-msgid "Could not create file `%s':\n"
+msgid ""
+"Could not create file `%s':\n"
 "%s"
-msgstr "Не вдалось створити файл \"%s\":\n"
+msgstr ""
+"Не вдалось створити файл \"%s\":\n"
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:119
@@ -9691,9 +9646,11 @@ msgstr "\"%s\" не є звичайним файлом."
 #: camel/providers/local/camel-mbox-store.c:138
 #: camel/providers/local/camel-mbox-store.c:161
 #, c-format
-msgid "Could not delete folder `%s':\n"
+msgid ""
+"Could not delete folder `%s':\n"
 "%s"
-msgstr "Не вдалось стерти теку \"%s\":\n"
+msgstr ""
+"Не вдалось стерти теку \"%s\":\n"
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:153
@@ -9851,9 +9808,11 @@ msgstr "Не вдалося синхронізувати накопичувал�
 #: 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"
+msgid ""
+"Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
-msgstr "Не вдається синхронізувати буферну теку %s: %s\n"
+msgstr ""
+"Не вдається синхронізувати буферну теку %s: %s\n"
 "Можливо тека пошкоджена, копію збережено у `%s'"
 
 #: camel/providers/nntp/camel-nntp-provider.c:41
@@ -9880,8 +9839,12 @@ msgid "USENET News via %s"
 msgstr "Новини USENET через %s"
 
 #: camel/providers/nntp/camel-nntp-store.c:269
-msgid "This option will authenticate with the NNTP server using a plaintext password."
-msgstr "Під'єднання до NNTP серверу буде виконуватись з використанням незашифрованих паролів."
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+"Під'єднання до NNTP серверу буде виконуватись з використанням незашифрованих "
+"паролів."
 
 #: camel/providers/nntp/camel-nntp-summary.c:234
 #, c-format
@@ -9975,8 +9938,7 @@ msgstr "Залишати повідомлення на сервері"
 msgid "Delete after %s day(s)"
 msgstr "Стирати по завершенню %s днів"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52
-#: mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr "POP"
 
@@ -9985,12 +9947,22 @@ msgid "For connecting to and downloading mail from POP servers."
 msgstr "Для з'єднання та завантаження пошти з серверів POP."
 
 #: camel/providers/pop3/camel-pop3-provider.c:71
-msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
-msgstr "Під'єднання до POP серверу буде виконуватись з використанням незашифрованого паролю. Більшість POP серверів підтримує тільки цей варіант."
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+"Під'єднання до POP серверу буде виконуватись з використанням незашифрованого "
+"паролю. Більшість 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."
-msgstr "Під'єднання до POP серверу буде виконуватись з використанням паролю зашифрованого згідно протоколу APOP. Це може спрацьовувати не для всіх користувачів, навіть якщо сервер нібито його підтримує."
+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."
+msgstr ""
+"Під'єднання до POP серверу буде виконуватись з використанням паролю "
+"зашифрованого згідно протоколу APOP. Це може спрацьовувати не для всіх "
+"користувачів, навіть якщо сервер нібито його підтримує."
 
 #: camel/providers/pop3/camel-pop3-store.c:186
 #, c-format
@@ -10012,8 +9984,12 @@ msgstr "Не вдалося з'єднатись з POP сервером %s."
 #: 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 "Неможливо під'єднатися до POP серверу %s: Відсутня підтримка потрібного механізму автентифікації."
+msgid ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
+msgstr ""
+"Неможливо під'єднатися до POP серверу %s: Відсутня підтримка потрібного "
+"механізму автентифікації."
 
 #: camel/providers/pop3/camel-pop3-store.c:411
 #, c-format
@@ -10038,12 +10014,14 @@ msgstr "%sБудь ласка, введіть пароль POP3 для %s@%s"
 #: 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"
+msgid ""
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
-msgstr "Неможливо з'єднатись з сервером POP.\n"
+msgstr ""
+"Неможливо з'єднатись з сервером POP.\n"
 "Помилка відсилання пароля: %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 "Теки \"%s\" не існує."
@@ -10054,8 +10032,12 @@ msgid "Sendmail"
 msgstr "Sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:38
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
-msgstr "Для надсилання пошти шляхом передачі програмі \"sendmail\" на локальній системі."
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+"Для надсилання пошти шляхом передачі програмі \"sendmail\" на локальній "
+"системі."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
@@ -10099,14 +10081,14 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Відправлення пошти через програму sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37
-#: mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr "Для надсилання пошти шляхом з'єднання з віддаленим поштовим сервером SMTP.\n"
+msgstr ""
+"Для надсилання пошти шляхом з'єднання з віддаленим поштовим сервером SMTP.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
@@ -10266,8 +10248,7 @@ msgstr "Постачання пошти SMTP через %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Неможливо відіслати повідомлення: неправильна адреса відправника."
 
-#: camel/providers/smtp/camel-smtp-transport.c:689
-#: mail/mail-ops.c:613
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Відсилання повідомлення"
 
@@ -10277,7 +10258,8 @@ msgstr "Неможливо відіслати повідомлення: не в�
 
 #: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
-msgstr "Неможливо відіслати повідомлення: один або більше неправильних отримувачів"
+msgstr ""
+"Неможливо відіслати повідомлення: один або більше неправильних отримувачів"
 
 #: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
@@ -10349,7 +10331,8 @@ msgstr "Помилка відповіді на DATA"
 #: camel/providers/smtp/camel-smtp-transport.c:1331
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr "Вийшов час при надсиланні DATA: надсилання припинено: %s: пошту не відіслано"
+msgstr ""
+"Вийшов час при надсиланні DATA: надсилання припинено: %s: пошту не відіслано"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1351
 msgid "DATA termination response error"
@@ -10389,8 +10372,7 @@ msgid "%.0fG"
 msgstr "%.0fГб"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:365
-#: mail/mail-display.c:223
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr "долучення"
 
@@ -10488,8 +10470,12 @@ msgid "Bcc:"
 msgstr "Bcc:"
 
 #: 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 "Введіть адресатів, що отримають копію повідомлення не попавши в список отримувачів."
+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
@@ -10507,75 +10493,87 @@ msgstr "Адреса призначення"
 msgid "Attach file(s)"
 msgstr "Долучити файл(и)"
 
-#: composer/e-msg-composer.c:530
+#: composer/e-msg-composer.c:533
 msgid "Could not create a PGP signature context"
 msgstr "Неможливо створити контекст цифрового підпису PGP."
 
-#: composer/e-msg-composer.c:809
+#: composer/e-msg-composer.c:812
 #, c-format
-msgid "Error while reading file %s:\n"
+msgid ""
+"Error while reading file %s:\n"
 "%s"
-msgstr "Помилка зчитування файлу: %s:\n"
+msgstr ""
+"Помилка зчитування файлу: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Файл існує, переписати?"
 
-#: composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: composer/e-msg-composer.c:1213
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Помилка доступу до файлу: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Неможливо отримати повідомлення від редактора"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1269
 #, c-format
-msgid "Unable to seek on file: %s\n"
+msgid ""
+"Unable to seek on file: %s\n"
 "%s"
-msgstr "Неможливо встановити позицію у файлі: %s\n"
+msgstr ""
+"Неможливо встановити позицію у файлі: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1270
+#: composer/e-msg-composer.c:1276
 #, c-format
-msgid "Unable to truncate file: %s\n"
+msgid ""
+"Unable to truncate file: %s\n"
 "%s"
-msgstr "Неможливо обрізати файл: %s\n"
+msgstr ""
+"Неможливо обрізати файл: %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"
+msgid ""
+"Unable to copy file descriptor: %s\n"
 "%s"
-msgstr "Неможливо скопіювати дескриптор файлу: %s\n"
+msgstr ""
+"Неможливо скопіювати дескриптор файлу: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1294
 #, c-format
-msgid "Error autosaving message: %s\n"
+msgid ""
+"Error autosaving message: %s\n"
 " %s"
-msgstr "Помилка автозбереження файлу: %s\n"
+msgstr ""
+"Помилка автозбереження файлу: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1382
-msgid "Ximian Evolution has found unsaved files from a previous session.\n"
+#: 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 "Ximian Evolution знайшов незбереженні файли попереднього сеансу.\n"
+msgstr ""
+"Ximian Evolution знайшов незбереженні файли попереднього сеансу.\n"
 "Бажаєте спробувати їх відновити?"
 
-#: composer/e-msg-composer.c:1544
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10586,40 +10584,40 @@ msgstr ""
 "\n"
 "Бажаєте зберегти зміни?"
 
-#: composer/e-msg-composer.c:1549
+#: composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "Скасувати зміни"
 
-#: composer/e-msg-composer.c:1553
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Увага: змінене повідомлення"
 
-#: composer/e-msg-composer.c:1585
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Відкрити файл"
 
-#: composer/e-msg-composer.c:1992
+#: composer/e-msg-composer.c:2015
 msgid "Signature:"
 msgstr "Підпис:"
 
-#: 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 "Згенеровано автоматично"
 
-#: 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 "Підготувати повідомлення"
 
-#: composer/e-msg-composer.c:2919
-msgid "Could not create composer window:\n"
+#: composer/e-msg-composer.c:2905
+msgid ""
+"Could not create composer window:\n"
 "Unable to activate address selector control."
-msgstr "Не вдалося створити вікно редагування:\n"
+msgstr ""
+"Не вдалося створити вікно редагування:\n"
 "Неможливо активувати керуючий елемент обрання адреси."
 
-#: 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"
@@ -10631,15 +10629,21 @@ msgstr ""
 "Будь ласка, впевніться що у вас встановлено\n"
 "коректну версію gtkhtml та libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3005
-msgid "Could not create composer window:\n"
+#: composer/e-msg-composer.c:2991
+msgid ""
+"Could not create composer window:\n"
 "Unable to activate HTML editor component."
-msgstr "Не вдалося створити вікно редактора:\n"
+msgstr ""
+"Не вдалося створити вікно редактора:\n"
 "Неможливо активувати компонент HTML-редактора."
 
-#: composer/e-msg-composer.c:4018
-msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
-msgstr "<b>(Редактор містить не текстове тіло повідомлення яке неможливо відредагувати.)<b>"
+#: composer/e-msg-composer.c:4005
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Редактор містить не текстове тіло повідомлення яке неможливо "
+"відредагувати.)<b>"
 
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
@@ -10708,9 +10712,13 @@ 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"
+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 "<small>Зазначене нижче повідомлення буде автоматично надіслано до кожного, хто надішле\n"
+msgstr ""
+"<small>Зазначене нижче повідомлення буде автоматично надіслано до кожного, "
+"хто надішле\n"
 "вам листа коли ви знаходитесь за межами офісу.</small>"
 
 #: designs/OOA/ooa.glade.h:8
@@ -10746,9 +10754,14 @@ msgid "<b>Sending Email:</b>"
 msgstr "<b>Відсилання пошти:</b>"
 
 #: 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 "<small>Ця сторінка дозволяє вам вибрати чи бажаєте ви бути сповіщеними коли отримувач прочитає ваше повідомлення\n"
+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 ""
+"<small>Ця сторінка дозволяє вам вибрати чи бажаєте ви бути сповіщеними коли "
+"отримувач прочитає ваше повідомлення\n"
 "та встановити дії Evolution коли хтось вимагає сповіщення від вас.</small>"
 
 #: designs/read_receipts/read.glade.h:6
@@ -10773,32 +10786,40 @@ msgstr "Вимагати сповіщення для всіх повідомле
 
 #: designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr "За винятком якщо повідомлення адресоване до списку отримувачів, а не до мене особисто"
+msgstr ""
+"За винятком якщо повідомлення адресоване до списку отримувачів, а не до мене "
+"особисто"
 
 #: designs/read_receipts/read.glade.h:12
-msgid "When you receive an email with a read receipt request, what should Evolution do?"
-msgstr "Що слід зробити Evolution, коли ви отримуєте листа, який вимагає сповіщення?"
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
+msgstr ""
+"Що слід зробити Evolution, коли ви отримуєте листа, який вимагає сповіщення?"
 
 #: e-util/e-component-listener.c:128
-msgid "ping_timeout_callback: could not determine if the CORBA object is nil or not"
-msgstr "ping_timeout_callback: не вдалось визначити чи є об'єкт CORBA нульовим (nil)"
+msgid ""
+"ping_timeout_callback: could not determine if the CORBA object is nil or not"
+msgstr ""
+"ping_timeout_callback: не вдалось визначити чи є об'єкт CORBA нульовим (nil)"
 
 #: e-util/e-dialog-utils.c:247
-msgid "A file by that name already exists.\n"
+msgid ""
+"A file by that name already exists.\n"
 "Overwrite it?"
-msgstr "Файл з цією назвою вже існує.\n"
+msgstr ""
+"Файл з цією назвою вже існує.\n"
 "Переписати його?"
 
-#: e-util/e-dialog-utils.c:249
-#: mail/mail-display.c:196
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
 msgid "Overwrite file?"
 msgstr "Переписати файл?"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Запам'ятати цей пароль"
 
-#: e-util/e-passwords.c:361
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Пам'ятати цей пароль до закінчення поточного сеансу"
 
@@ -10812,15 +10833,13 @@ msgstr "Синхронізувати категорії:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:171
-#: e-util/e-time-utils.c:384
+#: 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:176
-#: e-util/e-time-utils.c:375
+#: 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"
 
@@ -10871,31 +10890,25 @@ 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:325
-#: e-util/e-time-utils.c:424
+#: 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:329
-#: e-util/e-time-utils.c:416
+#: 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:334
-#: e-util/e-time-utils.c:421
-#: widgets/misc/e-dateedit.c:1430
-#: widgets/misc/e-dateedit.c:1643
+#: 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:338
-#: e-util/e-time-utils.c:413
-#: widgets/misc/e-dateedit.c:1427
-#: widgets/misc/e-dateedit.c:1640
+#: 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"
 
@@ -10975,8 +10988,7 @@ msgstr "Необхідно вибрати дату."
 msgid "<click here to select a date>"
 msgstr "<клацніть тут для вибору дати>"
 
-#: filter/filter-datespec.c:278
-#: filter/filter-datespec.c:289
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
 msgid "now"
 msgstr "зараз"
 
@@ -10989,8 +11001,7 @@ msgstr "%d.%m.%Y"
 msgid "Select a time to compare against"
 msgstr "Обрати час для порівняння"
 
-#: filter/filter-editor.c:114
-#: filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Правила фільтрування"
 
@@ -11016,62 +11027,50 @@ msgstr "Тоді"
 msgid "You must specify a folder."
 msgstr "Необхідно вказати теку."
 
-#: filter/filter-folder.c:243
-#: filter/vfolder-rule.c:408
-#: mail/mail-account-gui.c:1503
-#: mail/mail-account-gui.c:1517
+#: 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"
+msgid ""
+"Error in regular expression '%s':\n"
 "%s"
-msgstr "Помилка у регулярному виразі \"%s\":\n"
+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:1280
+#: 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:1281
+#: 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:1282
+#: 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:1283
+#: 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:1284
+#: 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
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
 msgid "Test"
 msgstr "Тест"
 
@@ -11132,25 +11131,30 @@ msgid "Outgoing"
 msgstr "Вихідні"
 
 #: filter/filter.glade.h:7
-msgid "The message's date will be compared against\n"
+msgid ""
+"The message's date will be compared against\n"
 "12:00am of the date specified."
-msgstr "Дату повідомлення буде порівняно з вказаною\n"
+msgstr ""
+"Дату повідомлення буде порівняно з вказаною\n"
 "датою (час 12:00am)."
 
 #: filter/filter.glade.h:9
-msgid "The message's date will be compared against\n"
+msgid ""
+"The message's date will be compared against\n"
 "a time relative to when filtering occurs."
-msgstr "Дату повідомлення буде порівняно з часом\n"
+msgstr ""
+"Дату повідомлення буде порівняно з часом\n"
 "відносно запуску фільтру."
 
 #: filter/filter.glade.h:11
-msgid "The message's date will be compared against\n"
+msgid ""
+"The message's date will be compared against\n"
 "the current time when filtering occurs."
-msgstr "Дату повідомлення буде порівняно з поточним\n"
+msgstr ""
+"Дату повідомлення буде порівняно з поточним\n"
 "часом, коли відбулося фільтрування."
 
-#: filter/filter.glade.h:13
-#: filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr "Віртуальні теки"
 
@@ -11166,8 +11170,7 @@ msgstr "тому"
 msgid "months"
 msgstr "місяців"
 
-#: 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 "секунд"
 
@@ -11332,8 +11335,7 @@ msgstr "не співпадає з"
 msgid "is not Flagged"
 msgstr "не відмічено"
 
-#: filter/libfilter-i18n.h:35
-#: mail/folder-browser.c:1793
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 msgid "Label"
 msgstr "Позначка"
 
@@ -11361,8 +11363,7 @@ msgstr "Направити до командної оболонки"
 msgid "Play Sound"
 msgstr "Відтворити звук"
 
-#: filter/libfilter-i18n.h:42
-#: mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
 msgid "Read"
 msgstr "Прочитано"
 
@@ -11390,15 +11391,12 @@ msgstr "повертає більше ніж"
 msgid "returns less than"
 msgstr "повертає менше ніж"
 
-#: filter/libfilter-i18n.h:49
-#: filter/score-rule.c:184
-#: filter/score-rule.c:186
+#: 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:1818
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "Відправник"
 
@@ -11434,10 +11432,8 @@ msgstr "починається на"
 msgid "Stop Processing"
 msgstr "Зупинити обробку"
 
-#: filter/libfilter-i18n.h:60
-#: mail/mail-format.c:908
-#: mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305
+#: 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 "Тема"
@@ -11446,9 +11442,7 @@ msgstr "Тема"
 msgid "Unset Status"
 msgstr "Скинути стан:"
 
-#: filter/rule-context.c:661
-#: 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."
@@ -11486,86 +11480,69 @@ msgstr "Ви повинні вказати хоча б одну теку у як
 msgid "VFolder source"
 msgstr "Джерело вірт.папок"
 
-#: importers/elm-importer.c:95
-#: mail/importers/elm-importer.c:105
+#: 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
-#: mail/importers/elm-importer.c:106
-#: mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
+#: 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
-#: mail/importers/elm-importer.c:108
-#: mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
+#: 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
-#: mail/importers/elm-importer.c:157
-#: mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
+#: 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
-#: mail/importers/elm-importer.c:392
-#: mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
+#: 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:114
-#: mail/folder-browser-ui.c:359
-#: mail/importers/elm-importer.c:526
-#: mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2128
+#: 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
-#: mail/importers/elm-importer.c:547
-msgid "Evolution has found Elm mail files\n"
+#: 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 "Evolution знайшов поштові файли Elm\n"
+msgstr ""
+"Evolution знайшов поштові файли Elm\n"
 "Чи бажаєте ви імпортувати їх у Evolution?"
 
-#: importers/elm-importer.c:574
-#: mail/importers/elm-importer.c:568
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
 #: importers/evolution-gnomecard-importer.c:246
-msgid "Evolution has found GnomeCard files.\n"
+msgid ""
+"Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
-msgstr "Evolution знайшов файли GnomeCard.\n"
+msgstr ""
+"Evolution знайшов файли GnomeCard.\n"
 "Чи бажаєте ви імпортувати їх у Evolution?"
 
-#: importers/netscape-importer.c:70
-#: mail/importers/netscape-importer.c:75
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Фільтр пріоритетів \"%s\""
 
-#: importers/netscape-importer.c:653
-#: mail/importers/netscape-importer.c:663
+#: 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"
@@ -11591,8 +11568,7 @@ msgstr ""
 "замість пріоритетів. Перевірте важливі фільтри та впевніться,\n"
 "що все працює як планувалося."
 
-#: importers/netscape-importer.c:677
-#: mail/importers/netscape-importer.c:687
+#: 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"
@@ -11604,8 +11580,7 @@ msgstr ""
 "які не підтримуються Evolution.\n"
 "Ці функції буде проігноровано."
 
-#: importers/netscape-importer.c:694
-#: mail/importers/netscape-importer.c:704
+#: 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"
@@ -11619,68 +11594,59 @@ msgstr ""
 "буде перетворено для перевірки присутності або відсутності\n"
 "рядка в тілі повідомлення."
 
-#: importers/netscape-importer.c:1227
-#: mail/importers/netscape-importer.c:1237
+#: 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/importers/netscape-importer.c:1842
-#: 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
-#: mail/importers/netscape-importer.c:1995
+#: 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
+#: 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
-#: mail/importers/netscape-importer.c:2015
+#: 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
-#: mail/importers/netscape-importer.c:2090
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Параметри"
 
-#: importers/netscape-importer.c:2138
-#: mail/importers/netscape-importer.c:2095
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 msgid "Mail Filters"
 msgstr "Поштові фільтри"
 
-#: importers/netscape-importer.c:2161
-#: mail/importers/netscape-importer.c:2119
-msgid "Evolution has found Netscape mail files.\n"
+#: 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 "Evolution знайшов поштові файли Netscape.\n"
+msgstr ""
+"Evolution знайшов поштові файли Netscape.\n"
 "Чи бажаєте ви імпортувати їх у Evolution?"
 
-#: importers/pine-importer.c:100
-#: mail/importers/pine-importer.c:114
+#: 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
-#: mail/importers/pine-importer.c:599
-msgid "Evolution has found Pine mail files.\n"
+#: 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 "Evolution знайшов поштові файли Pine.\n"
+msgstr ""
+"Evolution знайшов поштові файли Pine.\n"
 "Чи бажаєте ви імпортувати їх у Evolution?"
 
-#: importers/pine-importer.c:691
-#: mail/importers/pine-importer.c:618
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 msgid "Pine"
 msgstr "Pine"
 
@@ -11689,56 +11655,67 @@ msgid "Composer Preferences"
 msgstr "Вподобання редактора"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Налаштовування екранних шрифтів Evolutuion."
+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."
-msgstr "Налаштовування поштових рахунків Evolutuion."
+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."
-msgstr "Налаштовування поштової програми Evolutuion."
+msgid "Configure the fonts used by Evolution here"
+msgstr "Налаштовування шрифтів Evolutuion."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Налаштовування редактора повідомлень Evolutuion."
+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 "Редактор облікових рахунків Evolution"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Configure the fonts used by Evolution here"
-msgstr "Налаштовування шрифтів Evolutuion."
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Редактор пошти Evolutuion."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Configure your email accounts here"
-msgstr "Налаштовування поштових рахунків"
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Редактор пошти Evolutuion."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Компонент Evolution для обробки пошти."
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Редактор пошти Evolutuion."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution mail composer."
-msgstr "Редактор пошти Evolutuion."
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Інтерфейс конфігурації пошти"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Компонент поштового виконавчого зведення Evolutuion."
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Компонент відображення поштової теки Evolutuion."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Компонент відображення поштової теки Evolutuion."
+#, fuzzy
+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"
-msgstr "Налаштовування керуючих елементів, які експортовані поштовою програмою Evolutuion."
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Компонент поштового виконавчого зведення Evolutuion."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:15
 msgid "Font Preferences"
@@ -11748,52 +11725,50 @@ msgstr "Вподобання шрифтів"
 msgid "Mail Accounts"
 msgstr "Поштові Рахунки"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: mail/mail-config.glade.h:71
+#: 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:114
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Тека, що містить пошту"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "Загальна пошта"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "Загальна тека, що містить пошту"
 
-#: 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 "Ця тека не може містити повідомлення."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Властивості..."
 
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Змінити властивості цієї теки"
 
-#: mail/component-factory.c:816
-msgid "Some of your mail settings seem corrupt, please check that everything is in order."
-msgstr "Деякі ваші налаштовування пошти здається пошкоджені, будь ласка перевірте їх."
+#: 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 "Ви не вказали метод надсилання пошти"
 
@@ -11842,9 +11817,7 @@ msgstr "Властивості для \"%s\""
 msgid "Properties"
 msgstr "Властивості"
 
-#: mail/folder-browser.c:327
-#: mail/mail-display.c:391
-#: mail/mail-display.c:939
+#: 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"
@@ -11854,8 +11827,7 @@ msgstr "Неможливо створити тимчасовий каталог:
 msgid "%d new"
 msgstr "%d нових"
 
-#: mail/folder-browser.c:785
-#: mail/folder-browser.c:793
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
 #: mail/folder-browser.c:796
 msgid ", "
 msgstr ", "
@@ -11922,8 +11894,7 @@ msgstr "Фільтр відправника"
 msgid "Filter on Re_cipients"
 msgstr "Фільтр отримувачів"
 
-#: mail/folder-browser.c:1739
-#: mail/folder-browser.c:2063
+#: mail/folder-browser.c:1739 mail/folder-browser.c:2063
 msgid "Filter on _Mailing List"
 msgstr "Фільтр списку розсилки"
 
@@ -11935,18 +11906,15 @@ msgstr "Виправити як нове повідомлення..."
 msgid "_Print"
 msgstr "Друкувати"
 
-#: mail/folder-browser.c:1763
-#: 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:1764
-#: 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:1765
-#: ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Відповісти всім"
 
@@ -11969,8 +11937,7 @@ msgid "Cl_ear Flag"
 msgstr "Очистити"
 
 #. separator here?
-#: mail/folder-browser.c:1776
-#: 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 "Позначити прочитаним"
 
@@ -11994,8 +11961,7 @@ msgstr "Відновити"
 msgid "Mo_ve to Folder..."
 msgstr "Перенести в теку..."
 
-#: mail/folder-browser.c:1789
-#: ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1789 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Скопіювати в теку..."
 
@@ -12025,8 +11991,7 @@ msgstr "Фільтр списку листування (%s)"
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Віртуальна тека списку листування (%s)"
 
-#: mail/folder-browser.h:26
-#: mail/mail-config.glade.h:40
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Типово"
 
@@ -12034,21 +11999,37 @@ msgstr "Типово"
 msgid "Getting Folder Information"
 msgstr "Отримання інформації про теку"
 
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Редактор пошти Evolutuion."
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "Майстер імпортування mbox у Evolutuion."
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Редактор пошти Evolutuion."
 
 #: 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 "Редактор пошти Evolutuion."
 
 #: 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.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 "Редактор пошти Evolutuion."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -12093,18 +12074,15 @@ msgstr "Ви ще не ввели потрібну інформацію."
 msgid "Evolution Account Editor"
 msgstr "Редактор облікових рахунків 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 "Сервер:"
 
-#: mail/mail-account-gui.c:755
-#: 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:759
-#: mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "Шлях:"
 
@@ -12120,19 +12098,13 @@ msgstr "Ви впевнені, що хочете стерти цей рахун�
 msgid "Don't delete"
 msgstr "Не стирати"
 
-#: 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-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: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-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 "Увімкнути"
 
@@ -12141,20 +12113,16 @@ msgstr "Увімкнути"
 msgid "[Default]"
 msgstr "[Типово]"
 
-#: 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-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:487
-#: 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:489
-#: mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -12198,8 +12166,7 @@ msgstr ""
 "та її було оновлено."
 
 #. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:100
-#: 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 "Більше не показувати це повідомлення."
 
@@ -12216,28 +12183,36 @@ msgstr ""
 "Бажаєте зробити це зараз?"
 
 #: mail/mail-callbacks.c:211
-msgid "You need to configure an account\n"
+msgid ""
+"You need to configure an account\n"
 "before you can compose mail."
-msgstr "Вам потрібно налаштувати користувача\n"
+msgstr ""
+"Вам потрібно налаштувати користувача\n"
 "перш ніж ви зможете створити повідомлення."
 
 #: mail/mail-callbacks.c:225
-msgid "You need to configure an identity\n"
+msgid ""
+"You need to configure an identity\n"
 "before you can compose mail."
-msgstr "Вам потрібно налаштувати користувача\n"
+msgstr ""
+"Вам потрібно налаштувати користувача\n"
 "перш ніж ви зможете створити повідомлення."
 
 #: mail/mail-callbacks.c:232
-msgid "You need to configure a mail transport\n"
+msgid ""
+"You need to configure a mail transport\n"
 "before you can compose mail."
-msgstr "Вам потрібно налаштувати надсилання пошти\n"
+msgstr ""
+"Вам потрібно налаштувати надсилання пошти\n"
 "перш ніж ви зможете створити повідомлення."
 
 #. FIXME: this wording sucks
 #: mail/mail-callbacks.c:254
-msgid "You are sending an HTML-formatted message. Please make sure that\n"
+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 "Ви надсилаєте повідомлення у HTML форматі. Будь ласка, впевніться, що\n"
+msgstr ""
+"Ви надсилаєте повідомлення у HTML форматі. Будь ласка, впевніться, що\n"
 "наступні одержувачі бажають та мають змогу приймати пошту у форматі HTML:\n"
 
 #: mail/mail-callbacks.c:266
@@ -12245,23 +12220,34 @@ msgid "Send anyway?"
 msgstr "Відіслати все одно?"
 
 #: mail/mail-callbacks.c:287
-msgid "This message has no subject.\n"
+msgid ""
+"This message has no subject.\n"
 "Really send?"
-msgstr "Це повідомлення не має теми.\n"
+msgstr ""
+"Це повідомлення не має теми.\n"
 "Справді відіслати?"
 
 #: 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 "Зваживши на те, що список контактів до якого ви надсилаєте повідомлення налаштований приховувати адреси, це повідомлення буде містити тільки одержувачів прихованої копії."
+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:317
 msgid "This message contains only Bcc recipients."
 msgstr "Це повідомлення містить тільки одержувачів прихованої копії."
 
 #: mail/mail-callbacks.c:322
-msgid "It is possible that the mail server may reveal the recipients by adding an Apparently-To header.\n"
+msgid ""
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
 "Send anyway?"
-msgstr "Може статися, що сервер викриє отримувачів, додавши їх до заголовку Apparently-To .\n"
+msgstr ""
+"Може статися, що сервер викриє отримувачів, додавши їх до заголовку "
+"Apparently-To .\n"
 "Надіслати все одно?"
 
 #: mail/mail-callbacks.c:470
@@ -12269,9 +12255,11 @@ msgid "You must specify recipients in order to send this message."
 msgstr "Щоб надіслати це повідомлення потрібно вказати отримувачів."
 
 #: mail/mail-callbacks.c:722
-msgid "Unable to open the drafts folder for this account.\n"
+msgid ""
+"Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
-msgstr "Неможливо відкрити теку чернеток цього облікового рахунку.\n"
+msgstr ""
+"Неможливо відкрити теку чернеток цього облікового рахунку.\n"
 "Бажаєте використати типову теку чернеток?"
 
 #: mail/mail-callbacks.c:1187
@@ -12282,13 +12270,11 @@ msgstr "невідомий відправник"
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d у %H:%M, %%s написав:"
 
-#: mail/mail-callbacks.c:1698
-#: mail/message-browser.c:123
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr "Перенести повідомлення у"
 
-#: mail/mail-callbacks.c:1700
-#: mail/message-browser.c:125
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr "Скопіювати повідомлення у"
 
@@ -12298,15 +12284,19 @@ msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ви впевнені, що хочете виправити всі %d повідомлень?"
 
 #: mail/mail-callbacks.c:2360
-msgid "You may only edit messages saved\n"
+msgid ""
+"You may only edit messages saved\n"
 "in the Drafts folder."
-msgstr "Ви можете лише редагувати збережені\n"
+msgstr ""
+"Ви можете лише редагувати збережені\n"
 "повідомлення в теці \"Чернетки\"."
 
 #: mail/mail-callbacks.c:2393
-msgid "You may only resend messages\n"
+msgid ""
+"You may only resend messages\n"
 "in the Sent folder."
-msgstr "Ви можете лише відіслати повторно\n"
+msgstr ""
+"Ви можете лише відіслати повторно\n"
 "повідомлення з теки \"Відіслані\"."
 
 #: mail/mail-callbacks.c:2403
@@ -12320,16 +12310,20 @@ msgstr "Немає вибраних повідомлень"
 
 #: mail/mail-callbacks.c:2465
 #, c-format
-msgid "Cannot save to `%s'\n"
+msgid ""
+"Cannot save to `%s'\n"
 " %s"
-msgstr "Неможливо записати в \"%s\"\n"
+msgstr ""
+"Неможливо записати в \"%s\"\n"
 " %s"
 
 #: mail/mail-callbacks.c:2470
 #, c-format
-msgid "`%s' already exists.\n"
+msgid ""
+"`%s' already exists.\n"
 "Overwrite it?"
-msgstr "\"%s\" вже існує\n"
+msgstr ""
+"\"%s\" вже існує\n"
 "Хочете переписати?"
 
 #: mail/mail-callbacks.c:2511
@@ -12354,9 +12348,11 @@ msgstr ""
 
 #: mail/mail-callbacks.c:2782
 #, c-format
-msgid "Error loading filter information:\n"
+msgid ""
+"Error loading filter information:\n"
 "%s"
-msgstr "Помилка при завантаженні інформації фільтру:\n"
+msgstr ""
+"Помилка при завантаженні інформації фільтру:\n"
 "%s"
 
 #: mail/mail-callbacks.c:2790
@@ -12376,55 +12372,61 @@ msgstr "Надрукувати повідомлення"
 msgid "Printing of message failed"
 msgstr "Не вдалося надрукувати повідомлення"
 
-#: 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 "Ви впевнені, що хочете відкрити всі %d повідомлень у окремих вікнах?"
 
-#: 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 "Без назви"
 
-#: mail/mail-composer-prefs.c:313
+#: mail/mail-composer-prefs.c:335
 msgid "You must specify a valid script name."
 msgstr "Необхідно вказати правильну назву скрипта."
 
-#: 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 "[скрипт]"
 
-#: mail/mail-composer-prefs.c:840
+#: mail/mail-composer-prefs.c:864
 msgid "Language(s)"
 msgstr "Мова(и)"
 
-#: mail/mail-composer-prefs.c:882
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr "Додати цифровий підпис скрипту"
 
-#: mail/mail-composer-prefs.c:902
+#: mail/mail-composer-prefs.c:926
 msgid "Signature(s)"
 msgstr "Підписи"
 
-#: mail/mail-config-druid.c:380
-#: mail/mail-config.glade.h:63
+#: 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 "Будь ласка введіть нижче ваше ім'я та електрону адресу. Поля \"Необов'язкова інформація\" можна не заповнювати, якщо ви не бажаєте щоб ця інформація відсилалась разом з вашими повідомленнями."
+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:388
-#: mail/mail-config-druid.c:395
+#: 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 "Будь ласка введіть інформацію про сервер вхідної пошти. Якщо ви не впевнені, спитайте вашого системного адміністратора або постачальника Інтернет."
+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:397
 msgid "Please select among the following options"
@@ -12435,24 +12437,36 @@ 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 "Введіть спосіб, яким ви будете відсилати ваші повідомлення. Якщо ви не впевнені, спитайте вашого системного адміністратора або постачальника Інтернет."
+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:407
-#: mail/mail-config.glade.h:10
+#: 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 will be grouped together to make an Evolution mail account. Please enter a name for this account in the space below. This name will be used for display purposes only."
-msgstr "Ви майже завершили процес налаштовування. Згадані методи надсилання та отримання пошти буде згруповано у обліковий рахунок вашої пошти в Evolution. Введіть назву цього рахунку у нижньому полі. Ця назва буде використовуватись тільки для показу."
-
-#: mail/mail-config.c:924
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+"Ви майже завершили процес налаштовування. Згадані методи надсилання та "
+"отримання пошти буде згруповано у обліковий рахунок вашої пошти в Evolution. "
+"Введіть назву цього рахунку у нижньому полі. Ця назва буде використовуватись "
+"тільки для показу."
+
+#: 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 "З'єднання з сервером..."
 
@@ -12494,7 +12508,8 @@ msgstr "Завжди шифрувати моїм ключем при надси�
 
 #: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
-msgstr "Завжди підписувати повідомлення при використанні цього облікового рахунку"
+msgstr ""
+"Завжди підписувати повідомлення при використанні цього облікового рахунку"
 
 #: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
@@ -12512,8 +12527,7 @@ msgstr "Завжди довіряти ключам в моєму сховищі
 msgid "Attach original message"
 msgstr "Долучити оригінальне повідомлення"
 
-#: mail/mail-config.glade.h:21
-#: mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Долучення"
 
@@ -12603,10 +12617,11 @@ msgstr "Не цитувати оригінальне повідомлення"
 
 #: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr "Не підписувати запрошення на засідання (для сумісності з Outlook compatibility)"
+msgstr ""
+"Не підписувати запрошення на засідання (для сумісності з Outlook "
+"compatibility)"
 
-#: mail/mail-config.glade.h:48
-#: shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Виконано"
 
@@ -12699,20 +12714,24 @@ msgid "Message Display"
 msgstr "Відображення повідомлень"
 
 #: 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:77
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Сповіщення про нову пошту"
 
-#: mail/mail-config.glade.h:79
-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 "Екранні шрифти"
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+"Зауважте: вас не буде запитано про пароль до моменту першого сеансу зв'язку "
 
 #: mail/mail-config.glade.h:81
 msgid "Optional Information"
@@ -12732,7 +12751,9 @@ msgstr "Вибір кольору"
 
 #: mail/mail-config.glade.h:89
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "Попереджувати при надсиланні повідомлень, де визначені тільки отримувачі прихованої копії"
+msgstr ""
+"Попереджувати при надсиланні повідомлень, де визначені тільки отримувачі "
+"прихованої копії"
 
 #: mail/mail-config.glade.h:90
 msgid "Pretty Good Privacy (PGP/GPG)"
@@ -12857,13 +12878,20 @@ msgstr ""
 "тільки для відображення."
 
 #: 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 "Ця сторінка допомагає налаштувати параметри перевірки правопису та мови. Список мов відображує тільки ті мови, для яких встановлено словники."
+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:125
-msgid "Type the name by which you would like to refer to this account.\n"
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
-msgstr "Введіть ім'я з яким ви бажаєте посилатися на цей рахунок.\n"
+msgstr ""
+"Введіть ім'я з яким ви бажаєте посилатися на цей рахунок.\n"
 "Наприклад: \"Робота\" або \"Особисте\""
 
 #: mail/mail-config.glade.h:128
@@ -12894,7 +12922,8 @@ msgstr "Завжди завантажувати зображення"
 
 #: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
-msgstr "Завжди підписувати повідомлення при використанні цього облікового рахунку"
+msgstr ""
+"Завжди підписувати повідомлення при використанні цього облікового рахунку"
 
 #: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
@@ -12941,102 +12970,108 @@ 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 "В HTML"
 
-#: 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 "Попереджувати при надсиланні HTML повідомлень тим, хто їх не бажає"
 
-#: 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
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "Стандартний Unix mbox"
+
 #: mail/mail-config.glade.h:175
-msgid "_Use secure connection (SSL):"
-msgstr "Використовувати безпечне з'єднання (SSL):"
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "Оригінальний контакт:"
 
 #: mail/mail-config.glade.h:176
-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
 msgid "color"
 msgstr "колір"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "опис"
 
@@ -13062,9 +13097,11 @@ msgstr "Неможливо створити контекст декодуван�
 
 #: mail/mail-display.c:193
 #, c-format
-msgid "File `%s' already exists.\n"
+msgid ""
+"File `%s' already exists.\n"
 "Overwrite it?"
-msgstr "Файл \"%s\" вже існує.\n"
+msgstr ""
+"Файл \"%s\" вже існує.\n"
 "Переписати його?"
 
 #: mail/mail-display.c:333
@@ -13145,17 +13182,12 @@ msgstr "Зондування %s"
 msgid "%s attachment"
 msgstr "долучення %s"
 
-#: 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
+#: 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:759
-#: mail/message-list.etspec.h:2
+#: mail/mail-format.c:759 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Дата"
 
@@ -13163,10 +13195,8 @@ msgstr "Дата"
 msgid "Bad Address"
 msgstr "Неправильна адреса"
 
-#: mail/mail-format.c:886
-#: mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
-#: 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 "Від"
 
@@ -13174,8 +13204,7 @@ msgstr "Від"
 msgid "Reply-To"
 msgstr "Відповідати на"
 
-#: mail/mail-format.c:895
-#: mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "До"
 
@@ -13188,8 +13217,11 @@ msgid "Bcc"
 msgstr "Прих.копія:"
 
 #: mail/mail-format.c:1451
-msgid "This message is digitally signed. Click the lock icon for more information."
-msgstr "Це повідомлення підписано цифровим підписом. Додаткову інформацію можна отримати,якщо клацнути на піктограмі із замком."
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Це повідомлення підписано цифровим підписом. Додаткову інформацію можна "
+"отримати,якщо клацнути на піктограмі із замком."
 
 #: mail/mail-format.c:1479
 msgid "Could not create a PGP verfication context"
@@ -13197,11 +13229,14 @@ msgstr "Неможливо створити контекст перевірки
 
 #: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Це повідомлення підписано цифровим підписом, перевірку ідентичності складено."
+msgstr ""
+"Це повідомлення підписано цифровим підписом, перевірку ідентичності складено."
 
 #: mail/mail-format.c:1494
 msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "Це повідомлення підписано цифровим підписом, але перевірку ідентичності не складено."
+msgstr ""
+"Це повідомлення підписано цифровим підписом, але перевірку ідентичності не "
+"складено."
 
 #: mail/mail-format.c:1758
 #, c-format
@@ -13232,8 +13267,7 @@ msgstr "Вказівник на невідомі зовнішні дані (ти
 msgid "Malformed external-body part."
 msgstr "Частину external-body сформовано неправильно."
 
-#: mail/mail-local.c:537
-#: mail/mail-local.c:539
+#: mail/mail-local.c:537 mail/mail-local.c:539
 #, c-format
 msgid "Local folders/%s"
 msgstr "Локальні теки/%s"
@@ -13244,9 +13278,11 @@ msgstr "Переналаштовування теки"
 
 #: mail/mail-local.c:748
 #, c-format
-msgid "Cannot save folder metainfo; you may find you can't\n"
+msgid ""
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
-msgstr "Неможливо зберегти метаінформацію теки; можливо ви не зможете\n"
+msgstr ""
+"Неможливо зберегти метаінформацію теки; можливо ви не зможете\n"
 "знову відкрити цю теку: %s: %s"
 
 #: mail/mail-local.c:804
@@ -13265,9 +13301,11 @@ msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Зміна теки \"%s\" у формат \"%s\" "
 
 #: mail/mail-local.c:1354
-msgid "If you can no longer open this mailbox, then\n"
+msgid ""
+"If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
-msgstr "Якщо ви неспроможні відкрити цю поштову скриньку,\n"
+msgstr ""
+"Якщо ви неспроможні відкрити цю поштову скриньку,\n"
 "можливо, ви будете змушені відновити її власноруч."
 
 #: mail/mail-local.c:1454
@@ -13281,16 +13319,20 @@ msgstr "Ви не можете змінювати формат не локаль
 
 #: mail/mail-mt.c:257
 #, c-format
-msgid "Error while '%s':\n"
+msgid ""
+"Error while '%s':\n"
 "%s"
-msgstr "Помилка під час \"%s\":\n"
+msgstr ""
+"Помилка під час \"%s\":\n"
 "%s"
 
 #: mail/mail-mt.c:260
 #, c-format
-msgid "Error while performing operation:\n"
+msgid ""
+"Error while performing operation:\n"
 "%s"
-msgstr "Помилка під час здійснення операції:\n"
+msgstr ""
+"Помилка під час здійснення операції:\n"
 "%s"
 
 #: mail/mail-mt.c:903
@@ -13305,8 +13347,7 @@ msgstr "Фільтрування теки"
 msgid "Fetching Mail"
 msgstr "Отримання пошти"
 
-#: mail/mail-ops.c:550
-#: mail/mail-ops.c:579
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
 msgid "However, the message was successfully sent."
 msgstr "Однак, повідомлення було успішно відіслано."
 
@@ -13325,8 +13366,7 @@ msgstr "Відсилання повідомлення %d з %d"
 msgid "Failed on message %d of %d"
 msgstr "Збій на повідомленні %d з %d"
 
-#: mail/mail-ops.c:750
-#: mail/mail-send-recv.c:569
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:569
 msgid "Complete."
 msgstr "Виконано."
 
@@ -13398,16 +13438,20 @@ msgstr "Збереження %d повідомлень"
 
 #: mail/mail-ops.c:1849
 #, c-format
-msgid "Unable to create output file: %s\n"
+msgid ""
+"Unable to create output file: %s\n"
 " %s"
-msgstr "Неможливо створити файл виводу: %s\n"
+msgstr ""
+"Неможливо створити файл виводу: %s\n"
 " %s"
 
 #: mail/mail-ops.c:1877
 #, c-format
-msgid "Error saving messages to: %s:\n"
+msgid ""
+"Error saving messages to: %s:\n"
 " %s"
-msgstr "Помилка при збереженні до: %s:\n"
+msgstr ""
+"Помилка при збереженні до: %s:\n"
 " %s"
 
 #: mail/mail-ops.c:1951
@@ -13416,9 +13460,11 @@ msgstr "Збереження долучення"
 
 #: mail/mail-ops.c:1968
 #, c-format
-msgid "Cannot create output file: %s:\n"
+msgid ""
+"Cannot create output file: %s:\n"
 " %s"
-msgstr "Неможливо створити файл виводу: %s:\n"
+msgstr ""
+"Неможливо створити файл виводу: %s:\n"
 " %s"
 
 #: mail/mail-ops.c:1998
@@ -13503,8 +13549,7 @@ msgstr "Скасувати все"
 msgid "Updating..."
 msgstr "Оновлення..."
 
-#: mail/mail-send-recv.c:379
-#: mail/mail-send-recv.c:434
+#: mail/mail-send-recv.c:379 mail/mail-send-recv.c:434
 msgid "Waiting..."
 msgstr "Очікування..."
 
@@ -13560,8 +13605,7 @@ msgstr "Редагувати підпис"
 msgid "Enter a name for this signature."
 msgstr "Введіть ім'я для цього підпису."
 
-#: mail/mail-signature-editor.c:432
-#: my-evolution/e-summary-preferences.c:625
+#: mail/mail-signature-editor.c:432 my-evolution/e-summary-preferences.c:625
 msgid "Name:"
 msgstr "Ім'я:"
 
@@ -13667,31 +13711,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 "Сьогодні %I:%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 %I:%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 "Створення списку повідомлень"
 
@@ -13740,8 +13784,7 @@ msgstr ""
 msgid "For Your Information"
 msgstr "Для Вашої Інформації"
 
-#: mail/message-tag-followup.c:66
-#: ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Переслати"
 
@@ -13749,13 +13792,11 @@ msgstr "Переслати"
 msgid "No Response Necessary"
 msgstr "Відповідь не вимагається"
 
-#: mail/message-tag-followup.c:69
-#: 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:70
-#: 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 "Відповісти всім"
 
@@ -13763,8 +13804,7 @@ msgstr "Відповісти всім"
 msgid "Review"
 msgstr "Перегляд"
 
-#: mail/message-tag-followup.c:283
-#: mail/message-tags.glade.h:2
+#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13773,7 +13813,8 @@ msgid "C_ompleted"
 msgstr "За_вершено"
 
 #: mail/message-tags.glade.h:5
-msgid "The messages you have selected for follow up are listed below.\n"
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 
@@ -13792,51 +13833,48 @@ 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:331
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Передплатити теку \"%s\""
 
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Відписатися від теки \"%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 "Тека"
 
-#: mail/subscribe-dialog.c:1356
+#: mail/subscribe-dialog.c:1389
 msgid "Scanning folders..."
 msgstr "Сканування тек..."
 
-#: mail/subscribe-dialog.c:1470
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Не було вибрано сервера"
 
-#: mail/subscribe-dialog.c:1545
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Будь ласка, виберіть сервер."
 
-#: mail/subscribe-dialog.glade.h:3
-#: 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
-#: ui/evolution-message-composer.xml.h:3
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Закрити"
@@ -13845,8 +13883,7 @@ msgstr "Закрити"
 msgid "Manage Subscriptions"
 msgstr "Керування підпискою"
 
-#: mail/subscribe-dialog.glade.h:5
-#: ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Оновити список"
 
@@ -13863,18 +13900,25 @@ msgid "_Unsubscribe"
 msgstr "Відписатися"
 
 #: 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 "Компонент Зведення Evolutuion."
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
-msgid "Evolution Summary component."
+#, fuzzy
+msgid "Evolution Summary component"
 msgstr "Компонент Зведення Evolutuion."
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Компонент Зведення Evolutuion."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 msgid "Summary Preferences"
 msgstr "Вподобання Зведення"
 
@@ -17275,8 +17319,7 @@ msgid "Hagerstown"
 msgstr ""
 
 #. HAIL
-#: my-evolution/Locations.h:885
-#: my-evolution/metar.c:218
+#: my-evolution/Locations.h:885 my-evolution/metar.c:218
 msgid "Hail"
 msgstr "Град"
 
@@ -23809,8 +23852,7 @@ msgstr "Без опису"
 msgid "Mail summary"
 msgstr "Поштове зведення"
 
-#: my-evolution/e-summary-mail.c:443
-#: shell/e-local-storage.c:1151
+#: my-evolution/e-summary-mail.c:443 shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Локальні теки"
 
@@ -23847,8 +23889,7 @@ msgstr "Всі"
 msgid "Add"
 msgstr "Додати"
 
-#: my-evolution/e-summary-shown.c:543
-#: my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:543 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr "Показано"
 
@@ -23884,16 +23925,15 @@ msgstr ""
 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 "Будь ласка, зачекайте..."
 
-#: 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 "Збій друку зведення"
 
@@ -23949,9 +23989,7 @@ msgstr "Малохмарно"
 msgid "Overcast"
 msgstr "Суцільна хмарність"
 
-#: my-evolution/metar.c:57
-#: my-evolution/metar.c:75
-#: my-evolution/metar.c:486
+#: my-evolution/metar.c:57 my-evolution/metar.c:75 my-evolution/metar.c:486
 msgid "Invalid"
 msgstr "Неправильно"
 
@@ -24056,8 +24094,7 @@ msgstr "Моросить місцями"
 msgid "Partial drizzle"
 msgstr "Частково моросить"
 
-#: my-evolution/metar.c:136
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
 msgid "Thunderstorm"
 msgstr "Гроза"
 
@@ -24159,8 +24196,7 @@ msgstr "Місцями сніг"
 msgid "Partial snowfall"
 msgstr "Частковий снігопад"
 
-#: my-evolution/metar.c:166
-#: my-evolution/metar.c:181
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr "Сніговий шторм"
 
@@ -24335,8 +24371,7 @@ msgstr "Льодові кульки з намерзанням"
 msgid "Hail in the vicinity"
 msgstr "Град в околицях"
 
-#: my-evolution/metar.c:220
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:220 my-evolution/metar.c:235
 msgid "Light hail"
 msgstr "Слабкий град"
 
@@ -25003,8 +25038,7 @@ msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:443
-#: my-evolution/metar.c:452
+#: my-evolution/metar.c:443 my-evolution/metar.c:452
 msgid "Tornado"
 msgstr "Смерч"
 
@@ -25171,20 +25205,21 @@ msgid "_Weather"
 msgstr "Погода"
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configuration control for Evolution folder settings."
-msgstr "Налаштовування тек Evolution"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Configure special folders and offline folder behavior here"
 msgstr "Налаштовування властивостей спеціальних тек та оффлайн-тек"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Оболонка Evolutuion."
+
 #: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Folder Settings"
-msgstr "Параметри теки"
+msgid "Evolution folder settings configuration control"
+msgstr ""
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "The Evolution shell."
-msgstr "Оболонка Evolutuion."
+msgid "Folder Settings"
+msgstr "Параметри теки"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25196,13 +25231,14 @@ msgstr "Скасувати операцію"
 
 #: shell/e-folder-dnd-bridge.c:55
 #, c-format
-msgid "Cannot transfer folder:\n"
+msgid ""
+"Cannot transfer folder:\n"
 "%s"
-msgstr "Не вдалось перенести теку:\n"
+msgstr ""
+"Не вдалось перенести теку:\n"
 "%s"
 
-#: shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
 #, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "\"%s\" у \"%s\""
@@ -25215,10 +25251,8 @@ msgstr "Додати теку"
 msgid "Drafts"
 msgstr "Чернетки"
 
-#: 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 "Вхідні"
 
@@ -25247,50 +25281,24 @@ msgstr ""
 
 #: shell/e-setup.c:178
 #, c-format
-msgid "An error occurred in copying files into\n"
-"`%s'."
-msgstr "Сталася помилка під час копіювання файлів у\n"
-"`%s'."
-
-#: shell/e-setup.c:243
-#, c-format
 msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
+"An error occurred in copying files into\n"
+"`%s'."
 msgstr ""
-"Evolution неспроможний створити каталог\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 "Каталог %s\n"
-"не має потрібних прав доступу. Будь ласка дайте дозвіл на читання та виконання та перезапустіть Rvolution."
-
-#: 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 "Для коректної роботи Evolution потрібно видалити файл %s\n"
-"Будь ласка видаліть цей файл та перезавантажте Evolution."
+"Сталася помилка під час копіювання файлів у\n"
+"`%s'."
 
-#: shell/e-setup.c:290
+#: shell/e-setup.c:244
 #, 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 "Файл \"%s\" не є каталогом.\n"
+msgstr ""
+"Файл \"%s\" не є каталогом.\n"
 "Щоб дозволити встановлення файлів користувача Evolution,пересуньте його."
 
-#: shell/e-setup.c:299
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25368,9 +25376,11 @@ msgstr "Перенести теку"
 
 #: shell/e-shell-folder-commands.c:391
 #, c-format
-msgid "Cannot delete folder:\n"
+msgid ""
+"Cannot delete folder:\n"
 "%s"
-msgstr "Не вдалось стерти теку:\n"
+msgstr ""
+"Не вдалось стерти теку:\n"
 "%s"
 
 #: shell/e-shell-folder-commands.c:405
@@ -25385,9 +25395,11 @@ msgstr "Стерти \"%s\""
 
 #: shell/e-shell-folder-commands.c:485
 #, c-format
-msgid "Cannot rename folder:\n"
+msgid ""
+"Cannot rename folder:\n"
 "%s"
-msgstr "Неможливо змінити назву теки:\n"
+msgstr ""
+"Неможливо змінити назву теки:\n"
 "%s"
 
 #: shell/e-shell-folder-commands.c:534
@@ -25411,24 +25423,27 @@ msgstr "Вибрана теку не належить іншому корист�
 
 #: shell/e-shell-folder-commands.c:586
 #, c-format
-msgid "Cannot remove folder:\n"
+msgid ""
+"Cannot remove folder:\n"
 "%s"
-msgstr "Неможливо видалити теку:\n"
+msgstr ""
+"Неможливо видалити теку:\n"
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:127
 #, c-format
-msgid "Cannot create the specified folder:\n"
+msgid ""
+"Cannot create the specified folder:\n"
 "%s"
-msgstr "Неможливо створити вказану теку:\n"
+msgstr ""
+"Неможливо створити вказану теку:\n"
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:308
 msgid "Create New Folder"
 msgstr "Створити нову теку"
 
-#: 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 "(Без імені)"
 
@@ -25438,126 +25453,135 @@ msgstr "Оберіть тип імпортера для виконання:"
 
 #: 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"
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
 "\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
-msgstr "Вкажіть файл який бажаєте імпортувати у Rvolution, та виберіть тип файлу зі списку.\n"
-"Якщо тип вам невідомий, ви можете вибрати \"Автоматично\" та Evolution намагатиметься його визначити."
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Вкажіть файл який бажаєте імпортувати у Rvolution, та виберіть тип файлу зі "
+"списку.\n"
+"Якщо тип вам невідомий, ви можете вибрати \"Автоматично\" та Evolution "
+"намагатиметься його визначити."
 
-#: shell/e-shell-importer.c:150
-#: shell/e-shell-startup-wizard.c:709
+#: 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:247
-#: shell/e-shell-importer.c:278
+#: shell/e-shell-importer.c:247 shell/e-shell-importer.c:278
 #, c-format
-msgid "Importing %s\n"
+msgid ""
+"Importing %s\n"
 "Importing item %d."
-msgstr "Імпортування %s\n"
+msgstr ""
+"Імпортування %s\n"
 "Імпортування елемента %d."
 
 #: shell/e-shell-importer.c:351
 msgid "Select importer"
 msgstr "Виберіть імпортер"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "Файлу %s не існує"
 
-#: 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"
 
-#: 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"
+msgid ""
+"There is no importer that is able to handle\n"
 "%s"
-msgstr "Немає імпортеру здатного обробити\n"
+msgstr ""
+"Немає імпортеру здатного обробити\n"
 "%s"
 
-#: shell/e-shell-importer.c:517
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "Імпортування"
 
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:525
 #, c-format
-msgid "Importing %s.\n"
+msgid ""
+"Importing %s.\n"
 "Starting %s"
-msgstr "Імпортування %s.\n"
+msgstr ""
+"Імпортування %s.\n"
 "Запуск %s"
 
-#: shell/e-shell-importer.c:536
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "Помилка запуску %s"
 
-#: shell/e-shell-importer.c:550
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Помилка завантаження %s"
 
-#: shell/e-shell-importer.c:567
+#: shell/e-shell-importer.c:568
 #, c-format
-msgid "Importing %s\n"
+msgid ""
+"Importing %s\n"
 "Importing item 1."
-msgstr "Імпортування %s\n"
+msgstr ""
+"Імпортування %s\n"
 "Імпортується елемент 1."
 
-#: shell/e-shell-importer.c:621
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: shell/e-shell-importer.c:670
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Назва файлу:"
 
-#: shell/e-shell-importer.c:675
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Вибрати файл"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Тип файлу:"
 
-#: shell/e-shell-importer.c:709
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "Імпортувати дані й параметри з старіших програм"
 
-#: shell/e-shell-importer.c:713
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "Імпорт одного файлу"
 
-#: shell/e-shell-importer.c:779
-#: shell/e-shell-startup-wizard.c:538
-msgid "Please wait...\n"
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
+msgid ""
+"Please wait...\n"
 "Scanning for existing setups"
-msgstr "Будь ласка зачекайте...\n"
+msgstr ""
+"Будь ласка зачекайте...\n"
 "Йде сканування наявних установок"
 
-#: shell/e-shell-importer.c:782
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Запуск інтелектуального імпортера"
 
-#: 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 "Від %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:1211
-#: shell/importer/intelligent.c:191
+#: shell/e-shell-importer.c:1212 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr "Імпорт"
 
@@ -25567,9 +25591,11 @@ msgstr "Закриття з'єднань..."
 
 #: shell/e-shell-offline-sync.c:163
 #, c-format
-msgid "Error synchronizing \"%s\":\n"
+msgid ""
+"Error synchronizing \"%s\":\n"
 "%s"
-msgstr "Помилка під час синхронізації \"%s\":\n"
+msgstr ""
+"Помилка під час синхронізації \"%s\":\n"
 "%s"
 
 #: shell/e-shell-offline-sync.c:232
@@ -25683,13 +25709,11 @@ msgstr "Вкажіть теку на яку буде вказувати етик
 msgid "_Work Online"
 msgstr "Працювати у мережі"
 
-#: shell/e-shell-view-menu.c:782
-#: ui/evolution.xml.h:65
+#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
 msgid "_Work Offline"
 msgstr "Працювати автономно"
 
-#: shell/e-shell-view-menu.c:795
-#: ui/evolution.xml.h:40
+#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:40
 msgid "Work Offline"
 msgstr "Робота не на лінії"
 
@@ -25697,26 +25721,32 @@ msgstr "Робота не на лінії"
 msgid "(No folder displayed)"
 msgstr "(Жодної теки не відображено)"
 
-#: 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 "(Немає)"
 
-#: shell/e-shell-view.c:2100
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr "Ximian Evolution у мережевому режимі. Клацніть на цю кнопку для переходу до автономної роботи."
+#: 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:2107
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution у процесі переходу до автономної роботи."
 
-#: shell/e-shell-view.c:2113
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
-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
@@ -25729,12 +25759,12 @@ msgstr ""
 "Помилка від системи активації:\n"
 "%s"
 
-#: shell/e-shell.c:738
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Неможливо встановити локальне сховище -- %s"
 
-#: shell/e-shell.c:1799
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25745,20 +25775,19 @@ msgstr ""
 "несподівано завершився. Щоб знову отримати доступ до нього вам потрібно\n"
 "закрити та перезавантажити Evolution."
 
-#: 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 "Неможливо зареєструватись на OAF"
 
-#: 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 "Загальна помилка"
 
@@ -25851,8 +25880,7 @@ msgstr "Перейменувати вибраний ярлик на:"
 msgid "Open the folder linked to this shortcut"
 msgstr "Відкрити теку, що зв'язана з цим ярликом"
 
-#: shell/e-shortcuts-view.c:417
-#: ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:417 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Відкрити у новому вікні"
 
@@ -25995,63 +26023,63 @@ msgstr ""
 "Помилка від системи активації:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "Помилка CORBA"
 
-#: 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
 msgid "No owner"
 msgstr "Не має власника"
 
-#: 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
 msgid "Unsupported type"
 msgstr "Не підтримуваний тип"
 
-#: 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
 msgid "Internal error"
 msgstr "Внутрішня помилка"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Існує"
 
-#: shell/evolution-shell-component.c:1191
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "Неправильний URI"
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Має підтеки"
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Не залишилося вільного простору"
 
-#: shell/evolution-shell-component.c:1199
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "Старого власника знищено"
 
@@ -26065,16 +26093,13 @@ msgstr "Перевірочний компонент Evolutuion."
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Click OK to close these connections and go offline"
-msgstr "Для закриття цих з'єднань та переходу до автономної роботи клацніть на OK"
+msgstr ""
+"Для закриття цих з'єднань та переходу до автономної роботи клацніть на OK"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
 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 "Календар"
@@ -26192,7 +26217,8 @@ msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
-msgstr "Ласкаво просимо до Асистента імпорту Evolution.\n"
+msgstr ""
+"Ласкаво просимо до Асистента імпорту Evolution.\n"
 "Цей асистент допоможе вам імпортувати у Evolution зовнішні файли."
 
 #: shell/importer/intelligent.c:189
@@ -26211,17 +26237,16 @@ msgstr "Більше не запитувати"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution може імпортувати дані з таких файлів:"
 
-#: 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 завершує роботу..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:264
+#: shell/main.c:266
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26246,7 +26271,8 @@ msgstr ""
 "Ця версія Ximian Evolution ще не закінчена. Вона дуже близька до закінчення\n"
 "але деякі функції ще не закінчені або на працюють належним чином.\n"
 "\n"
-"Якщо вам потрібна стабільна версія Evolution, ми радимо вам видалити цю версія та\n"
+"Якщо вам потрібна стабільна версія Evolution, ми радимо вам видалити цю "
+"версія та\n"
 "встановити версію 1.2.x взамін instead (1.2.2)\n"
 "\n"
 "Якщо ви знайшли помилку в програмі, будь ласка, сповістити нас про них на\n"
@@ -26256,54 +26282,61 @@ msgstr ""
 "Сподіваємось вам сподобається результат нашої праці та\n"
 "ми із нетерпінням чекаємо на ваші внески!\n"
 
-#: shell/main.c:288
-msgid "Thanks\n"
+#: shell/main.c:290
+msgid ""
+"Thanks\n"
 "The Ximian Evolution Team\n"
-msgstr "Дякуємо\n"
+msgstr ""
+"Дякуємо\n"
 "Команда розробників Ximian Evolution\n"
 
-#: shell/main.c:296
+#: shell/main.c:298
 msgid "Don't tell me again"
 msgstr "Більше не казати"
 
-#: shell/main.c:385
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Неможливо зв'язатись з оболонкою Ximian Evolutuion."
 
-#: shell/main.c:394
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Неможливо ініціалізувати оболонку Ximian Evolutuion: %s"
 
-#: shell/main.c:526
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Вимкнути заставку"
 
-#: shell/main.c:528
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "Починати в режимі оффлайн"
 
-#: shell/main.c:530
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "Починати в режимі онлайн"
 
-#: 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 "Примусити відновлення конфігураційних файлів з Evolution 1.0.x"
 
-#: shell/main.c:560
+#: shell/main.c:568
 #, c-format
-msgid "%s: --online and --offline cannot be used together.\n"
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
-msgstr "%s: --online та --offline не можуть бути використані разом.\n"
+msgstr ""
+"%s: --online та --offline не можуть бути використані разом.\n"
 "  Use %s --help для більш докладної інформації.\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 "Помилка при завантаженні типової книги адрес."
@@ -26313,10 +26346,6 @@ msgstr "Помилка при завантаженні типової книги
 msgid "Input File"
 msgstr "Вхідний файл"
 
-#: tools/evolution-addressbook-export.c:51
-msgid "Output File"
-msgstr "Файл виводу"
-
 #: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Не вказано назви файлу."
@@ -26345,12 +26374,24 @@ 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 "Не вдалося перейменувати теку \"%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 "Скопіювати контакт(и) до іншої теки..."
 
-#: ui/evolution-addressbook.xml.h:4
-#: ui/evolution-calendar.xml.h:2
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Скопіювати вибране"
 
@@ -26358,8 +26399,7 @@ msgstr "Скопіювати вибране"
 msgid "Copy to Folder..."
 msgstr "Скопіювати до теки..."
 
-#: ui/evolution-addressbook.xml.h:7
-#: ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Вирізати вибране"
 
@@ -26375,8 +26415,7 @@ msgstr "Перенести контакти в іншу теку..."
 msgid "Move to Folder..."
 msgstr "Перенести до теки..."
 
-#: ui/evolution-addressbook.xml.h:14
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Вставити вміст кишені"
 
@@ -26384,10 +26423,8 @@ msgstr "Вставити вміст кишені"
 msgid "Previews the contacts to be printed"
 msgstr "Переглянути контакти, що буде надруковано"
 
-#: ui/evolution-addressbook.xml.h:17
-#: ui/evolution-calendar.xml.h:16
-#: ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
 #: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "Перегляд друку"
@@ -26432,24 +26469,17 @@ msgstr "Зупинити завантаження"
 msgid "View the current contact"
 msgstr "Переглянути поточний контакт."
 
-#: ui/evolution-addressbook.xml.h:29
-#: ui/evolution-calendar.xml.h:25
-#: ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
+#: 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-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
+#: 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:43
 msgid "_Actions"
 msgstr "Дії"
 
-#: ui/evolution-addressbook.xml.h:34
-#: ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "Переслати контакт..."
 
@@ -26545,15 +26575,12 @@ msgstr "Тиждень"
 msgid "Close this item"
 msgstr "Закрити цей елемент"
 
-#: ui/evolution-comp-editor.xml.h:5
-#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
 msgstr "Стерти цей елемент"
 
-#: ui/evolution-comp-editor.xml.h:6
-#: ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:19
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Головний пенал"
 
@@ -26561,13 +26588,11 @@ msgstr "Головний пенал"
 msgid "Preview the printed item"
 msgstr "Переглянути елементи, що буде надруковано"
 
-#: ui/evolution-comp-editor.xml.h:10
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Надрукувати цей елемент"
 
-#: ui/evolution-comp-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
 #: ui/evolution-signature-editor.xml.h:5
 msgid "Save"
 msgstr "Зберегти"
@@ -26576,8 +26601,7 @@ msgstr "Зберегти"
 msgid "Save As..."
 msgstr "Зберегти як..."
 
-#: ui/evolution-comp-editor.xml.h:14
-#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
@@ -26591,13 +26615,11 @@ msgstr "Зберегти елемент і закрити діалогове в�
 msgid "Save this item to disk"
 msgstr "Зберегти цей елемент на диску"
 
-#: ui/evolution-comp-editor.xml.h:18
-#: ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: 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-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "Файл"
@@ -26655,13 +26677,11 @@ msgstr "Скасувати зустріч"
 msgid "Cancel the meeting for this item"
 msgstr "Скасувати засідання для цього елемента"
 
-#: ui/evolution-event-editor.xml.h:3
-#: ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "Переслати як i_Calendar"
 
-#: ui/evolution-event-editor.xml.h:4
-#: ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr "Переслати цей елемент електронною поштою"
 
@@ -26782,8 +26802,10 @@ msgid "Hide _Read Messages"
 msgstr "Сховати п_рочитані повідомлення"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Приховувати видалені повідомлення замість відображення їх перекресленими"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+"Приховувати видалені повідомлення замість відображення їх перекресленими"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
@@ -26801,8 +26823,7 @@ msgstr "Вставити повідомлення у кишеню"
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Остаточно видалити всі стерті повідомлення з цієї теки"
 
-#: ui/evolution-mail-list.xml.h:13
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Вибрати все"
 
@@ -26842,18 +26863,15 @@ msgstr "Тимчасово прибрати вибрані повідомлен�
 msgid "Threaded Message list"
 msgstr "Розбитий на гілки список повідомлень"
 
-#: ui/evolution-mail-list.xml.h:26
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "Викреслити"
 
-#: ui/evolution-mail-list.xml.h:27
-#: ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "Тека"
 
-#: ui/evolution-mail-list.xml.h:28
-#: ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Інвертувати вибір"
 
@@ -27085,7 +27103,8 @@ msgstr "Відкрити вибране повідомлення у новому
 
 #: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
-msgstr "Відкрити вибране повідомлення у редакторі для його повторного надсилання"
+msgstr ""
+"Відкрити вибране повідомлення у редакторі для його повторного надсилання"
 
 #: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
@@ -27255,8 +27274,7 @@ msgstr "Про_цитовано"
 msgid "_Resend..."
 msgstr "Надіслати повтор_но..."
 
-#: ui/evolution-mail-message.xml.h:113
-#: ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Інструменти"
 
@@ -27264,22 +27282,19 @@ msgstr "_Інструменти"
 msgid "_Undelete"
 msgstr "Відновити"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2
-#: ui/evolution.xml.h:6
+#: 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-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
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
 msgid "_View"
 msgstr "_Вигляд"
 
@@ -27291,8 +27306,7 @@ msgstr "Долучити"
 msgid "Attach a file"
 msgstr "Долучити файл"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Закрити поточний файл"
 
@@ -27308,8 +27322,7 @@ msgstr "Зашифрувати це повідомлення PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Зашифрувати це повідомлення вашим сертифікатом шифрування S/MIME"
 
-#: ui/evolution-message-composer.xml.h:8
-#: ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "Формат"
 
@@ -27460,8 +27473,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:52
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:52
 msgid "_Help"
 msgstr "Довідка"
 
@@ -27639,7 +27651,8 @@ msgstr "Установки пілота..."
 
 #: ui/evolution.xml.h:27
 msgid "Remove a folder added with \"Open Other User's Folder\""
-msgstr "Видалити теку, яку було додано командою \"Відкрити теки інших користувачів\""
+msgstr ""
+"Видалити теку, яку було додано командою \"Відкрити теки інших користувачів\""
 
 #: ui/evolution.xml.h:28
 msgid "Send / Receive"
@@ -27839,9 +27852,12 @@ msgid "Time Zones"
 msgstr "Часові пояси"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
-msgid "Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
 " Use the right mouse button to zoom out."
-msgstr "Використовуйте ліву кнопку миші для збільшення карти та вибору зони.\n"
+msgstr ""
+"Використовуйте ліву кнопку миші для збільшення карти та вибору зони.\n"
 "Використовуйте праву кнопку миші для зменшення карти."
 
 #: widgets/menus/gal-view-menus.c:288
@@ -27872,13 +27888,11 @@ msgstr "ПВСЧПСН"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241
-#: widgets/misc/e-dateedit.c:436
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:436
 msgid "Now"
 msgstr "зараз"
 
-#: widgets/misc/e-cell-date-edit.c:249
-#: widgets/misc/e-dateedit.c:442
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:442
 msgid "Today"
 msgstr "сьогодні"
 
@@ -27939,8 +27953,7 @@ msgstr "Західноєвропейський"
 msgid "Traditional"
 msgstr "Традиційний"
 
-#: widgets/misc/e-charset-picker.c:89
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:89 widgets/misc/e-charset-picker.c:90
 msgid "Simplified"
 msgstr "Спрощений"
 
@@ -27982,18 +27995,15 @@ msgstr "Редактор пошуків"
 msgid "Save Search"
 msgstr "Зберегти пошук"
 
-#: widgets/misc/e-filter-bar.h:91
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 msgid "_Save Search..."
 msgstr "З_берегти пошук"
 
-#: widgets/misc/e-filter-bar.h:92
-#: widgets/misc/e-filter-bar.h:99
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 msgid "_Edit Saved Searches..."
 msgstr "Ви_правити збережені результати пошуку..."
 
-#: widgets/misc/e-filter-bar.h:93
-#: widgets/misc/e-filter-bar.h:100
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
 msgid "_Advanced..."
 msgstr "_Додатково..."
 
@@ -28025,38 +28035,194 @@ msgstr "З_найти зараз"
 msgid "_Clear"
 msgstr "О_чистити"
 
-#: widgets/misc/e-search-bar.c:839
+#: widgets/misc/e-search-bar.c:833
 msgid "Item ID"
 msgstr "ID елементу"
 
-#: widgets/misc/e-search-bar.c:846
+#: widgets/misc/e-search-bar.c:840
 msgid "Subitem ID"
 msgstr "ID піделементу"
 
-#: widgets/misc/e-search-bar.c:853
+#: widgets/misc/e-search-bar.c:847
 msgid "Text"
 msgstr "Тест"
 
-#: widgets/misc/e-search-bar.c:931
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "Очистити"
 
-#: widgets/misc/e-search-bar.c:933
+#: 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_WombatLDAP.server.in.in.h:3
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:3
-msgid "Wombat InterfaceCheck interface"
-msgstr ""
+#: 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 у Evolutuion."
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Імпорт файлів LDIF у Evolution."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Майстер імпорту файлів VCard у Evolutuion."
+
+#~ 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 "Factory for the Addressbook's name selection interface"
+#~ msgstr "Фабрика для інтерфейсу вибору імені з книги адрес"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Неназваний контактний список"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d не показано)"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Керуючий елемент Bonobo, що показує список завдань."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Приклад керуючого елементу bonobo, що показує календар."
+
+#~ 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 "Alarm notification service"
+#~ msgstr "Послуга сповіщення"
+
+#~ 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 "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Налаштовування екранних шрифтів Evolutuion."
+
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Налаштовування поштових рахунків Evolutuion."
+
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Налаштовування поштової програми Evolutuion."
+
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Налаштовування редактора повідомлень Evolutuion."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Компонент Evolution для обробки пошти."
+
+#~ msgid "Factory for the controls exported by the Evolution Mailer"
+#~ msgstr ""
+#~ "Налаштовування керуючих елементів, які експортовані поштовою програмою "
+#~ "Evolutuion."
+
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "Майстер імпортування mbox у Evolutuion."
+
+#~ 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 "On Screen fonts"
+#~ msgstr "Екранні шрифти"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "Фіксованої ширини:"
+
+#~ msgid "_Variable-width:"
+#~ msgstr "Змінної ширини:"
+
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Налаштовування  Зведення Evolution"
+
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Налаштовування тек Evolution"
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Evolution неспроможний створити каталог\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"
+#~ "не має потрібних прав доступу. Будь ласка дайте дозвіл на читання та "
+#~ "виконання та перезапустіть Rvolution."
+
+#~ msgid ""
+#~ "File %s\n"
+#~ "should be removed to allow Evolution to work correctly.\n"
+#~ "Please remove this file and restart Evolution."
+#~ msgstr ""
+#~ "Для коректної роботи Evolution потрібно видалити файл %s\n"
+#~ "Будь ласка видаліть цей файл та перезавантажте Evolution."
+
+#~ msgid "Output File"
+#~ msgstr "Файл виводу"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Персональний сервер адресної книги"
 
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "Персональний календарний сервер; календарна фабрика"
diff --git a/po/vi.po b/po/vi.po
index 7bdf50da25..7f4f4d886b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2003-02-22 04:28+0100\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-02-23 08:29+0700\n"
 "Last-Translator: pclouds <pclouds@gmx.net>\n"
 "Language-Team: GnomeVI <gnomevi-list@lists.sourceforge.net>\n"
@@ -14,29 +14,37 @@ 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 "Factory Nhập tập tin LDIF vào Evolution."
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Trợ tá bộ nhập Evolution"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "Nhập tập tin LDIF vào 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 "Factory Nhập tập tin VCard vào Evolution."
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Bộ soạn thư của Evolution."
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Nhập tập tin VCard vào Evolution."
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Bộ soạn thư củ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:1297
+#: addressbook/backend/ebook/e-card.c:1301
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Tập tin là"
 
 #: 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
@@ -44,13 +52,13 @@ msgid "Name"
 msgstr "Tên"
 
 #: 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 "Email"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1764
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "Chính"
 
@@ -60,8 +68,8 @@ msgstr "Ch"
 
 #: 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:1749
+#: 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 "Phụ tá"
@@ -69,8 +77,8 @@ msgstr "Phụ tá"
 #: 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:1750
-#: addressbook/gui/contact-editor/e-contact-editor.c:1821
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr "Kinh doanh"
 
@@ -80,12 +88,12 @@ msgid "Bus"
 msgstr "KD"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr "Gọi lại"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "Công ty"
 
@@ -96,13 +104,13 @@ msgstr "CTY"
 #: 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:1756
-#: addressbook/gui/contact-editor/e-contact-editor.c:1822
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr "Nhà"
 
 #: 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 "Tổ chức"
@@ -113,18 +121,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:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "Di động"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Car"
 msgstr "Xe hơi"
 
 #: 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:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Fax Kinh doanh"
@@ -134,13 +142,13 @@ msgid "Bus Fax"
 msgstr "Fax KD"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax ở Nhà"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "Kinh doanh 2"
 
@@ -149,43 +157,43 @@ msgid "Bus 2"
 msgstr "KD 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "Nhà 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: 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:1761
-#: addressbook/gui/contact-editor/e-contact-editor.c:1823
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "Khác"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1762
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Fax khác"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1763
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Bộ dàn trang"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Rađiô"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1766
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
@@ -196,15 +204,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:1794
+#: 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:492
-#: addressbook/gui/contact-editor/e-contact-editor.c:1795
+#: 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"
@@ -228,7 +236,7 @@ msgid "Dep"
 msgstr "CQ"
 
 #: 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 "Văn phòng"
@@ -238,7 +246,7 @@ msgid "Off"
 msgstr "VP"
 
 #: 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 "Tựa đề"
@@ -253,7 +261,7 @@ msgid "Prof"
 msgstr "GS"
 
 #: 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 "Quản lý"
@@ -267,7 +275,7 @@ msgid "Ass"
 msgstr "TLý"
 
 #: 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 "Tên hiệu"
@@ -277,19 +285,19 @@ msgid "Nick"
 msgstr "Hiệu"
 
 #: 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 "Vợ/Chồng"
 
 #: 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 "Ghi chú"
 
 #: 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 Lịch"
 
@@ -307,137 +315,142 @@ msgid "FBUrl"
 msgstr "URL-R"
 
 #: 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 "Lịch"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
 msgid "Anniversary"
 msgstr "Kỷ niệm"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Kniệm"
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "Ngày sinh"
 
-#: 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 "Phân loại"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Tên gia đình"
 
-#: 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-card-simple.c:893
 #: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr "Danh sách vô danh"
 
-#: 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 "Tên đầy đủ"
 
-#: 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 "Địa chỉ"
 
-#: addressbook/backend/ebook/e-card.c:1324
+#: addressbook/backend/ebook/e-card.c:1328
 msgid "Address Label"
 msgstr "Nhãn địa chỉ"
 
-#: addressbook/backend/ebook/e-card.c:1331
+#: addressbook/backend/ebook/e-card.c:1335
 msgid "Phone"
 msgstr "Điện thoại"
 
-#: addressbook/backend/ebook/e-card.c:1345
+#: addressbook/backend/ebook/e-card.c:1349
 msgid "Birth date"
 msgstr "Ngày sinh"
 
-#: 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 "Đơn vị tổ chức"
 
-#: 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 "Vai trò"
 
-#: 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 "Lịch"
+
+#: addressbook/backend/ebook/e-card.c:1466
 msgid "Related Contacts"
 msgstr "Liên lạc liên quan"
 
-#: addressbook/backend/ebook/e-card.c:1469
+#: addressbook/backend/ebook/e-card.c:1480
 msgid "Category List"
 msgstr "Danh sách phân loại"
 
-#: addressbook/backend/ebook/e-card.c:1476
+#: addressbook/backend/ebook/e-card.c:1487
 msgid "Wants HTML"
 msgstr "Muốn HTML"
 
-#: addressbook/backend/ebook/e-card.c:1483
+#: addressbook/backend/ebook/e-card.c:1494
 msgid "Wants HTML set"
 msgstr "Muốn đặt HTML"
 
-#: addressbook/backend/ebook/e-card.c:1490
+#: addressbook/backend/ebook/e-card.c:1501
 msgid "List"
 msgstr "Danh sách"
 
-#: 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 "Tổng quát"
 
-#: 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 "Nhiều VCard"
-
-#: addressbook/backend/ebook/e-card.c:2878
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard cho %s"
-
 #: addressbook/backend/ebook/test-client-list.c:15
 #: addressbook/backend/ebook/test-client.c:33
 #: calendar/gui/alarm-notify/notify-main.c:170
@@ -445,7 +458,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Không thể khởi động Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:465
-#: addressbook/backend/pas/pas-backend-ldap.c:3045
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 msgid "Searching..."
 msgstr "Đang tìm..."
 
@@ -453,113 +466,116 @@ msgstr "Đang tìm..."
 msgid "Loading..."
 msgstr "Đang nạp..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:597
+#: addressbook/backend/pas/pas-backend-ldap.c:598
 msgid "Using Distinguished Name (DN)"
 msgstr "Dùng tên phân biệt (DN)"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:601
+#: addressbook/backend/pas/pas-backend-ldap.c:602
 msgid "Using Email Address"
 msgstr "Dùng địa chỉ email"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:747
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 msgid "Reconnecting to LDAP server..."
 msgstr "Đang kết nối tới LDAP server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1290
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr "Đang thêm card vào LDAP server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1401
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr "Đang loại bỏ card khỏi LDAP server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1637
-#: addressbook/backend/pas/pas-backend-ldap.c:1640
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr "Đang sửa card trong LDAP server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2956
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "Đang nhận kết quả tìm kiếm LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:3065
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 msgid "Error performing search"
 msgstr "Lỗi khi tìm kiếm"
 
-#: addressbook/conduit/address-conduit.c:292
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "Địa chỉ đồng bộ mặc định:"
 
-#: addressbook/conduit/address-conduit.c:535
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "Không thể nạp con trỏ\n"
 
-#: addressbook/conduit/address-conduit.c:548
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "Không nạp được EBook\n"
 
-#: 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 "Không thể khởi động wombat server"
 
-#: 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 "Không thể khởi động 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 "Không thể đọc khối ứng dụng địa chỉ của pilot"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Điều khiển Bonobo cho popup địa chỉ."
+msgid "Configure access to LDAP directory servers here"
+msgstr "Cấu hình truy cập tới LDAP server ở đây"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Điều khiển Bonobo để hiển thị địa chỉ."
+msgid "Directory Servers"
+msgstr "Server thư mục"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Điều khiển Bonobo mẫu để hiển thị sổ địa chỉ"
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Sửa Sổ địa chỉ"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr "Điều khiển cấu hình cho Kho lưu sổ địa chỉ Evolution."
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Giao diên chọn tên sổ địa chỉ của Evolution."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure access to LDAP directory servers here"
-msgstr "Cấu hình truy cập tới LDAP server ở đây"
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Factory popup địa chỉ của Sổ địa chỉ"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Điều khiển hiển thị Minicard sổ địa chỉ Evolution."
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Bộ xem Minicard sổ địa chỉ evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Directory Servers"
-msgstr "Server thư mục"
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Bộ xem Minicard sổ địa chỉ evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Bộ xem Minicard sổ địa chỉ evolution"
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Thành phần kiểm tra Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Thành phần Evolution xử lý liên lạc."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Factory for the controls exported by the Evolution Addressbook"
-msgstr "Factory Điều khiển được xuất bởi Sổ địa chỉ Evolution"
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Bộ xem Minicard sổ địa chỉ evolution"
 
 #: 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 mail/importers/netscape-importer.c:1863
+#: 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 "Liên lạc"
@@ -584,27 +600,27 @@ msgstr "Liên lạc công cộng"
 msgid "Public folder containing contact information"
 msgstr "Thư mục công cộng chứa thông tin liên lạc"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Liên lạc mới"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_Liên lạc"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Create a new contact"
 msgstr "Tạo liên lạc mới"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Danh sách liên lạc mới"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "_Danh sách liên lạc"
 
-#: addressbook/gui/component/addressbook-component.c:576
+#: addressbook/gui/component/addressbook-component.c:569
 msgid "Create a new contact list"
 msgstr "Tạo danh sách liên lạc mới"
 
@@ -624,27 +640,27 @@ msgstr "Không thể thực hiện truy vấn tại Root DSE"
 msgid "The server responded with no supported search bases"
 msgstr "Server trả lời không hỗ trợ cơ sở tìm kiếm"
 
-#: addressbook/gui/component/addressbook-config.c:1191
+#: addressbook/gui/component/addressbook-config.c:1193
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Server này không hỗ trợ thông tin schema LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1213
+#: addressbook/gui/component/addressbook-config.c:1215
 msgid "Error retrieving schema information"
 msgstr "Lỗi nhận thông tin schema"
 
-#: addressbook/gui/component/addressbook-config.c:1221
+#: addressbook/gui/component/addressbook-config.c:1223
 msgid "Server did not respond with valid schema information"
 msgstr "Server không trả lời bằng schema hợp lệ"
 
-#: addressbook/gui/component/addressbook-config.c:1647
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr "Tên tài khoản"
 
-#: addressbook/gui/component/addressbook-config.c:1649
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr "Tên server"
 
-#: 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 không được bật trong phiên bản Evolution đang dùng"
 
@@ -696,45 +712,44 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Không thể mở sổ địa chỉ"
 
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:617
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr "Truy cập vô danh tới LDAP server"
 
-#: addressbook/gui/component/addressbook.c:660
+#: addressbook/gui/component/addressbook.c:667
 msgid "Failed to authenticate.\n"
 msgstr "Lỗi xác thực.\n"
 
-#: addressbook/gui/component/addressbook.c:668
-#: addressbook/gui/component/addressbook.c:671
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sNhập mật khẩu cho %s (người dùng %s)"
 
-#: addressbook/gui/component/addressbook.c:806
+#: addressbook/gui/component/addressbook.c:813
 msgid "Name begins with"
 msgstr "Tên bắt đầu bằng"
 
-#: addressbook/gui/component/addressbook.c:807
+#: addressbook/gui/component/addressbook.c:814
 msgid "Email begins with"
 msgstr "Thư bắt đầu bằng"
 
-#: addressbook/gui/component/addressbook.c:808
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Phân loại "
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:809
+#: addressbook/gui/component/addressbook.c:816
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Bất kỳ trường nào chứa"
 
-#: addressbook/gui/component/addressbook.c:810
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "Nâng cao..."
 
-#: addressbook/gui/component/addressbook.c:980
+#: 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"
@@ -746,7 +761,7 @@ msgstr ""
 "xác hơn hoặc tăng giới hạn kết quả trong Thông số server thư\n"
 "mục cho sổ địa chỉ này."
 
-#: addressbook/gui/component/addressbook.c:986
+#: 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"
@@ -757,25 +772,25 @@ msgstr ""
 "do bạn cấu hình cho sổ địa chỉ này. Vui lòng tìm kiếm chính xác hơn hoặc\n"
 "tăng giới hạn thời gian trong thông số server thư mục cho sổ địa chỉ này."
 
-#: addressbook/gui/component/addressbook.c:992
+#: addressbook/gui/component/addressbook.c:999
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Backend cho sổ địa chỉ này không thể phân tích truy vấn này."
 
-#: addressbook/gui/component/addressbook.c:995
+#: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Backend cho sổ địa chỉ này không thể thực hiện truy vấn này."
 
-#: addressbook/gui/component/addressbook.c:999
+#: addressbook/gui/component/addressbook.c:1006
 msgid "This query did not complete successfully."
 msgstr "Truy vấn không hoàn tất."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1074
-#: calendar/gui/cal-search-bar.c:352
+#: addressbook/gui/component/addressbook.c:1089
+#: calendar/gui/cal-search-bar.c:354
 msgid "Any Category"
 msgstr "Bất kỳ phân loại nào"
 
-#: addressbook/gui/component/addressbook.c:1154
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr "URI sẽ được Bộ duyệt thư mục hiển thị"
 
@@ -784,47 +799,46 @@ msgstr "URI sẽ được Bộ duyệt thư mục hiển thị"
 #. * 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 "(không)"
 
-#: 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:1793
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr "Email chính"
 
-#: addressbook/gui/component/e-address-popup.c:608
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "Chọn hành động"
 
-#: 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 "Tạo liên lạc mới \"%s\""
 
-#: 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 "Thêm địa chỉ vào liên lạc đã có \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:911
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Đang truy vấn sổ địa chỉ..."
 
-#: 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 "Sửa thông tin liên lạc"
 
-#: 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 "Thêm vào liên lạc"
 
-#: addressbook/gui/component/e-address-popup.c:1068
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "Trộn địa chỉ email"
 
@@ -851,73 +865,56 @@ msgstr "  _Hiện cơ sở được hỗ trợ "
 #: 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"
-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 "<- _Loại bỏ"
-
-#: addressbook/gui/component/ldap-config.glade.h:15
-msgid "<< Fewer Options"
-msgstr "<< Ít tùy chọn hơn"
-
-#: addressbook/gui/component/ldap-config.glade.h:16
-msgid "Add (or Edit) Attribute Mappings"
-msgstr "Thêm (hoặc Sửa) ánh xạ thuộc tính"
+#: 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 "Nguồn sổ địa chỉ"
 
-#: 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 "Luôn luôn"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Anonymously"
 msgstr "Vô danh"
 
-#: 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"
@@ -930,58 +927,55 @@ msgstr ""
 "\n"
 "Vui lòng nhấn nút \"Hoàn tất\" để lưu thiết lập bạn đã nhập ở đây."
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
 msgstr "Đang kết nối"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
-msgid "DN Customization"
-msgstr "Tùy biến DN"
-
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "_Xóa"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "Tên _phân biệt:"
 
-#: 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 "Địa chỉ _email:"
 
-#: 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 sẽ dùng DN này để xác thực bạn với server"
 
-#: 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 dùng địa chỉ email này để xác thực bạn với server"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Finished"
 msgstr "Hoàn tất"
 
-#: 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 "Chung"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "LDAP Configuration Assistant"
 msgstr "Phụ tá cấu hình LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "Mappings"
-msgstr "Ánh xạ"
-
-#: 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 "Không bao giờ"
 
-#: 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"
@@ -995,54 +989,26 @@ msgstr ""
 "server dùng để mã hóa để bảo vệ kết nối của bạn. Hãy hỏi quản trị hệ thống\n"
 "xem LDAP server của bạn có dùng những giao thức này hay không."
 
-#: 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 "Objectclass được Evolution dùng:"
-
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid "Objectclasses Used on Server:"
-msgstr "Objectclass được server dùng:"
-
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Một"
 
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"Please select an Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-"Vui lòng chọn thuộc tính Evolution và thuộc\n"
-"tính LDAP liên kết với nó."
-
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid "R_estore Defaults"
-msgstr "Phục hồi _mặc định"
-
-#: addressbook/gui/component/ldap-config.glade.h:46
-msgid "Re_store Defaults"
-msgstr "_Phục hồi mặc định"
-
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "_Phạm vị tìm: "
 
 #. 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 "Đang tìm"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Đã chọn:"
 
-#: 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"
@@ -1051,7 +1017,7 @@ msgstr ""
 "Chọn tùy chọn này nghĩa là Evolution sẽ chỉ kết nối tới LDAP server của\n"
 "bạn nếu LDAP server của bạn hỗ trợ SSL hoặc 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"
@@ -1066,7 +1032,7 @@ msgstr ""
 "sau tường lửa đang hoạt động, thì Evolution sẽ không cần dùng SSL/TLS vì\n"
 "kết nối đã đủ an toàn rồi."
 
-#: 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"
@@ -1077,7 +1043,7 @@ msgstr ""
 "Chọn tùy chọn này nghĩa là server của bạn không hỗ trợ cả SSL lẫn TLS. Điều\n"
 "này nghĩa là kết nối của bạn không an toàn, không bảo mật."
 
-#: 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"
@@ -1086,37 +1052,37 @@ msgstr ""
 "Chọn tùy chọn này sẽ cho phép bạn thay đổi thiết lập mặc định của Evolution\n"
 "cho tìm kiếm LDAP, cũng như tạo và sửa các liên lạc."
 
-#: 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 "Xác định tên hiển thị là bước cuối cùng để cấu hình LDAP server."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 1: Server Information"
 msgstr "Bước 1: Thông tin server"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Step 2: Connecting to Server"
 msgstr "Bước 2: Kết nối tới server"
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 3: Searching the Directory"
 msgstr "Bước 3: Tìm thư mục"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 4: Display Name"
 msgstr "Bước 4: Tên hiển thị"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr "Con"
 
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Supported Search Bases"
 msgstr "Cơ sở tìm được hỗ trợ"
 
-#: 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"
@@ -1128,7 +1094,7 @@ msgstr ""
 "tin đăng nhập của bạn. Vui lòng hỏi quản trị hệ thống của bạn nếu bạn không\n"
 "chắc về những thông tin này."
 
-#: 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"
@@ -1140,7 +1106,7 @@ msgstr ""
 "kiếm, và một lần tìm kiếm mất bao lâu. Hãy hỏi quản trị hệ thống của bạn\n"
 "nếu bạn cần thay đổi những tùy chọn này."
 
-#: 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"
@@ -1150,7 +1116,7 @@ msgstr ""
 "Cơ sở tìm là tên phân biệt (DN) của mục, chỗ bắt đầu tìm kiếm. Nếu bạn bỏ\n"
 "trống chỗ này, tìm kiếm sẽ được bắt đầu từ gốc cây thư mục."
 
-#: 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"
@@ -1159,11 +1125,13 @@ msgid ""
 "A search scope of \"one\" will only include the entries one level beneath "
 "your base.\n"
 msgstr ""
-"Phạm vi tìm cho biết mức tìm kiếm trong cây thư mục. Phạm vi tìm kiếm \"con\" sẽ\n"
-"bao gồm mọi mục dưới cơ sở tìm. Phạm vi tìm kiếm \"một\" sẽ chỉ tìm những mục\n"
+"Phạm vi tìm cho biết mức tìm kiếm trong cây thư mục. Phạm vi tìm kiếm \"con"
+"\" sẽ\n"
+"bao gồm mọi mục dưới cơ sở tìm. Phạm vi tìm kiếm \"một\" sẽ chỉ tìm những "
+"mục\n"
 "nằm trong cơ sở tìm.\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"
@@ -1179,20 +1147,20 @@ msgstr ""
 "đó. Vui lòng liên hệ quản trị hệ thống nếu bạn cần tìm những\n"
 "thông tin này."
 
-#: 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 "Đây là tên đầy đủ của LDAP server. Ví dụ, \"ldap.mycompany.com\"."
 
-#: 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 "Đây là số mục tải về tối đa. Dùng số quá lớn sẽ làm chậm sổ địa chỉ."
 
-#: 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 "
@@ -1201,7 +1169,7 @@ msgstr ""
 "Đây là cách Evolution dùng để xác thực bạn. Chú ý rằng đặt cái này là\n"
 "\"Địa chỉ thư\" yêu cầu truy cập vô danh tới 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"
@@ -1211,7 +1179,7 @@ msgstr ""
 "Evolution.\n"
 "Chỉ được dùng với mục đích hiển thị thôi."
 
-#: 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"
@@ -1222,86 +1190,45 @@ msgstr ""
 "các cổng chuẩn sẽ được cung cấp. Hãy hỏi quản trị hệ thống của bạn để biết\n"
 "dùng cổng nào."
 
-#: 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 "Tùy chọn này điểu khiển tìm kiếm sẽ chạy trong bao lâu."
 
-#: 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 ""
-"Để thêm thuộc tính vào DN, hãy chọn nó từ danh sách và nhấn nút \n"
-"\"Thêm thuộc tính\". Bất kỳ giá trị nào bạn thêm vào DN sẽ trở thành giá "
-"trị\n"
-"được yêu cầu cho các liên lạc mới mà bạn thêm vào thư mục trên LDAP server."
-
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr "_Dùng SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr "Dùng tên phân biệt (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using email address"
 msgstr "Dùng địa chỉ email"
 
-#: 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 "Bất cứ khi nào có thể"
 
-#: 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 "_Thêm"
 
-#: addressbook/gui/component/ldap-config.glade.h:103
-msgid "_Add ->"
-msgstr "_Thêm ->"
-
-#: addressbook/gui/component/ldap-config.glade.h:104
-msgid "_Add Mapping"
-msgstr "_Thêm ánh xạ"
-
-#: addressbook/gui/component/ldap-config.glade.h:105
-msgid "_Add to DN"
-msgstr "_Thêm vào DN"
-
-#: addressbook/gui/component/ldap-config.glade.h:106
-msgid "_Always"
-msgstr "_Luôn luôn"
-
-#: addressbook/gui/component/ldap-config.glade.h:107
-msgid "_Delete Mapping"
-msgstr "_Xóa ánh xạ"
-
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Display name:"
 msgstr "Tên _hiển thị:"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-msgid "_Distinguished Name (DN):"
-msgstr "Tên _phân biệt (DN):"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-msgid "_Don't use SSL/TLS"
-msgstr "_Không dùng SSL/TLS"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr "_Ngưỡng tải về:"
 
-#: 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
@@ -1310,145 +1237,88 @@ msgstr "_Ngưỡng tải về:"
 msgid "_Edit"
 msgstr "_Sửa"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
-msgid "_Edit Mapping"
-msgstr "_Sửa ánh xạ"
-
-#: addressbook/gui/component/ldap-config.glade.h:114
-msgid "_Evolution attribute:"
-msgstr "Thuộc tính _Evolution:"
-
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_If necessary "
-msgstr "_Nếu cần thiết "
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_LDAP attribute:"
-msgstr "Thuộc tính _LDAP:"
-
-#: addressbook/gui/component/ldap-config.glade.h:117
-msgid "_LDAP attributes:"
-msgstr "Thuộc tính _LDAP:"
-
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr "Cách đăng _nhập:"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
-msgid "_More Options >>"
-msgstr "_Nhiều tùy chọn hơn >>"
-
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Port number:"
 msgstr "_Số hiệu cổng:"
 
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_Restore Defaults"
-msgstr "Phục hồi _mặc định"
-
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Search base:"
 msgstr "_Cơ sở tìm:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "Tên Ser_ver:"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Timeout (minutes):"
 msgstr "Thời _hạn (phút):"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
-msgid "account-druid"
-msgstr "account-druid"
-
-#: addressbook/gui/component/ldap-config.glade.h:126
-msgid "account-editor"
-msgstr "account-editor"
-
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "cards"
 msgstr "card"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
-msgid "dn-customization-tab"
-msgstr "dn-customization-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:130
-msgid "edit_server_window_simple"
-msgstr "edit_server_window_simple"
-
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
-msgid "mappings-tab"
-msgstr "mappings-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:133
-msgid "objectclasses-tab"
-msgstr "objectclasses-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:98
 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 "Giao diên chọn tên sổ địa chỉ của Evolution."
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Factory cho giao diện chọn tên sổ địa chỉ"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Loại bỏ tất cả"
 
 #. 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 "Loại bỏ"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:177
-msgid "Remove All"
-msgstr "Loại bỏ tất cả"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+msgstr "Danh sách liên lạc mới"
 
-#: 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 "Sửa thông tin liên lạc"
+
+#: 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 "Gửi thư HTML"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:399
-msgid "Edit Contact List"
-msgstr "Sửa danh sách liên lạc"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:417
-msgid "Unnamed Contact List"
-msgstr "Danh sách liên lạc vô danh"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:434
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d không hiện)"
-
-#: 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 "Liên lạc vô danh"
 
-#: 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 "Nguồn"
 
-#: 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 "Chọn liên lạc từ sổ địa chỉ"
 
-#: 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 "Tìm liên lạc trong"
 
@@ -1501,7 +1371,7 @@ msgid "Birthda_y:"
 msgstr "Ngày _sinh:"
 
 #: 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 "_Phân loại.."
@@ -1512,7 +1382,7 @@ msgstr "Hợp tác"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1343
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr "Bộ hiệu chỉnh liên lạc"
 
@@ -1521,7 +1391,7 @@ msgid "D_epartment:"
 msgstr "Cơ _quan:"
 
 #: 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 "Chi tiết"
 
@@ -1575,14 +1445,14 @@ msgid "Wants to receive _HTML mail"
 msgstr "Muốn nhậm _HTML mail"
 
 #: 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 "_Xóa"
 
@@ -1612,14 +1482,14 @@ msgstr "Địa chỉ _Web:"
 
 #: 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:187
+#: 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: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 "Có thể sửa"
 
@@ -2644,64 +2514,64 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:159
+#: 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:104
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:459
 msgid "Book"
 msgstr "Sách"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:166
+#: 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 "Card"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:173
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
 msgid "Is New Card"
 msgstr "Là card mới"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
 msgid "Writable Fields"
 msgstr "Trường có thể ghi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
 msgid "Changed"
 msgstr "Đã thay đổi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:836
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr "Bộ biên soạn phân loại không tồn tại."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:844
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "This contact belongs to these categories:"
 msgstr "Liên lạc này thuộc các phân loại này:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1018
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr "Lưu liên lạc bằng VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1064
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr "Bạn có chắc muốn xoá những liên lạc này không?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1067
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr "Bạn có chắc muốn xoá liên lạc này?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1767
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2371
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Không thể tìm thấy widget cho trường: `%s'"
@@ -2845,28 +2715,28 @@ msgstr "_Hậu tố:"
 msgid "_Title:"
 msgstr "_Tựa đề"
 
-#: 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 "Tên _danh sách:"
 
-#: 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 "Thành viên"
 
-#: 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 "Nhập địa chỉ thư hoặc kéo liên lạc vào danh sách dưới đây:"
 
-#: 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 "Ẩ_n địa chỉ này khi gửi mail tới danh sách"
 
-#: 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 "_Loại bỏ"
 
-#: 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 "contact-list-editor"
 
@@ -2932,8 +2802,9 @@ msgstr ""
 "Tên hoặc email đã thay đổi của liên lạc này đã có rồi.\n"
 "Bạn có muốn thêm nữa không?"
 
+#. 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 "Tìm kiếm nâng cao"
 
@@ -2953,7 +2824,7 @@ msgstr "%d card"
 #: 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 "Truy vấn"
@@ -2966,109 +2837,110 @@ msgstr "Lỗi dùng book view"
 msgid "Model"
 msgstr "Kiểu"
 
-#: 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 "Lỗi khi sửa đổi card"
 
-#: 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 "Thành công"
 
-#: 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: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 "Lỗi lại"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Kho ngoại tuyến"
 
-#: 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 "Không đủ quyền truy cập"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Không có card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Card ID đã tồn tại"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Chưa hỗ trợ giao thức này"
 
-#: 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:2313
+#: 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:512
+#: 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 "Bị hủy bỏ"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr "Xác thực thất bại"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr "Yêu cầu xác thực"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr "Không có TLS"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr "Sổ địa chỉ không tồn tại"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Lỗi khác"
 
-#: 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 "Bạn có muốn lưu các thay đổi không?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:77
 msgid "_Discard"
 msgstr "_Hủy"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Lỗi khi thêm danh sách"
 
-#: 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 "Lỗi khi thêm card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:104
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Lỗi khi sửa đổi danh sách"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:114
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Lỗi khi loại bỏ danh sách"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:114
-#: addressbook/gui/widgets/e-addressbook-util.c:229
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Lỗi khi loại bỏ card"
 
-#: 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"
@@ -3077,39 +2949,47 @@ msgstr ""
 "Việc mở %d card sẽ mở %d cửa sổ mới cùng lúc.\n"
 "Bạn có thật sự muốn hiển thị mọi tấm card này không?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:327
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr "Chuyển Card tới"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Chép Card tới"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:332
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Chuyển các Card tới"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Chép các Card tới"
 
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "Nhiều VCard"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard cho %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 "Kiểu"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-#: mail/importers/pine-importer.c:591
+#: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Sổ địa chỉ"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:674
 #: addressbook/gui/widgets/e-addressbook-view.c:884
-#: addressbook/gui/widgets/e-addressbook-view.c:1864
+#: addressbook/gui/widgets/e-addressbook-view.c:1859
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Lưu là VCard"
@@ -3151,7 +3031,7 @@ msgstr "Chuyển tiếp liên lạc"
 msgid "Send Message to Contact"
 msgstr "Gửi thông điệp cho liên lạc"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887 calendar/gui/print.c:2448
+#: 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
@@ -3186,15 +3066,15 @@ msgstr "Sao chép"
 msgid "Paste"
 msgstr "Dán"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:10
-#: mail/mail-accounts.c:225 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 "Xoá"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:904
-#: calendar/gui/e-day-view.c:3674 calendar/gui/e-week-view.c:3504
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
 msgid "Current View"
 msgstr "Khung xem hiện thời"
 
@@ -3214,7 +3094,7 @@ 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"
 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:1344
+#: addressbook/gui/widgets/e-addressbook-view.c:1339
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3298,38 +3178,38 @@ msgstr "và một card khác."
 msgid "Save in addressbook"
 msgstr "Lưu vào sổ địa chỉ"
 
-#: 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 "Rộng"
 
-#: 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 "Cao"
 
-#: 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 "Nhận focus"
 
-#: addressbook/gui/widgets/e-minicard-label.c:123
+#: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Trường"
 
-#: addressbook/gui/widgets/e-minicard-label.c:130
+#: addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Tên trường"
 
-#: addressbook/gui/widgets/e-minicard-label.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Kiểu chữ"
 
-#: addressbook/gui/widgets/e-minicard-label.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Độ dài tên trường tối đa"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:125
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
 msgstr "Độ rộng cột"
 
@@ -3361,11 +3241,11 @@ msgstr ""
 msgid "Adapter"
 msgstr "Bộ tiếp hợp"
 
-#: addressbook/gui/widgets/e-minicard.c:165
+#: addressbook/gui/widgets/e-minicard.c:169
 msgid "Selected"
 msgstr "Đã chọn"
 
-#: addressbook/gui/widgets/e-minicard.c:172
+#: addressbook/gui/widgets/e-minicard.c:176
 msgid "Has Cursor"
 msgstr "Có con trỏ"
 
@@ -3479,7 +3359,7 @@ msgstr "Biên"
 msgid "Number of columns:"
 msgstr "Số cột:"
 
-#: 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 "Tùy chọn"
 
@@ -3560,225 +3440,229 @@ msgstr "Rộng:"
 msgid "_Font..."
 msgstr "_Font..."
 
-#: calendar/cal-util/cal-component.c:1216
+#: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Cuộc hẹn không tên"
 
-#: calendar/cal-util/cal-recur.c:3983 calendar/gui/print.c:472
+#: 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:472
+#: 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:472
+#: 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:472
+#: 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:472
+#: 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:473
+#: 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:473
+#: 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:473
+#: 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:473
+#: 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:473
+#: 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:474
+#: 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:474
+#: 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:474
+#: 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:474
+#: 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:474
+#: 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:475
+#: 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:475
+#: 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:475
+#: 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:475
+#: 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:475
+#: 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:476
+#: 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:476
+#: 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:476
+#: 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:476
+#: 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:476
+#: 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:477
+#: 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:477
+#: 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:477
+#: 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:477
+#: 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:477
+#: 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:478
+#: 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 "Cao"
 
-#: 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 "Bình thường"
 
-#: 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 "Thấp"
 
 #. 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 "Chưa biết"
 
-#: calendar/conduits/calendar/calendar-conduit.c:204
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr "Tácg sự kiện nhiều ngày:"
 
-#: 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 "Lỗi khi liên lạc với server lịch"
 
-#: 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 "Không thể đọc khối ứng dụng lịch của pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:204
+#: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
 msgstr "Độ ưu tiên mặc định:"
 
-#: 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 "Không thể đọc khối ứng dụng ToDo của pilot"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "Điều khiển Bonobo để hiển thị danh sách công việc."
+msgid "Calendar and Tasks"
+msgstr "Công việc và Lịch"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Điều khiển Bonobo mẫu để hiển thị danh sách công việc."
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Cấu hình múi giờ, lịch và danh sách công việc ở đây "
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
 msgstr "Công việc và Lịch"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Điều khiển cấu hình cho Lịch Evolution."
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Thành phần hiển thị thư mục của Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Cấu hình múi giờ, lịch và danh sách công việc ở đây "
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
 msgstr "Bộ xem lịch iTip/iMip Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Thành phần Evolution xử lý lịch."
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Bộ xem lịch iTip/iMip Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Factory for the Evolution Calendar objects"
-msgstr "Factory Đối tượng Lịc Evolution"
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Bộ soạn tin Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Factory tập trung hóa hộp thoại soạn thảo thành phần lịch"
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Bộ soạn tin Evolution"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Alarm notification service"
-msgstr "Dịch vụ báo động"
-
-#: 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 "Factory Dịch vụ báo động"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
@@ -3819,17 +3703,17 @@ msgstr "Thời gian ngủ (phút)"
 msgid "_Edit appointment"
 msgstr "_Sửa cuộc hẹn"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "Không có mô tả."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:742
-#: calendar/gui/alarm-notify/alarm-queue.c:766
-#: calendar/gui/tasks-control.c:457 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 "Cảnh báo"
 
-#: 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"
@@ -3841,7 +3725,7 @@ msgstr ""
 "gửi thư. Thay vào đó, Evolution sẽ hiển thị một\n"
 "hộp thoại nhắc nhở thông thường:"
 
-#: 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 "
@@ -3858,7 +3742,7 @@ msgstr ""
 "\n"
 "Bạn có chắc muốn chạy chương trình này không?"
 
-#: 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 "Đừng hỏi tôi về chương trình này lần nữa."
 
@@ -3882,7 +3766,7 @@ msgstr "Mô tả chứa"
 msgid "Comment contains"
 msgstr "Ghi chú chứa"
 
-#: 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 "Không khớp"
 
@@ -3892,8 +3776,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"
 
@@ -3911,7 +3795,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:1507
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3921,155 +3805,155 @@ msgid ""
 msgstr ""
 "Không thể tạo khung xem lịch. Vui lòng kiểm tra thiết lập ORBit và OAF."
 
-#: calendar/gui/calendar-component.c:71 calendar/gui/gnome-cal.c:1341
-#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1862
+#: 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 "Lịch"
 
-#: calendar/gui/calendar-component.c:72
+#: calendar/gui/calendar-component.c:71
 msgid "Folder containing appointments and events"
 msgstr "Thư mục chứa các cuộc hẹn và sự kiện"
 
-#: calendar/gui/calendar-component.c:76
+#: calendar/gui/calendar-component.c:75
 msgid "Public Calendar"
 msgstr "Lịch công cộng"
 
-#: calendar/gui/calendar-component.c:77
+#: calendar/gui/calendar-component.c:76
 msgid "Public folder containing appointments and events"
 msgstr "Thư mục công cộng chứa các cuộc hẹn và sự kiện"
 
-#: calendar/gui/calendar-component.c:81 calendar/gui/e-tasks.c:735
-#: calendar/gui/print.c:1793 calendar/gui/tasks-control.c:511
-#: calendar/importers/icalendar-importer.c:705
-#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1864
-#: my-evolution/e-summary-tasks.c:326 my-evolution/e-summary-tasks.c:344
+#: 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 "Công việc"
 
-#: calendar/gui/calendar-component.c:82
+#: calendar/gui/calendar-component.c:81
 msgid "Folder containing to-do items"
 msgstr "Thư mục chứa các mục to-do"
 
-#: calendar/gui/calendar-component.c:86
+#: calendar/gui/calendar-component.c:85
 msgid "Public Tasks"
 msgstr "Công việc công cộng"
 
-#: calendar/gui/calendar-component.c:87
+#: calendar/gui/calendar-component.c:86
 msgid "Public folder containing to-do items"
 msgstr "Thư mục công cộng chứa các mục to-do"
 
-#: calendar/gui/calendar-component.c:739
+#: calendar/gui/calendar-component.c:730
 msgid "New appointment"
 msgstr "Cuộc hẹn mới"
 
-#: calendar/gui/calendar-component.c:739
+#: calendar/gui/calendar-component.c:730
 msgid "_Appointment"
 msgstr "_Cuộc hẹn"
 
-#: calendar/gui/calendar-component.c:740
+#: calendar/gui/calendar-component.c:731
 msgid "Create a new appointment"
 msgstr "Tạo cuộc hẹn mới"
 
-#: calendar/gui/calendar-component.c:744
+#: calendar/gui/calendar-component.c:735
 msgid "New meeting"
 msgstr "Cuộc họp mới"
 
-#: calendar/gui/calendar-component.c:744
+#: calendar/gui/calendar-component.c:735
 msgid "_Meeting"
 msgstr "_Cuộc họp"
 
-#: calendar/gui/calendar-component.c:745
+#: calendar/gui/calendar-component.c:736
 msgid "Create a new meeting request"
 msgstr "Tạo yêu cầu cuộc họp mới"
 
-#: calendar/gui/calendar-component.c:749
+#: calendar/gui/calendar-component.c:740
 msgid "New task"
 msgstr "Công việc mới"
 
-#: calendar/gui/calendar-component.c:749
+#: calendar/gui/calendar-component.c:740
 msgid "_Task"
 msgstr "Nhiệm _vụ"
 
-#: calendar/gui/calendar-component.c:750
+#: calendar/gui/calendar-component.c:741
 msgid "Create a new task"
 msgstr "Tạo công việc mới"
 
-#: calendar/gui/calendar-component.c:754
+#: calendar/gui/calendar-component.c:745
 msgid "New All Day Appointment"
 msgstr "Cuộc hẹn nguyên ngày mới"
 
-#: calendar/gui/calendar-component.c:754
+#: calendar/gui/calendar-component.c:745
 msgid "All _Day Appointment"
 msgstr "Cuộc hẹn n_guyên ngày"
 
-#: calendar/gui/calendar-component.c:755
+#: calendar/gui/calendar-component.c:746
 msgid "Create a new all-day appointment"
 msgstr "Tạo cuộc hẹn nguyên ngày mới"
 
-#: 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 "Riêng tư"
 
-#: 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 "Tin tưởng"
 
-#: 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 "Công cộng"
 
-#: calendar/gui/calendar-model.c:524
+#: calendar/gui/calendar-model.c:522
 msgid "N"
 msgstr "B"
 
-#: calendar/gui/calendar-model.c:524
+#: calendar/gui/calendar-model.c:522
 msgid "S"
 msgstr "N"
 
-#: 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 "T"
 
-#: 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 "Rảnh"
 
-#: calendar/gui/calendar-model.c:593 calendar/gui/e-calendar-table.c:446
-#: calendar/gui/e-meeting-time-sel.c:408
-#: 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 "Bận"
 
-#: 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:2304
+#: 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 "Chưa bắt đầu"
 
-#: 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:2307
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr "Đang làm"
 
-#: 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:2310
+#: 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 "Hoàn thành"
 
-#: calendar/gui/calendar-model.c:1037
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4080,32 +3964,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:1979
-#: mail/folder-browser.c:1730 mail/mail-account-gui.c:1246
-#: mail/mail-account-gui.c:1672 mail/mail-accounts.c:392
-#: 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 "Không"
 
-#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "Đệ quy"
 
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "Đã gán"
 
-#: 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 "Có"
 
-#: 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 "Không"
@@ -4126,15 +4010,15 @@ msgstr "Khung tuần"
 msgid "Month View"
 msgstr "Khung tháng"
 
-#: calendar/gui/comp-editor-factory.c:457
+#: calendar/gui/comp-editor-factory.c:456
 msgid "Error while opening the calendar"
 msgstr "Lỗi mở server lịch"
 
-#: calendar/gui/comp-editor-factory.c:468
+#: calendar/gui/comp-editor-factory.c:467
 msgid "Method not supported when opening the calendar"
 msgstr "Phương thức mở lịch không được hỗ trợ"
 
-#: calendar/gui/comp-editor-factory.c:474
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Permission denied to open the calendar"
 msgstr "Không đủ quyền truy cập để mở lịch"
 
@@ -4143,191 +4027,90 @@ msgstr "Không đủ quyền truy cập để mở lịch"
 msgid "Could not open the folder in '%s'"
 msgstr "Không thể mở thư mục trong '%s'"
 
-#: calendar/gui/control-factory.c:163
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "URI mà lịch sẽ hiển thị"
 
-#: calendar/gui/control-factory.c:170
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr "Loại khung xem cần hiển thị"
 
-#: calendar/gui/dialogs/alarm-options.c:358
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Tùy chọn báo động âm thanh"
 
-#: calendar/gui/dialogs/alarm-options.c:367
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Tùy chọn báo động thông điệp"
 
-#: calendar/gui/dialogs/alarm-options.c:376
-msgid "Mail Alarm Options"
+#: calendar/gui/dialogs/alarm-options.c:438
+#, fuzzy
+msgid "Email Alarm Options"
 msgstr "Tùy chọn báo động thư"
 
-#: calendar/gui/dialogs/alarm-options.c:385
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Tùy chọn báo động chương trình"
 
-#: calendar/gui/dialogs/alarm-options.c:394
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Tùy chọn báo động lạ"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Alarm Repeat"
 msgstr "Lặp báo động"
 
-#: 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 chưa hỗ trợ thông báo qua email để nhắc nhở. Bạn sẽ không thể sửa tùy chọn cho bộ nhắc nhở này."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Thông điệp hiển thị"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "Thân thông điệp"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "Phát âm thanh:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "Lặp báo động"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "Chạy chương trình:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "Gửi"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr "Với tham số này:"
 
-#: 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 "ngày"
 
-#: 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 "giờ"
 
-#: 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 "phút"
 
-#: calendar/gui/dialogs/alarm-page.c:313 calendar/gui/e-alarm-list.c:393
-#, c-format
-msgid "%d days"
-msgstr "%d ngày"
-
-#: calendar/gui/dialogs/alarm-page.c:316 calendar/gui/e-alarm-list.c:396
-msgid "1 day"
-msgstr "1 ngày"
-
-#: calendar/gui/dialogs/alarm-page.c:321 calendar/gui/e-alarm-list.c:401
-#, c-format
-msgid "%d weeks"
-msgstr "%d tuần"
-
-#: calendar/gui/dialogs/alarm-page.c:324 calendar/gui/e-alarm-list.c:404
-msgid "1 week"
-msgstr "1 tuần"
-
-#: calendar/gui/dialogs/alarm-page.c:329 calendar/gui/e-alarm-list.c:409
-#, c-format
-msgid "%d hours"
-msgstr "%d giờ"
-
-#: calendar/gui/dialogs/alarm-page.c:332 calendar/gui/e-alarm-list.c:412
-msgid "1 hour"
-msgstr "1 giờ"
-
-#: calendar/gui/dialogs/alarm-page.c:337 calendar/gui/e-alarm-list.c:417
-#, c-format
-msgid "%d minutes"
-msgstr "%d phút"
-
-#: calendar/gui/dialogs/alarm-page.c:340 calendar/gui/e-alarm-list.c:420
-msgid "1 minute"
-msgstr "1 phút"
-
-#: calendar/gui/dialogs/alarm-page.c:345 calendar/gui/e-alarm-list.c:425
-#, c-format
-msgid "%d seconds"
-msgstr "%d giây"
-
-#: calendar/gui/dialogs/alarm-page.c:348 calendar/gui/e-alarm-list.c:428
-msgid "1 second"
-msgstr "1 giây"
-
-#: 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 "Phát âm thanh"
-
-#: 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 "Hiện thông điệp"
-
-#: calendar/gui/dialogs/alarm-page.c:385 calendar/gui/e-alarm-list.c:465
-msgid "Send an email"
-msgstr "Gửi thư"
-
-#: 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 "Chạy chương trình"
-
-#: calendar/gui/dialogs/alarm-page.c:395 calendar/gui/e-alarm-list.c:475
-msgid "Unknown action to be performed"
-msgstr "Hành động khác cần thực hiện"
-
-#: 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 "%s %s trước khi bắt đầu cuộc hẹn"
-
-#: 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 "%s %s sau khi bắt đầu cuộc hẹn"
-
-#: 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 "%s ngay khi bắt đầu cuộc hẹn"
-
-#: 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 "%s %s trước khi kết thúc cuộc hẹn"
-
-#: 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 "%s %s sau khi kết thức cuộc hẹn"
-
-#: 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 "%s ngay khi kết thúc cuộc hẹn"
-
-#: calendar/gui/dialogs/alarm-page.c:456 calendar/gui/e-alarm-list.c:536
-#, c-format
-msgid "%s at %s"
-msgstr "%s tại %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 "%s cho loại trigger lạ"
-
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -4338,46 +4121,63 @@ msgstr "Cơ bản"
 msgid "Date/Time:"
 msgstr "Ngày/Giờ:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "Hiện thông điệp"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "Phát âm thanh"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Bộ nhắc nhở"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "Chạy chương trình"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "Gửi thư"
+
+#: 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 "Tóm tắt:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_Tùy chọn..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "sau khi"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "trước khi"
 
-#: 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 "ngày"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "kết thúc cuộc hẹn"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "giờ"
 
-#: 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 "phút"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "bắt đầu cuộc hẹn"
 
@@ -4426,8 +4226,8 @@ msgid "Days"
 msgstr "Ngày"
 
 #: 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 "Thứ Sáu"
 
@@ -4440,8 +4240,8 @@ msgid "Minutes"
 msgstr "Phút"
 
 #: 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 "Thứ Hai"
 
@@ -4450,8 +4250,8 @@ msgid "S_un"
 msgstr "_CN"
 
 #: 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 "Thứ Bảy"
 
@@ -4464,8 +4264,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Hiện số tuần trong bộ duyệt ngày"
 
 #: 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 "Chủ nhật"
 
@@ -4482,8 +4282,8 @@ msgid "Task List"
 msgstr "Danh sách công việc"
 
 #: 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 "Thứ Năm"
 
@@ -4500,8 +4300,8 @@ msgid "Time format:"
 msgstr "Dạng thức thời gian:"
 
 #: 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 "Thứ Ba"
 
@@ -4510,8 +4310,8 @@ msgid "W_eek starts:"
 msgstr "Tuần _bắt đầu:"
 
 #: 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 "Thứ Tư"
 
@@ -4593,7 +4393,7 @@ msgstr "_Tư"
 msgid "before every appointment"
 msgstr "trước khi mỗi cuộc hẹn"
 
-#: 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?"
@@ -4601,11 +4401,11 @@ msgstr ""
 "Sự kiện này sẽ bị xóa khỏi cuộc họp, bạn có muốn gửi thông báo hủy sự kiện "
 "này không?"
 
-#: 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 "Bạn có chắc muốn hủy bỏ và xoá cuộc họp này?"
 
-#: 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?"
@@ -4613,17 +4413,17 @@ msgstr ""
 "Công việc sẽ bị xóa này đã được phân công, bạn có muốn gửi thông báo hủy "
 "công việc này không?"
 
-#: 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 "Bạn có chắc muốn hủy bỏ và xóa công việc này?"
 
-#: 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 "Bạn có chắc muốn hủy bỏ và xóa mục nhật ký này?"
 
@@ -4680,80 +4480,80 @@ msgstr "%s  Bạn chưa thay đổi gì, cập nhật bộ biên soạn?"
 msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2220
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr " tới "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2224
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2230
 msgid " (Completed "
 msgstr " (Đã hoàn thành "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2226
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2232
 msgid "Completed "
 msgstr "Đã hoàn thành "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2231
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2237
 msgid " (Due "
 msgstr " (Đến hạn "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2233
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2239
 msgid "Due "
 msgstr "Đến hạn "
 
-#: calendar/gui/dialogs/comp-editor.c:322
+#: calendar/gui/dialogs/comp-editor.c:328
 msgid "Could not update invalid object"
 msgstr "Không thể cập nhật đối tượng không hợp lệ"
 
-#: calendar/gui/dialogs/comp-editor.c:325
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr "Không tìm thấy đối tượng, không thể cập nhật"
 
-#: 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 "Bạn không có đủ quyền để cập nhật đối tượng này"
 
-#: calendar/gui/dialogs/comp-editor.c:331
+#: calendar/gui/dialogs/comp-editor.c:337
 msgid "Could not update object"
 msgstr "Không thể cập nhật đối tượng"
 
-#: calendar/gui/dialogs/comp-editor.c:777
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Sửa cuộc hẹn"
 
-#: calendar/gui/dialogs/comp-editor.c:782
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cuộc hẹn - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:785
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "Công việc - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:788
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Mục nhật ký - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:799
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "Không có tóm tắt"
 
-#: 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:1156
+#: 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 "Lưu là..."
 
-#: 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 ""
 "Thay đổi trên mục này có thể bị hủy nếu bản cập nhật đến qua đường email"
 
-#: calendar/gui/dialogs/comp-editor.c:1382
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr "Không thể lấy phiên bản hiện thời!"
 
@@ -4811,103 +4611,98 @@ msgstr "Ủy nhiệm cho:"
 msgid "Enter Delegate"
 msgstr "Nhập người đại diện"
 
-#: calendar/gui/dialogs/event-editor.c:197 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2265
 msgid "Appointment"
 msgstr "Cuộc hẹn"
 
-#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Bộ nhắc nhở"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Đệ quy"
 
-#: 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 "Lập lịch biểu"
 
-#: 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 "Cuộc họp"
 
-#: 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 "Ngày bắt đầu sai"
 
-#: calendar/gui/dialogs/event-page.c:654
+#: calendar/gui/dialogs/event-page.c:610
 msgid "End date is wrong"
 msgstr "Ngày kết thúc sai"
 
-#: calendar/gui/dialogs/event-page.c:677
+#: calendar/gui/dialogs/event-page.c:633
 msgid "Start time is wrong"
 msgstr "Thời điểm đầu sai"
 
-#: calendar/gui/dialogs/event-page.c:684
+#: calendar/gui/dialogs/event-page.c:640
 msgid "End time is wrong"
 msgstr "Thời điểm kết thúc sai"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
 msgstr "Sự kiện _mọi ngày"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "_Bận"
 
-#: 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 "Phân loại"
 
-#: 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 "Tin tưởn_g"
 
-#: 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 "Ngày & giờ"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "_Rảnh"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr "Đị_a điể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 "_Riêng tư"
 
-#: 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 "_Công cộng"
 
-#: 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 "Hiện thời gian là"
 
-#: 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 "Tó_m tắt:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "_Liên lạc..."
-
 #: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "Thời điểm _cuối:"
@@ -4916,19 +4711,23 @@ msgstr "Thời điểm _cuối:"
 msgid "_Start time:"
 msgstr "Thời điểm đầ_u:"
 
-#: 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 "Cần một tổ chức."
 
-#: calendar/gui/dialogs/meeting-page.c:415
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr "Cần ít nhất một người tham dự."
 
-#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr "Người này đã có tên trong cuộc họp rồi!"
 
-#: calendar/gui/dialogs/meeting-page.c:643
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr "Ủ_y nhiệm cho..."
 
@@ -4968,14 +4767,14 @@ msgid "Member"
 msgstr "Thành viên"
 
 #: 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 "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 "Trạng thái"
@@ -4990,55 +4789,82 @@ msgid "_Change Organizer"
 msgstr "Đổ_i tổ chức"
 
 #: 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 "_Mời người khác..."
 
-#: 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 "Đảo Wallis và 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 "Cuộc hẹn chứa đệ quy mà Evolution không thể hiệu chỉnh."
 
-#: 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 "lúc"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:977
 msgid "first"
 msgstr "đầu tiên"
 
-#: calendar/gui/dialogs/recurrence-page.c:991 filter/filter-datespec.c:65
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "second"
 msgstr "thứ hai"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "third"
 msgstr "thứ ba"
 
-#: calendar/gui/dialogs/recurrence-page.c:993
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "fourth"
 msgstr "thứ tư"
 
-#: calendar/gui/dialogs/recurrence-page.c:994
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "last"
 msgstr "cuối cùng"
 
-#: calendar/gui/dialogs/recurrence-page.c:1017
+#: calendar/gui/dialogs/recurrence-page.c:1004
 msgid "Other Date"
 msgstr "Ngày khác"
 
-#: calendar/gui/dialogs/recurrence-page.c:1045 filter/filter-datespec.c:68
+#: calendar/gui/dialogs/recurrence-page.c:1032
 msgid "day"
 msgstr "ngày"
 
-#: calendar/gui/dialogs/recurrence-page.c:1182
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr "lúc"
 
-#: calendar/gui/dialogs/recurrence-page.c:1367
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr "lần"
 
@@ -5102,23 +4928,23 @@ msgstr "tuần"
 msgid "year(s)"
 msgstr "năm"
 
-#: calendar/gui/dialogs/send-comp.c:55
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has been created. Send it?"
 msgstr "Thông tin cuộc họp đã được tại. Gửi nó đi chứ?"
 
-#: 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 "Thông tin cuộc họp đã thay đổi. Gửi bản cập nhật?"
 
-#: 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 "Thông tin công việc đã được tạo. Gửi nó đi chứ?"
 
-#: 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 "Thông tin công việc đã thay đổi. Gửi bản cập nhật?"
 
-#: calendar/gui/dialogs/task-details-page.c:398
+#: calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr "Ngày hoàn thành sai"
 
@@ -5132,44 +4958,38 @@ msgstr "% hoàn tất"
 msgid "Date Completed:"
 msgstr "Ngày hoàn thành:"
 
-#: 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 "Cần hành động"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Tiến trình"
 
-#: 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 "Độ ư_u tiên:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Trạng thái:"
 
-#: calendar/gui/dialogs/task-editor.c:186
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "Cơ bản"
 
-#: 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 "Phân công"
 
-#: calendar/gui/dialogs/task-page.c:519
+#: calendar/gui/dialogs/task-page.c:527
 msgid "Due date is wrong"
 msgstr "Ngày đến hạn sai"
 
-#: 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:"
@@ -5179,124 +4999,232 @@ msgstr "Mô tả"
 msgid "Sta_rt Date:"
 msgstr "Ngày _bắt đầu:"
 
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "_Liên lạc..."
+
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "N_gày đến hạn:"
 
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d ngày"
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "1 ngày"
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d tuần"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 tuần"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d giờ"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 giờ"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d phút"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 phút"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d giây"
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "1 giây"
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "Gửi thư"
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr "Hành động khác cần thực hiện"
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s trước khi bắt đầu cuộc hẹn"
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s sau khi bắt đầu cuộc hẹn"
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s ngay khi bắt đầu cuộc hẹn"
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s trước khi kết thúc cuộc hẹn"
+
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s sau khi kết thức cuộc hẹn"
+
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s ngay khi kết thúc cuộc hẹn"
+
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr "%s tại %s"
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s cho loại trigger lạ"
+
 #: 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: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 "Đang xóa đối tượng được chọn"
 
-#: 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 "_Mở"
 
-#: calendar/gui/e-calendar-table.c:950
+#: calendar/gui/e-calendar-table.c:951
 msgid "_Save as..."
 msgstr "Lư_u là..."
 
-#: 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 "_In..."
 
-#: 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 "_Cắt"
 
-#: 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 "_Sao chép"
 
-#: 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 "_Dán"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:962
 msgid "_Assign Task"
 msgstr "_Gán công việc"
 
-#: calendar/gui/e-calendar-table.c:962
+#: calendar/gui/e-calendar-table.c:963
 msgid "_Forward as iCalendar"
 msgstr "_Chuyển như iCalendar"
 
-#: calendar/gui/e-calendar-table.c:963
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "Đánh dấu _hoàn tất"
 
-#: calendar/gui/e-calendar-table.c:964
+#: calendar/gui/e-calendar-table.c:965
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Đánh _dấu công việc hoàn tất"
 
-#: calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "Xóa côn_g việc được chọn"
 
-#: 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 "Đang cập nhật đối tượng"
 
-#: 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 "Nhấn để thêm công việc"
@@ -5335,7 +5263,7 @@ msgid "Start Date"
 msgstr "Ngày bắt đầu"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:56 shell/e-shell.c:765
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Tóm tắt"
@@ -5367,545 +5295,545 @@ 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 "lệch %02i phút"
 
 #. 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:1523
+#: 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:807
+#: 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:613 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:809
+#: 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:3653
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "Cuộc _hẹn mới"
 
-#: 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 "Sự _kiện mọi ngày mới"
 
-#: 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 "Cuộc họp mới"
 
-#: 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 "Công việc mới"
 
-#: 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 "In..."
 
-#: 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 "Đi tới ngày _hôm nay"
 
-#: 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 "Đi tới _ngày..."
 
-#: 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 "_Công bố thông tin bận/rảnh"
 
-#: 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 "T_hiết lập..."
 
-#: 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 "Lư_u là..."
 
-#: 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 "Lập lịch _cuộc họp..."
 
-#: 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 "_Chuyển như iCalendar..."
 
-#: 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 "_Xóa lần này"
 
-#: 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 "Xóa _mọi lần"
 
-#: calendar/gui/e-itip-control.c:615
+#: calendar/gui/e-itip-control.c:704
 msgid "Yes. (Complex Recurrence)"
 msgstr "Có. (Truy hồi phức)"
 
-#: calendar/gui/e-itip-control.c:627
+#: calendar/gui/e-itip-control.c:716
 msgid "Every day"
 msgstr "Mỗi ngày"
 
-#: calendar/gui/e-itip-control.c:629
+#: calendar/gui/e-itip-control.c:718
 #, c-format
 msgid "Every %d days"
 msgstr "Mỗi %d ngày"
 
-#: calendar/gui/e-itip-control.c:635
+#: calendar/gui/e-itip-control.c:724
 msgid "Every week"
 msgstr "Mỗi tuần"
 
-#: calendar/gui/e-itip-control.c:637
+#: calendar/gui/e-itip-control.c:726
 #, c-format
 msgid "Every %d weeks"
 msgstr "Mỗi %d tuần"
 
-#: calendar/gui/e-itip-control.c:640
+#: calendar/gui/e-itip-control.c:729
 msgid "Every week on "
 msgstr "Mỗi tuần lúc "
 
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:731
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Mỗi %d tuần lúc "
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:739
 msgid " and "
 msgstr " và "
 
-#: calendar/gui/e-itip-control.c:657
+#: calendar/gui/e-itip-control.c:746
 #, c-format
 msgid "The %s day of "
 msgstr "%s ngày của "
 
-#: calendar/gui/e-itip-control.c:670
+#: calendar/gui/e-itip-control.c:759
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s của "
 
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:764
 msgid "every month"
 msgstr "mỗi tháng"
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:769
 #, c-format
 msgid "every %d months"
 msgstr "mỗi %d tháng"
 
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:775
 msgid "Every year"
 msgstr "mỗi năm"
 
-#: calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every %d years"
 msgstr "Mỗi %d năm"
 
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:789
 #, c-format
 msgid " a total of %d times"
 msgstr " tổng cộng %d lần"
 
-#: calendar/gui/e-itip-control.c:708
+#: calendar/gui/e-itip-control.c:797
 msgid ", ending on "
 msgstr ", kết thúc lúc "
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr "<b>Bắt đầu:</b> "
 
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:831
 msgid "<b>Ends:</b> "
 msgstr "<b>Kết thúc:</b>"
 
-#: calendar/gui/e-itip-control.c:762
+#: calendar/gui/e-itip-control.c:851
 msgid "<b>Completed:</b> "
 msgstr "<b>Hoàn tất:</b>"
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr "<b>Tới hạn:</b>"
 
-#: 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 "Thông tin iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:824
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr "Lỗi iCalendar"
 
-#: 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 "Người lạ"
 
 #. 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 ""
 "<br> Vui lòng xem lại các chỉ dẫn sau và chọn một hành động từ menu bên dưới."
 
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Không</i>"
 
-#: calendar/gui/e-itip-control.c:966
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "Địa điểm:"
 
-#: calendar/gui/e-itip-control.c:980
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr "Trạng thái:"
 
-#: 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 "Chấp nhận"
 
-#: 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 "Tạm chấp nhận"
 
-#: 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 "Từ chối"
 
-#: 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:931 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 "Lạ"
 
-#: 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 "Chọn hành động:"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "Cập nhật"
 
-#: 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 "Đồng ý"
 
-#: calendar/gui/e-itip-control.c:1079
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr "Chấp nhận"
 
-#: calendar/gui/e-itip-control.c:1080
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "Tạm chấp nhận"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "Từ chối"
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "Gửi thông tin Rảnh/Bận"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "Cập nhật trạng thái trả lời"
 
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "Gửi thông tin mới nhất"
 
-#: 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 "Bỏ"
 
-#: 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 "<b>%s</b> đã công bố thông tin cuộc họp."
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "Thông tin cuộc họp"
 
-#: 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 "<b>%s</b> yêu cầu sự hiện diện của %s tại cuộc họp."
 
-#: 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 "<b>%s</b> yêu cầu sự hiện diện của bạn tại cuộc họp."
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "Đề nghị cuộc họp"
 
-#: 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 "<b>%s</b? muốn được dự cuộc họp đã có."
 
-#: calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "Cập nhật cuộc họp"
 
-#: 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 "<b>%s</b> muốn nhận thông tin mới nhất về cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1244
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "Yêu cầu cập nhật cuộc họp"
 
-#: 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 "<b>%s</b> đã trả lời yêu cầu họp."
 
-#: calendar/gui/e-itip-control.c:1252
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "Trả lời họp"
 
-#: 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 "<b>%s</b> đã hủy bỏ cuộc họp."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "Hủy bỏ cuộc họp"
 
-#: 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 "<b>%s</b> đã gửi một thông điệp khó hiểu."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "Thông điệp lạ về cuộc họp"
 
-#: 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 "<b>%s</b> đã công bố thông tin công việc."
 
-#: calendar/gui/e-itip-control.c:1293
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Thông tin công việc"
 
-#: 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 "<b>%s</b> yêu cầu %s để thực hiện công việc."
 
-#: 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 "<b>%s</b> yêu cầu thực hiện công việc."
 
-#: calendar/gui/e-itip-control.c:1301
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Đề nghị công việc"
 
-#: 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 "<b>%s</b> muốn thêm vào công việc đã có."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "Cập nhật công việc"
 
-#: 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 "<b>%s</b> muốn nhận thông tin mới nhất về công việc."
 
-#: calendar/gui/e-itip-control.c:1311
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "Yêu cầu cập nhật công việc"
 
-#: 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 "<b>%s</b> đã trả lời việc gán công việc."
 
-#: calendar/gui/e-itip-control.c:1319
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "Trả lời công việc"
 
-#: 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 "<b>%s</b> đã hủy bỏ công việc."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "Hủy bỏ công việc"
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "Thông điệp lạ về công việc"
 
-#: 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 "<b>%s</b> đã công bố thông tin bận/rảnh."
 
-#: calendar/gui/e-itip-control.c:1355
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "Thông tin bận/rảnh"
 
-#: 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 "<b>%s</b> yêu cầu thông tin bận/rảnh của bạn."
 
-#: calendar/gui/e-itip-control.c:1360
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "Yêu cầu thông tin bận/rảnh"
 
-#: 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 "<b>%s</b> đã trả lời yêu cầu thông tin bận/rảnh."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "Trả lời thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "Thông điệp bận/rảnh sai"
 
-#: 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 "Thông điệp có lẽ không đúng hình thức"
 
-#: calendar/gui/e-itip-control.c:1506
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "Thông điệp chỉ chứa yêu cầu chưa được hỗ trợ."
 
-#: 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 "Đồ đính kèm không chứa thông điệp lịch hợp lệ"
 
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "Đồ đính kèm không chứa mục lịch nào có thể xem được"
 
-#: 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 "Đối tượng không hợp lệ và không thể được cập nhật\n"
 
-#: 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 "Lỗi trong hệ thống CORBA\n"
 
-#: 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 "Không thể tìm thấy đối tượng\n"
 
-#: 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 "Bạn không có đủ quyền để cập nhật lịch\n"
 
-#: calendar/gui/e-itip-control.c:1799
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "Hoàn tất cập nhật\n"
 
-#: calendar/gui/e-itip-control.c:1802
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "Không thể cập nhật tập tin lịch!\n"
 
-#: 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 ""
 "Không thể cập nhật trạng thái người tham dự vì chưa có người nào tham dự"
 
-#: 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 ""
 "Hồi đáp này đến từ một người dự hiện thời. Thêm người này như là người tham "
 "dự nhé?"
 
-#: 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 ""
 "Không thể cập nhật trạng thái người tham dự vì trạng thái không hợp lệ!\n"
 
-#: 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 "Bạn không có đủ quyền để cập nhật lịch\n"
 
-#: calendar/gui/e-itip-control.c:1891
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "Đã cập nhật trạng thái người tham dự\n"
 
-#: calendar/gui/e-itip-control.c:1894
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "Không thể cập nhật trạng thái người tham dự!\n"
 
-#: calendar/gui/e-itip-control.c:1929
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "Hoàn tất loại bỏ"
 
-#: 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 "Đã gửi!\n"
 
-#: 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 "Không thể gửi!\n"
 
-#: calendar/gui/e-itip-control.c:2086
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr "Chọn thư mục lịch"
 
-#: calendar/gui/e-itip-control.c:2093
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr "Chọn thư mục công việc"
 
@@ -5946,87 +5874,92 @@ msgstr "ngày kết thúc"
 msgid "date-start"
 msgstr "ngày bắt đầu"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr "Người chủ trì"
 
-#: 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 "Người tham dự yêu cầu"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr "Người tham dự không yêu cầu"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:83
 msgid "Resources"
 msgstr "Tài nguyên"
 
-#: 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 "Cá nhân"
 
-#: 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 "Nhóm"
 
-#: 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 "Tài nguyên"
 
-#: 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 "Phòng"
 
-#: 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 "Ghế"
 
-#: 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 "Người tham dự yêu cầu"
 
-#: 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 "Người tham dự không yêu cầu"
 
-#: 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 "Người không tham dự"
 
-#: 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:407
+#: 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 "Cần hành động"
+
+#: 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 "Có thể làm"
 
-#: 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 "Ủy nhiệm"
 
-#: 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 "Trong tiến trình"
 
 #. 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"
@@ -6034,92 +5967,92 @@ 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: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: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 "Không chính thức"
 
-#: calendar/gui/e-meeting-time-sel.c:410
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "Không có thông tin"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "_Tùy chọn"
 
-#: calendar/gui/e-meeting-time-sel.c:468
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "Chỉ hiện giờ làm _việc"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "Hiện Thu _nhỏ"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "_Cập nhật Rảnh/Bận"
 
-#: 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 "_Tự chọn"
 
-#: 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 "_Mọi người và tài nguyên"
 
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "Mọi người và mộ_t tài nguyên"
 
-#: calendar/gui/e-meeting-time-sel.c:594
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "Người _yêu cầu"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "Người yêu cầu _và một tài nguyên"
 
-#: calendar/gui/e-meeting-time-sel.c:630
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "Lúc _bắt đầu cuộc họp:"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "Lúc _kết thúc cuộc họp:"
 
-#: 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 "Đang mở công việc tại %s"
 
-#: calendar/gui/e-tasks.c:385 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Không thể nập những công việc trong `%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 "Chưa hỗ trợ phương thức yêu cầu để nạp `%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 "Bạn không có đủ quyền để mở thư mục trong '%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"
@@ -6140,7 +6073,7 @@ msgstr "Đang xóa đối tượng được chọn..."
 msgid "Expunging"
 msgstr "Đang xóa"
 
-#: calendar/gui/e-week-view.c:3489
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "Cuộc hẹn mớ_i..."
 
@@ -6181,12 +6114,12 @@ msgstr ""
 "%s\n"
 "đã hỏng. Bạn sẽ cần phải khởi động lại Evolution để dùng nó lần sau."
 
-#: calendar/gui/gnome-cal.c:1993
+#: calendar/gui/gnome-cal.c:1995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Đang mở lịch tại %s"
 
-#: calendar/gui/gnome-cal.c:2033
+#: calendar/gui/gnome-cal.c:2035
 msgid "Opening default tasks folder"
 msgstr "Đang mở thư mục công việc mặc định"
 
@@ -6246,164 +6179,165 @@ msgstr "Tháng Mười"
 msgid "September"
 msgstr "Tháng Chín"
 
-#: 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 "Phải chọn một tổ chức."
 
-#: calendar/gui/itip-utils.c:379
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "Cần ít nhất một người tham dự."
 
-#: 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 "Thông tin sự kiện"
 
-#: 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 "Thông tin công việc"
 
-#: 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 "Thông tin nhật ký"
 
-#: 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 "Thông tin rảnh/bận"
 
-#: calendar/gui/itip-utils.c:466
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "Thông tin lịch"
 
-#: calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr "Đã cập nhật"
 
-#: calendar/gui/itip-utils.c:510
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr "Cập nhật"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr "Phản đề nghị"
 
-#: calendar/gui/itip-utils.c:582
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Thông tin rảnh/bận (%s tới %s)"
 
-#: calendar/gui/itip-utils.c:594
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "Thông tin iCalendar"
 
-#: calendar/gui/itip-utils.c:752
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "Bạn phải là người tham dự sự kiện."
 
-#: calendar/gui/print.c:545
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr "CN"
 
-#: calendar/gui/print.c:545
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "Hai"
 
-#: calendar/gui/print.c:545
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "Ba"
 
-#: calendar/gui/print.c:545
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "Tư"
 
-#: calendar/gui/print.c:546
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "Năm"
 
-#: calendar/gui/print.c:546
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "Sáu"
 
-#: calendar/gui/print.c:546
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "Bảy"
 
 #. Day
-#: calendar/gui/print.c:1879
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Ngày được chọn (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1904 calendar/gui/print.c:1908
+#: calendar/gui/print.c:1910 calendar/gui/print.c:1914
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1905
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1909 calendar/gui/print.c:1911
-#: calendar/gui/print.c:1912
+#: 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:1916
+#: calendar/gui/print.c:1922
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Tuần được chọn (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1924
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr "Tháng được chọn (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1931
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr "Năm được chọn (%Y)"
 
-#: calendar/gui/print.c:2261
+#: calendar/gui/print.c:2267
 msgid "Task"
 msgstr "Công việc"
 
-#: calendar/gui/print.c:2320
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr "Trạng thái: %s"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Độ ưu tiên: %s"
 
-#: calendar/gui/print.c:2352
+#: calendar/gui/print.c:2358
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Phần trăm hoàn thành: %i"
 
-#: calendar/gui/print.c:2364
+#: calendar/gui/print.c:2370
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2378
+#: calendar/gui/print.c:2384
 #, c-format
 msgid "Categories: %s"
 msgstr "Phân loại: %s"
 
-#: calendar/gui/print.c:2389
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr "Liên lạc: "
 
-#: calendar/gui/print.c:2519 calendar/gui/print.c:2597
-#: calendar/gui/tasks-control.c:579 mail/mail-callbacks.c:2925
-#: 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 "Xem thử bản in"
 
-#: calendar/gui/print.c:2553
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "In một mục"
 
-#: calendar/gui/print.c:2618
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "Thiết lập in"
 
@@ -6411,7 +6345,7 @@ msgstr "Thiết lập in"
 msgid "The URI of the tasks folder to display"
 msgstr "URI của thư mục công việc cần hiển thị"
 
-#: calendar/gui/tasks-control.c:465
+#: 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"
@@ -6423,87 +6357,51 @@ msgstr ""
 "\n"
 "Bạn có thật sự muốn xóa những công việc này không?"
 
-#: calendar/gui/tasks-control.c:472
+#: calendar/gui/tasks-control.c:479
 msgid "Do not ask me again."
 msgstr "Đừng hỏi tôi lần nữa"
 
-#: calendar/gui/tasks-control.c:608
+#: calendar/gui/tasks-control.c:615
 msgid "Print Tasks"
 msgstr "In công việc"
 
-#: 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 đã lấy những công việc trong thư mục lịch của bạn và tự động "
-"chuyển qua thư mục công việc mới."
-
-#: 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 đã cố lấy những công việc trong thư mục lịch của bạn và tự động "
-"chuyển qua thư mục công việc mới.\n"
-"Một vài công việc có thể không được chuyển qua được, vì thế tiến trình này "
-"có thể sẽ được thực hiện lại trong tương lại."
-
-#: 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 ""
-"Không thể mở '%s'; không có mục nào trong thư mục lịch để chuyển qua thư mục "
-"công việc."
-
-#: 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 ""
-"Không hỗ trợ phương thức yêu cầu để nạp '%s'; không có mục nào trong thư mục "
-"lịch để chuyển qua thư mục công việc."
-
-#: 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 "CHBTNSB"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "Factory Nhập tập tin iCalendar vào Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Bộ xem lịch iTip/iMip Evolution"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "Nhập tập tin iCalendar vào Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Bộ xem lịch iTip/iMip Evolution"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "Nhập tập tin vCalendar vào Evolution"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Bộ xem lịch iTip/iMip Evolution"
 
-#: calendar/importers/icalendar-importer.c:169
-#, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr "Không thể lấy danh sách kho lưu từ registry: %s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "Thông điệp lịch"
 
-#: calendar/importers/icalendar-importer.c:181
-#, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "Không thể gọi GetFolderAtPath trên kho lưu: %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 "Bộ nhắc nhở!!"
 
-#: calendar/importers/icalendar-importer.c:698
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "Sự kiện lịch"
 
-#: 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?"
@@ -6511,11 +6409,11 @@ msgstr ""
 "Evolution tìm thấy các tập tin Lịch Gnome.\n"
 "Bạn có muốn nhập chúng vào Evolution?"
 
-#: calendar/importers/icalendar-importer.c:730
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr "Lịch Gnome"
 
-#: calendar/pcs/cal-backend-file.c:301
+#: calendar/pcs/cal-backend-file.c:311
 msgid "Can't save calendar data: Malformed URI."
 msgstr "Không thể lưu dữ liệu lịch: URI sai."
 
@@ -8183,11 +8081,11 @@ msgstr "Bạn không thể nhập khóa bằng loại mã này"
 msgid "You may not export keys with this cipher"
 msgstr "Bạn không thể xuất khóa bằng loại mã này"
 
-#: camel/camel-data-cache.c:137
+#: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
 msgstr "Không thể tạo đường dẫn cache"
 
-#: camel/camel-data-cache.c:375
+#: camel/camel-data-cache.c:370
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Không thể loại bỏ mục cache: %s: %s"
@@ -8227,12 +8125,14 @@ msgstr "Đang chuẩn bị thư mục '%s' để dùng ngoại tuyến"
 msgid "You must be working online to complete this operation"
 msgstr "Bạn phải đang hoạt động trực tuyến mới có thể hoàn tất thao tác này."
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:510
+#: 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 "Lỗi tạo ống dẫn tới '%s': %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:550
+#: 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 "Lỗi tạo tiến trình con '%s': %s"
@@ -8292,19 +8192,19 @@ msgstr "Đang lấy thông điệp %d trên %d"
 msgid "Failed at message %d of %d"
 msgstr "Lỗi tại thông điệp %d trên %d"
 
-#: camel/camel-filter-search.c:133
+#: camel/camel-filter-search.c:134
 msgid "Failed to retrieve message"
 msgstr "Lỗi nhận thông điệp"
 
-#: camel/camel-filter-search.c:383
+#: camel/camel-filter-search.c:384
 msgid "Invalid arguments to (system-flag)"
 msgstr "Đối số không hợp lệ (system-flag)"
 
-#: camel/camel-filter-search.c:398
+#: camel/camel-filter-search.c:399
 msgid "Invalid arguments to (user-tag)"
 msgstr "Đối số không hợp lệ (user-tag)"
 
-#: 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 "Lỗi thực hiện tìm kiếm bộ lọc: %s: %s"
@@ -8387,9 +8287,9 @@ msgstr ""
 "Bạn cần passphrase để mở khóa cho người \n"
 "dùng: \"%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 "Đã hủy"
 
@@ -8410,7 +8310,7 @@ msgstr "Chưa cung cấp dữ liệu"
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Lỗi mã hóa: Chưa xác định người nhận."
 
-#: camel/camel-gpg-context.c:1122
+#: camel/camel-gpg-context.c:1125
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8421,24 +8321,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 "GPG gặp lỗi %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 "Lỗi thực hiện 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 "Lỗi thực hiện 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 "Không thể xác minh chữ ký thông điệp: không thể tạo tập tin tạm: %s"
@@ -8549,11 +8449,11 @@ msgstr "Lỗi giải mã phần MIME: cấu trúc sai"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Lỗi giải mã phần MIME: lỗi phân tích"
 
-#: camel/camel-multipart-signed.c:625
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr "Đây là phần thông điệp có chữ ký số"
 
-#: camel/camel-multipart-signed.c:679
+#: camel/camel-multipart-signed.c:682
 msgid "parse error"
 msgstr "lỗi phân tích"
 
@@ -8623,11 +8523,11 @@ msgstr ""
 "Tùy chọn này sẽ kết nối tới server dùng mật khẩu an toàn CRAM-MD5, nếu "
 "server có hỗ trợ."
 
-#: camel/camel-sasl-digest-md5.c:44
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:46
+#: 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."
@@ -8635,109 +8535,121 @@ msgstr ""
 "Tùy chọn này sẽ kết nối tới server bằng mật khẩu an toàn DIGEST-MD5, nếu "
 "server có hỗ trợ."
 
-#: camel/camel-sasl-digest-md5.c:811
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Server challenge quá dài (trên 2048 octet)\n"
 
-#: camel/camel-sasl-digest-md5.c:820
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr "Server challenge không hợp lệ\n"
 
-#: camel/camel-sasl-digest-md5.c:826
+#: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr "Server challenge chứa token \"Quality of Protection\" không hợp lệ\n"
 
-#: camel/camel-sasl-digest-md5.c:848
+#: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
 msgstr "Hồi đáp của server không chứa dữ liệu để xác thực\n"
 
-#: camel/camel-sasl-digest-md5.c:866
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Hồi đáp của server chứa dữ liệu xác thực không hoàn chỉnh\n"
 
-#: camel/camel-sasl-digest-md5.c:876
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr "Tín hiệu trả lời của server không khớp\n"
 
-#: camel/camel-sasl-gssapi.c:40
+#: camel/camel-sasl-gssapi.c:48
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: 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 "Tùy chọn này sẽ kết nối tới server bằng cơ chế xác minh Kerberos 5."
 
-#: 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 "Tham số target_name sai dạng thức."
 
-#: 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 "Tham số target_name chứa loại tên không hỗ trợ hoặc không hợp lệ."
 
-#: 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 "Tham số input_token chứa chữ ký không hợp lệ, hoặc chữ ký không được xác nhận."
+msgstr ""
+"Tham số input_token chứa chữ ký không hợp lệ, hoặc chữ ký không được xác "
+"nhận."
 
-#: 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."
-msgstr "Chỉ ra rằng handle ngữ cảnh được cung cấp không tham chiếu đến một ngữ cảnh hợp lệ."
+#: camel/camel-sasl-gssapi.c:174
+#, fuzzy
+msgid "The supplied context handle did not refer to a valid context."
+msgstr ""
+"Chỉ ra rằng handle ngữ cảnh được cung cấp không tham chiếu đến một ngữ cảnh "
+"hợp lệ."
 
-#: camel/camel-sasl-gssapi.c:163
-msgid "Indicates that consistency checks performed on the input_token failed."
-msgstr "Chỉ ra rằng thao tác kiểm tra đồng bộ được thực hiện trên input_token đã thất bại."
+#: camel/camel-sasl-gssapi.c:177
+#, fuzzy
+msgid "The consistency checks performed on the input_token failed."
+msgstr ""
+"Chỉ ra rằng thao tác kiểm tra đồng bộ được thực hiện trên input_token đã "
+"thất bại."
 
-#: 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 "Trả lời xác thực từ server sai."
 
-#: camel/camel-sasl-gssapi.c:281
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "Lỗi tạo ống dẫn tới '%s': %s"
+
+#: camel/camel-sasl-gssapi.c:299
 msgid "Unsupported security layer."
 msgstr "Tầng bảo mật chưa được hỗ trợ."
 
-#: 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 "Tùy chọn này sẽ kết nối server bằng cơ chế xác minh Kerberos 4."
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -8817,30 +8729,30 @@ msgstr "URL '%s' cần phần đường dẫn"
 msgid "Resolving: %s"
 msgstr "Đang phân giải: %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 "Lỗi tra cứu tên: %s"
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Lỗi tra cứu máy chủ: %s: không tìm thấy máy chủ"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Lỗi tra cứu máy chủ: %s: lỗi lạ"
 
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 msgid "Resolving address"
 msgstr "Đang phân giải địa chỉ"
 
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 msgid "Host lookup failed: host not found"
 msgstr "Lỗi tra cứu máy chủ: không tìm thấy máy chủ"
 
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 msgid "Host lookup failed: unknown reason"
 msgstr "Lỗi tra cứu máy chủ: lỗi lạ"
 
@@ -8911,123 +8823,123 @@ msgstr "Không thể lấy thư mục: thao tác không hợp lệ trên thiết
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Không thể tạo thư mục: Thao tác không hợp lệ trên thiết bị lưu trữ"
 
-#: 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 "Không thể giải mã chữ ký chứng nhận"
 
-#: 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 "Lỗi chữ ký chứng nhận"
 
-#: 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 "Chứng nhận chưa hợp lệ"
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr "Chứng nhận quá hạn"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr "CRL chưa hợp lệ"
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr "CRL quá hạn"
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 msgid "Error in CRL"
 msgstr "Lỗi trong CRL"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 msgid "Out of memory"
 msgstr "Hết bộ nhớ"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr "Chứng nhận tự ký, độ sâu 0"
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr "Chứng nhận tự ký trong chuỗi"
 
-#: 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 "Chuỗi chứng nhận quá dài"
 
-#: 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 "Đường dẫn quá dài"
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
 msgid "Invalid purpose"
 msgstr "Mục đích không hợp lệ"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr "Chứng nhận không đáng tin"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr "Chứng nhận bị từ chối"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr "Không khớp Chủ đề/Issuer"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr "Không khớp AKID/SKID"
 
-#: 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"
@@ -9036,15 +8948,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 "TỐT"
 
-#: 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 "XẤU"
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9064,7 +8976,7 @@ msgstr ""
 "Bạn có muốn chấp nhận dù bất cứ giá nào?"
 
 #. 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"
@@ -9079,7 +8991,7 @@ msgstr ""
 "\n"
 "Bạn có muốn chấp nhận không?"
 
-#: camel/camel-tcp-stream-ssl.c:860
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9088,7 +9000,7 @@ msgstr ""
 "Vấn đề chứng nhận: %s\n"
 "Đối tượng: %s"
 
-#: camel/camel-tcp-stream-ssl.c:912
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9097,7 +9009,7 @@ msgstr ""
 "Vùng chứng nhận sai: %s\n"
 "Đối tượng: %s"
 
-#: camel/camel-tcp-stream-ssl.c:930
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9106,14 +9018,14 @@ msgstr ""
 "Chứng nhận quá hạn: %s\n"
 "Đối tượng: %s"
 
-#: 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 "Không thể phân tích URL `%s'"
@@ -9128,39 +9040,39 @@ msgstr "Lỗi lưu `%s': %s"
 msgid "No such message %s in %s"
 msgstr "Không có thông điệp %s trong %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 "Không thể sao chép hoặc di chuyển thông điệp vào Thư mục Ảo"
 
-#: camel/camel-vee-store.c:272
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
 
-#: camel/camel-vee-store.c:291
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Không thể xóa thư mục: %s: Không có thư mục như vậy"
 
-#: camel/camel-vee-store.c:304
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Không thể đổi tên thư mục: %s: Thao tác không hợp lệ"
 
-#: camel/camel-vee-store.c:312
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Không thể đổi tên thư mục: %s: Không có thư mục này"
 
 #: 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:2639
+#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr "Thao tác bị hủy bỏ"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2642
+#: camel/providers/imap/camel-imap-store.c:2645
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server đã ngắt kết nối bất ngờ: %s"
@@ -9185,16 +9097,16 @@ msgstr "Tính hiệu trả lời không mong đợi từ IMAP server: %s"
 msgid "IMAP command failed: %s"
 msgstr "Lỗi lệnh 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 "Tính hiệu trả lời của server kết thúc quá sớm."
 
-#: 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 "Tín hiệu trả lời của IMAP server không chứa thông tin %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 "Tín hiệu trả lời OK không mong đợi từ IMAP server: %s"
@@ -9286,7 +9198,7 @@ msgstr "Kiểm tra tìm thư mới"
 msgid "Check for new messages in all folders"
 msgstr "Kiểm tra tìm thư mới trên mọi thư mục"
 
-#: 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 "Thư mục"
 
@@ -9318,7 +9230,7 @@ msgstr "Để đọc và lưu thư trên IMAP server."
 
 #: 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 "Mật khẩu"
 
@@ -9337,57 +9249,57 @@ msgstr "IMAP server %s"
 msgid "IMAP service for %s on %s"
 msgstr "dịch vụ IMAP cho %s trên %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 "Kết nối bị hủy bỏ"
 
-#: 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 "Không thể kết nối tới %s (cổng %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 "Lỗi kết nối tới IMAP server %s trong chế độ an toà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
 msgid "SSL/TLS extension not supported."
 msgstr "Chưa hỗ trợ phần mở rộng 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 "Thương lượng SSL thất bại"
 
-#: 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 không hỗ trợ loại xác thực được yêu cầu %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 "Không hỗ trợ loại xác thực %s"
 
-#: camel/providers/imap/camel-imap-store.c:1105
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVui lòng nhập mật khẩu IMAP cho %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1119
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "Bạn chưa nhập mật khẩu"
 
-#: camel/providers/imap/camel-imap-store.c:1148
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9398,24 +9310,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1493
-#: camel/providers/imap/camel-imap-store.c:1635
+#: camel/providers/imap/camel-imap-store.c:1496
+#: camel/providers/imap/camel-imap-store.c:1638
 #, c-format
 msgid "No such folder %s"
 msgstr "Không có thư mục %s"
 
-#: camel/providers/imap/camel-imap-store.c:1836
+#: camel/providers/imap/camel-imap-store.c:1839
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Tên thư mục \"%s\" không hợp lệ vì chứa ký tự \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:1848
+#: camel/providers/imap/camel-imap-store.c:1851
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Thư mục cha lạ: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1884
+#: camel/providers/imap/camel-imap-store.c:1887
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Thư mục cha không được phép có các thư mục con"
 
@@ -9493,7 +9405,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 "Gốc lưu %s không phải là đường dẫn tuyệt đối"
@@ -9564,7 +9476,7 @@ msgstr "Nội dung thông điệp không hợp lệ"
 
 #: 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"
@@ -9576,14 +9488,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 "Thư mục `%s' không tồn tại."
 
 #: 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"
@@ -9609,8 +9521,8 @@ msgid "not a maildir directory"
 msgstr "không phải là thư mục dạng 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 "Không thể quét thư mục `%s': %s"
@@ -9630,10 +9542,10 @@ msgid "Checking for new messages"
 msgstr "Đang kiểm tra thông điệp mới"
 
 #: 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 "Đang lưu thư mục"
 
@@ -9715,75 +9627,75 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Thư mục `%s' không rỗng. Chưa xóa."
 
-#: 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 "Không thể mở thư mục: %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 "Lỗi nghiêm trọng khi phân tích mail gần vị trí %ld trong thư mục %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 "Không thể kiểm tra thư mục: %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 "Không thể mở tập tin: %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 "Không thể mở hộp thư tạm: %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 "Không thể đóng thư mục nguồn %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 "Không thể đóng thư mục temp: %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 "Không thể đổi tên thư mục: %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 "Bản tóm tắt và thư mục không khớp, kể cả sau khi đồng bộ"
 
-#: 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 "Lỗi lạ: %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 "Không thể lưu thư mục: %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 "Lỗi ghi vào hộp thư tạm: %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 "Lỗi ghi vào hộp thư tmp: %s: %s"
@@ -9807,63 +9719,63 @@ msgstr "`%s' không phải là thư mục."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Không thể mở đường dẫn thư mục dạng 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 "Không thể mở 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' không phải là tập tin hay thư mục bình thường"
 
-#: 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 "Thư mục `%s/%s' không tồn tại"
 
-#: 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' không phải là tập tin hộp thư."
 
-#: camel/providers/local/camel-spool-store.c:194
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr "Store không hỗ trợ 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 "Tập tin 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 ""
 
-#: camel/providers/local/camel-spool-store.c:214
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr "Không thể đổi tên thư mục spool"
 
-#: camel/providers/local/camel-spool-store.c:222
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr "Không thể xóa thư mục 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 "Không thể đồng bộ thư mục tạm %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 "Không thể đồng bộ thư mục 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"
@@ -9994,7 +9906,7 @@ msgstr "Xóa thông điệp khỏi server"
 msgid "Delete after %s day(s)"
 msgstr "Xoá sau %s ngày"
 
-#: 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"
 
@@ -10020,25 +9932,25 @@ msgstr ""
 "giao thức APOP. Có thể sẽ không hoạt động cho mọi người dùng, kể cả trên "
 "server tuyên bố có hỗ trợ."
 
-#: 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 "Không thể kết nối tới POP server %s (cổng %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 "Lỗi kết nối tới POP server %s trong chế độ an toàn: %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 "Không thể kết nối tới POP server %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:501
+#: 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 "
@@ -10046,28 +9958,28 @@ msgid ""
 msgstr ""
 "Không thể kết nối tới POP server %s: Không hỗ trợ cơ chế xác thực yêu cầu."
 
-#: 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 "Đăng nhập SASL `%s' thất bại với POP server %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 "Không thể đăng nhập vào POP server %s: lỗi giao thức 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 "Không thể xác thực tại POP server: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:461
+#: camel/providers/pop3/camel-pop3-store.c:464
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sVui lòng nhập mật khẩu POP cho %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:515
-#: camel/providers/pop3/camel-pop3-store.c:522
+#: 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"
@@ -10076,13 +9988,13 @@ msgstr ""
 "Không thể kết nối tới POP server %s.\n"
 "Lỗi gửi mật khẩu: %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 "Không có thư mục `%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 +10005,49 @@ msgid ""
 msgstr ""
 "Để gửi thư bằng cách chuyển nó cho chương trình sendmail trên hệ thống này."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr "Không thể phân tích danh sách người nhận"
 
-#: 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 "Không thể tạo ống dẫn tới sendmail: %s: chưa gửi mail"
 
-#: 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 "Không thể tạo tiến trình sendmail mới: %s: chưa gửi mail"
 
-#: 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 "Không thể gửi thông điệp: %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 đã thoát với tín hiệu %s: chưa gửi mail."
 
-#: 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 "Không thể thực hiện %s: chưa gửi mail."
 
-#: 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 đã thoát với trạng thái %d: chưa gửi mail."
 
-#: 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 "Gửi thư thông qua chương trình 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"
 
@@ -10143,140 +10055,140 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Để gửi thư bằng cách kết nối tới mailhub từ xa dùng SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr "Lỗi cú pháp, không nhận ra lệnh"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr "Lỗi cú pháp trong tham số hoặc đối số"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr "Lệnh chưa được thi công"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr "Tham số lệnh chưa được thi công"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr "Trạng thái hệ thống, hoặc trả lời trợ giúp hệ thống"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr "Thông điệp trợ giúp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr "Dịch vụ sẵn sàng"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr "Dịch vụ đang đóng kênh truyền"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr "Dịch vụ chưa sẵn sàng, đang đóng kênh truyền thông"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr "Hành động thư tín yêu cầu đã xong"
 
-#: 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 "Không phải người dùng cục bộ; đang chuyển tiếp tới <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 "Không thực hiện hành động thư tín yêu cầu: hộp thư không sẵn sàng"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Không thực hiện hành động yêu cầu: hộp thư không sẵn sàng"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr "Đã ngừng hành động yêu cầu: lỗi khi thực hiện"
 
-#: 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 "Không phải người dùng cục bộ; vui lòng thử <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 "Không thực hiện hành động yêu cầu: không đủ chỗ chứa"
 
-#: 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 "Không thực hiện hành động thư tín yêu cầu: không đủ chỗ chứa"
 
-#: 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 "Không thực hiện hành động yêu cầu: tên hộp thư không hợp lệ"
 
-#: 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 "Bắt đầu nhập thư; kết thức bằng <Xuống dòng>.<Xuống dòng>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr "Giao dịch thất bại"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr "Cần chuyển tiếp mật khẩu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr "Cơ chế xác thực quá yếu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Cơ chế xác thực yêu cầu cần phải được mã hoá"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr "Lỗi xác thực tạm"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "Yêu cầu xác thực"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 msgid "Welcome response error"
 msgstr "Lỗi hồi đáp chào mừng"
 
-#: 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 "Lỗi kết nối tới SMTP server %s trong chế độ không an toàn: %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 "server có lẽ không hỗ trợ 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 "Yêu cầu STARTTLS quá hạn: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
 msgid "STARTTLS response error"
 msgstr "Lỗi hồi đáp 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 server %s không hỗ trợ loại xác thực yêu cầu loại %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 "%sVui lòng nhập mật khẩu SMTP cho %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10287,87 +10199,87 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:664
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Gửi thư (SMTP) thông qua %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "Cannot send message: sender address not valid."
 msgstr "Không thể gửi thông điệp: địaa chỉ người gửi không hợp lệ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:687 mail/mail-ops.c:613
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Đang gửi thông điệp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:702
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr "Không thể gửi thông điệp: chưa có người nhận."
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Không thể gửi thông điệp: có một hoặc vài người nhận không hợp lệ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:878
 msgid "SMTP Greeting"
 msgstr "Chào hỏi của SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:925
+#: camel/providers/smtp/camel-smtp-transport.c:924
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Yêu cầu HELO quá hạn: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:947
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "HELO response error"
 msgstr "Lỗi hồi đáp HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "SMTP Authentication"
 msgstr "xác thực SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1019
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr "Lỗi tạo đối tượng xác thực SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1036
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: 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 "Yêu cầu AUTH quá hạn: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1057
+#: camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "AUTH request failed."
 msgstr "Yêu cầu AUTH thất bại."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1118
+#: camel/providers/smtp/camel-smtp-transport.c:1117
 msgid "Bad authentication response from server.\n"
 msgstr "Trả lời xác thực từ server sai.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1143
+#: camel/providers/smtp/camel-smtp-transport.c:1142
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Quá hạn yêu cầu MAIL FROM: %s: chưa gửi mail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1163
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 msgid "MAIL FROM response error"
 msgstr "Lỗi hồi đáp MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1187
+#: camel/providers/smtp/camel-smtp-transport.c:1186
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Quá hạn yêu cầu RCPT TO: %s: chưa gửi mail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1209
+#: camel/providers/smtp/camel-smtp-transport.c:1208
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> thất bại"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1247
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Quá hạn yêu cầu DATA: %s: chưa gửi mail"
@@ -10375,49 +10287,49 @@ msgstr "Quá hạn yêu cầu DATA: %s: chưa gửi mail"
 #. 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:1271
+#: camel/providers/smtp/camel-smtp-transport.c:1267
 msgid "DATA response error"
 msgstr "Lỗi hồi đáp DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1311
-#: camel/providers/smtp/camel-smtp-transport.c:1334
+#: 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 "Quá hạn gửi DATA: chấm dứt thông điệp: %s: chưa gửi mail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1354
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 msgid "DATA termination response error"
 msgstr "Lỗi hồi đáp kết thúc DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1377
+#: camel/providers/smtp/camel-smtp-transport.c:1374
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Quá hạn yêu cầu RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1397
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 msgid "RSET response error"
 msgstr "Lỗi hồi đáp RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1420
+#: camel/providers/smtp/camel-smtp-transport.c:1417
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Yêu cầu QUIT quá hạn: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1440
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 msgid "QUIT response error"
 msgstr "Lỗi hồi đáp QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:102
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
@@ -10427,15 +10339,15 @@ msgstr "%.0fG"
 msgid "attachment"
 msgstr "đồ đính kèm"
 
-#: 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 "Loại bỏ những mục được chọn từ danh sách đồ đính kèm"
 
-#: composer/e-msg-composer-attachment-bar.c:536
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Thêm đồ đính kèm..."
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "Đính kèm tập tin vào thông điệp"
 
@@ -10482,45 +10394,45 @@ msgstr "Nhấn vào đây để xem sổ địa chỉ"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:511
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Trả lời cho:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:522
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Từ:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:528
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Chủ đề:"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Tới:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Nhập người nhận thông điệp"
 
-#: composer/e-msg-composer-hdrs.c:546
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "CC:"
 
-#: composer/e-msg-composer-hdrs.c:547
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Nhập địa chỉ sẽ nhận một bản sao của thông điệp"
 
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:551
+#: 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,11 +10443,11 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:558
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Gửi tới:"
 
-#: composer/e-msg-composer-hdrs.c:560
+#: composer/e-msg-composer-hdrs.c:549
 msgid "Posting destination"
 msgstr "Đích gửi đến"
 
@@ -10544,11 +10456,11 @@ msgstr "Đích gửi đến"
 msgid "Attach file(s)"
 msgstr "Đính kèm tập tin"
 
-#: composer/e-msg-composer.c:527
+#: composer/e-msg-composer.c:533
 msgid "Could not create a PGP signature context"
 msgstr "Không thể tạo ngữ cảnh chữ ký PGP"
 
-#: composer/e-msg-composer.c:806
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10557,30 +10469,30 @@ msgstr ""
 "Lỗi đọc tập tin %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "Tập tin đã tồn tại, ghi đè chứ?"
 
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Lỗi lưu tập tin: %s"
 
-#: composer/e-msg-composer.c:1210
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Lỗi nạp tập tin: %s"
 
-#: composer/e-msg-composer.c:1245
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Lỗi truy cập tập tin: %s"
 
-#: composer/e-msg-composer.c:1253
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "Không thể nhận thông điệp từ trình biên soạn"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10589,7 +10501,7 @@ msgstr ""
 "Không thể tìm trong tập tin: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10598,7 +10510,7 @@ msgstr ""
 "Không thể cắt tập tin: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1276
+#: composer/e-msg-composer.c:1285
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10607,7 +10519,7 @@ msgstr ""
 "Không thể chép bộ mô tả tập tin: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1285
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10616,7 +10528,7 @@ msgstr ""
 "Lỗi tự động lưu thông điệp: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1379
+#: 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 +10536,7 @@ msgstr ""
 "Ximian Evolution đã tìm thấy các tập tin chưa được lưu từ session trước.\n"
 "Bạn có muốn phục hồi chúng không?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10635,31 +10547,32 @@ msgstr ""
 "\n"
 "Bạn có muốn lưu các thay đổi?"
 
-#: composer/e-msg-composer.c:1546
+#: composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Hủy thay đổi"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Cảnh báo: Thông điệp đã thay đổi"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Mở tập tin"
 
-#: composer/e-msg-composer.c:1940
+#: composer/e-msg-composer.c:2015
 msgid "Signature:"
 msgstr "Chữ ký:"
 
-#: composer/e-msg-composer.c:1980 mail/mail-account-gui.c:1247
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr "Tự phát sinh"
 
-#: composer/e-msg-composer.c:2159 composer/e-msg-composer.c:2754
+#: composer/e-msg-composer.c:2234 composer/e-msg-composer.c:2873
+#: composer/e-msg-composer.c:2874
 msgid "Compose a message"
 msgstr "Biên soạn thông điệp"
 
-#: composer/e-msg-composer.c:2785
+#: composer/e-msg-composer.c:2905
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10667,7 +10580,7 @@ msgstr ""
 "Không thể tạo cửa sổ biên soạn:\n"
 "Không thể kích hoạt bộ chọn địa chỉ."
 
-#: composer/e-msg-composer.c:2811
+#: composer/e-msg-composer.c:2931
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10679,7 +10592,7 @@ msgstr ""
 "Vui lòng kiểm tra xem GtkHTML và libGtkHTML\n"
 "có được cài đặt đúng phiên bản chưa.\n"
 
-#: composer/e-msg-composer.c:2871
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10687,7 +10600,7 @@ msgstr ""
 "Không thể tạo cửa sổ biên soạn:\n"
 "Không thể kích hoạt bộ biên soạn HTML."
 
-#: composer/e-msg-composer.c:3887
+#: composer/e-msg-composer.c:4005
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10695,18 +10608,6 @@ msgstr ""
 "<b>(Bộ soạn thảo chứa phần thân thông điệp phi văn bản, không thể được hiệu "
 "chỉnh)</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 ""
-"Không thể tạo cửa sổ biên soạn vì bạn chưa cấu hình thực \n"
-"thể nào trong thành phần mail."
-
-#: composer/evolution-composer.c:432
-msgid "Cannot initialize the Evolution composer."
-msgstr "Không thể khởi động bộ soạn thảo của Evolution."
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Bộ phần mềm nhóm Evolution"
@@ -10778,7 +10679,9 @@ 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 "<small>Thông điệp xác định dưới đây sẽ được gửi tự động đến mỗi người, những người đã gửi thư đến cho bạn khi bạn không có trong văn phòng.</small>"
+msgstr ""
+"<small>Thông điệp xác định dưới đây sẽ được gửi tự động đến mỗi người, những "
+"người đã gửi thư đến cho bạn khi bạn không có trong văn phòng.</small>"
 
 #: designs/OOA/ooa.glade.h:8
 msgid "I am currently in the office"
@@ -10855,7 +10758,7 @@ 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?"
@@ -10863,11 +10766,15 @@ msgstr ""
 "Tập tin với tên này đã có rồi.\n"
 "Ghi đè tập tin này?"
 
-#: e-util/e-passwords.c:345
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "Ghi đè tập tin?"
+
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "Nhớ mật khẩu này"
 
-#: e-util/e-passwords.c:347
+#: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
 msgstr "Nhớ mật khẩu này để nhắc nhở cho những lần sử dụng sau"
 
@@ -10950,13 +10857,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:%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: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"
 
@@ -10965,42 +10872,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:180
-msgid "seconds"
-msgstr "giây"
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr "1 giây"
+
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr "%d giây"
 
 #: filter/filter-datespec.c:66
-msgid "minute"
-msgstr "phút"
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 phút"
+
+#: filter/filter-datespec.c:66
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "%d phút"
 
 #: filter/filter-datespec.c:67
-msgid "hour"
-msgstr "giờ"
+#, fuzzy
+msgid "1 hour ago"
+msgstr "1 giờ"
+
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d giờ"
+
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "1 day ago"
+msgstr "1 ngày"
+
+#: filter/filter-datespec.c:68
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr "%d %s trước"
 
 #: filter/filter-datespec.c:69
-msgid "week"
-msgstr "tuần"
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 tuần"
 
-#: filter/filter-datespec.c:69 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "tuần"
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d tuần"
 
 #: filter/filter-datespec.c:70
-msgid "month"
+#, fuzzy
+msgid "1 month ago"
 msgstr "tháng"
 
-#: filter/filter-datespec.c:70 filter/filter.glade.h:23
-msgid "months"
-msgstr "tháng"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr "%d %s trước"
 
 #: filter/filter-datespec.c:71
-msgid "year"
-msgstr "năm"
+msgid "1 year ago"
+msgstr ""
 
-#: filter/filter-datespec.c:71 filter/filter.glade.h:33
-msgid "years"
-msgstr "năm"
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr "%d %s trước"
 
 #: filter/filter-datespec.c:176
 msgid "You must choose a date."
@@ -11019,13 +10958,7 @@ msgstr "bây giờ"
 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 trước"
-
-#: filter/filter-datespec.c:417
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Chọn thời điểm đối chiếu"
 
@@ -11042,7 +10975,7 @@ msgstr "Bạn phải xác định tên tập tin."
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Tập tin '%s' không tồn tại hoặc không phải là một tập tin bình thường"
 
-#: filter/filter-file.c:293
+#: filter/filter-file.c:298
 msgid "Choose a file"
 msgstr "Chọn tập tin"
 
@@ -11056,7 +10989,7 @@ msgid "You must specify a folder."
 msgstr "Bạn phải xác định thư mục."
 
 #: filter/filter-folder.c:243 filter/vfolder-rule.c:408
-#: mail/mail-account-gui.c:1492 mail/mail-account-gui.c:1506
+#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
 msgid "Select Folder"
 msgstr "Chọn thư mục"
 
@@ -11069,30 +11002,32 @@ msgstr ""
 "Lỗi trong biểu thức chính quy '%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 "Quan trọng"
 
 #. 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 "Công việc"
 
 #. 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 "Cá nhân"
 
 #. 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 "Cần làm"
 
 #. 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 "Sau đó"
 
@@ -11192,6 +11127,14 @@ msgstr "thời điểm so với hiện thời"
 msgid "ago"
 msgstr "trước"
 
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "tháng"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr "giây"
+
 #: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "chỉ chọn thư mục"
@@ -11208,6 +11151,10 @@ msgstr "thời điểm bạn chọn"
 msgid "vFolder Sources"
 msgstr "Nguồn VFolder"
 
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "tuần"
+
 #: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "với mọi thư mục hoạt động từ xa"
@@ -11220,6 +11167,10 @@ msgstr "với mọi thư mục hoạt động từ xa và thư mục cục bộ"
 msgid "with all local folders"
 msgstr "với mọi thư mục cục bộ"
 
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "năm"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11242,225 +11193,226 @@ msgid "Beep"
 msgstr "Bíp"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "chứa"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Chép vào thư mục"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Ngày nhận"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Ngày gửi"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Đã xóa"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "không chứa"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "không kết thúc bằng"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "không tồn tại"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not return"
+msgstr "không trả về"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "không giống với"
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "không bắt đầu bằng"
+
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Không tồn tại"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Nháp"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "kết thúc bằng"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Tồn tại"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "tồn tại"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Biểu thức"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1778
+#: filter/libfilter-i18n.h:27
+msgid "is"
+msgstr "bằng"
+
+#: filter/libfilter-i18n.h:28
+msgid "is after"
+msgstr "sau"
+
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr "trước"
+
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
+msgstr "được đặt cờ"
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "lớn hơn"
+
+#: filter/libfilter-i18n.h:32
+msgid "is less than"
+msgstr "nhỏ hơn"
+
+#: filter/libfilter-i18n.h:33
+msgid "is not"
+msgstr "không phải"
+
+#: filter/libfilter-i18n.h:34
+msgid "is not Flagged"
+msgstr "không được đặt cờ"
+
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 msgid "Label"
 msgstr "Nhãn"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Mailing list"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Thân thông điệp"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Đầu thông điệp"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Chuyển vào thư mục"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 msgid "Pipe Message to Shell Command"
 msgstr "Gửi thông điệp cho lệnh shell qua ống dẫn"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr "Phát âm thanh"
 
-#: 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 "Đọc"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Người nhận"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Khớp Regex"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Trả lời cho"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/libfilter-i18n.h:46
+msgid "returns"
+msgstr "trả về"
+
+#: filter/libfilter-i18n.h:47
+msgid "returns greater than"
+msgstr "trả về lớn hơn"
+
+#: filter/libfilter-i18n.h:48
+msgid "returns less than"
+msgstr "trả về nhỏ hơn"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Điểm"
 
-#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1809
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "Người gửi"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Đặt trạng thái"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:52
 msgid "Shell Command"
 msgstr "Lệnh shell"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Kích thước (kB)"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "giống như"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Tài khoản nguồn"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Header xác định"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "bắt đầu bằng"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Dừng tiến trình"
 
-#: 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 "Chủ đề"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:61
 msgid "Unset Status"
 msgstr "Bỏ đặt trạng thái"
 
-#: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "chứa"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "không chứa"
-
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr "không kết thúc bằng"
-
-#: filter/libfilter-i18n.h:43
-msgid "does not exist"
-msgstr "không tồn tại"
-
-#: filter/libfilter-i18n.h:44
-msgid "does not return"
-msgstr "không trả về"
-
-#: filter/libfilter-i18n.h:45
-msgid "does not sound like"
-msgstr "không giống với"
-
-#: filter/libfilter-i18n.h:46
-msgid "does not start with"
-msgstr "không bắt đầu bằng"
-
-#: filter/libfilter-i18n.h:47
-msgid "ends with"
-msgstr "kết thúc bằng"
-
-#: filter/libfilter-i18n.h:48
-msgid "exists"
-msgstr "tồn tại"
-
-#: filter/libfilter-i18n.h:49
-msgid "is Flagged"
-msgstr "được đặt cờ"
-
-#: filter/libfilter-i18n.h:50
-msgid "is after"
-msgstr "sau"
-
-#: filter/libfilter-i18n.h:51
-msgid "is before"
-msgstr "trước"
-
-#: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "lớn hơn"
-
-#: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "nhỏ hơn"
-
-#: filter/libfilter-i18n.h:54
-msgid "is not Flagged"
-msgstr "không được đặt cờ"
-
-#: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "không phải"
-
-#: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "bằng"
-
-#: filter/libfilter-i18n.h:57
-msgid "returns greater than"
-msgstr "trả về lớn hơn"
-
-#: filter/libfilter-i18n.h:58
-msgid "returns less than"
-msgstr "trả về nhỏ hơn"
-
-#: filter/libfilter-i18n.h:59
-msgid "returns"
-msgstr "trả về"
-
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr "giống như"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "bắt đầu bằng"
+#: 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 "Tên quy tắt '%s' bị trùng, hãy chọn tên khác."
 
 #: filter/rule-editor.c:170
 msgid "Rules"
 msgstr "Quy tắc"
 
-#: filter/rule-editor.c:241 filter/rule-editor.c:325
-#, c-format
-msgid "Rule name '%s' is not unique, choose another."
-msgstr "Tên quy tắt '%s' bị trùng, hãy chọn tên khác."
-
 #: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Thêm quy tắc"
@@ -11485,48 +11437,48 @@ msgstr "Bạn phải đặt tên cho vfolder này."
 msgid "You need to to specify at least one folder as a source."
 msgstr "Bạn cần chọn ít nhất một thư mục làm nguồn."
 
-#: filter/vfolder-rule.c:492
+#: filter/vfolder-rule.c:499
 msgid "VFolder source"
 msgstr "Nguồn VFolder"
 
-#: importers/elm-importer.c:95 mail/importers/elm-importer.c:103
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution đang nhập các thư cũ (dạng Elm)"
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101 mail/importers/elm-importer.c:104
-#: mail/importers/netscape-importer.c:1237 mail/importers/pine-importer.c:114
+#: 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 "Đang nhập..."
 
 #: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103 mail/importers/elm-importer.c:106
-#: mail/importers/netscape-importer.c:1239 mail/importers/pine-importer.c:116
+#: 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 "Vui lòng chờ"
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365 mail/importers/elm-importer.c:183
-#: mail/importers/netscape-importer.c:1794 mail/importers/pine-importer.c:330
+#: 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 "Đang nhập %s như là %s"
 
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471 mail/importers/elm-importer.c:389
-#: mail/importers/netscape-importer.c:1906 mail/importers/pine-importer.c:439
+#: 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 "Đang quét %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 mail/importers/elm-importer.c:523
-#: mail/importers/netscape-importer.c:2104 mail/importers/pine-importer.c:586
+#: 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 "Thư"
 
-#: importers/elm-importer.c:545 mail/importers/elm-importer.c:544
+#: 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 +11486,7 @@ msgstr ""
 "Evolution đã tìm thấy các tập tin thư dạng Elm.\n"
 "Bạn có muốn nhập nó vào Evolution?"
 
-#: importers/elm-importer.c:574 mail/importers/elm-importer.c:565
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -11546,12 +11498,12 @@ msgstr ""
 "Evolution đã tìm thấy những tập tin GnomeCard.\n"
 "Bạn có muốn nhập nó vào Evolution?"
 
-#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:74
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Bộ lọc ưu tiên \"%s\""
 
-#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:662
+#: 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"
@@ -11566,7 +11518,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:686
+#: 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"
@@ -11574,7 +11526,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:703
+#: 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"
@@ -11583,39 +11535,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1236
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution đang nhập các dữ liệu cũ từ Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1861
+#: 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 "Rác"
 
-#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:2014
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Đang quét bộ lọc thư"
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
-#: mail/importers/netscape-importer.c:2025 mail/importers/pine-importer.c:534
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
 msgid "Scanning directory"
 msgstr "Đang quét thư mục"
 
-#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2034
-#: 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 "Đang nhập"
 
-#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2109
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
 msgid "Settings"
 msgstr "Thiết lập"
 
-#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2114
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
 msgid "Mail Filters"
 msgstr "Bộ lọc thư"
 
-#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2138
+#: 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?"
@@ -11623,11 +11575,11 @@ msgstr ""
 "Evolution đã tìm thấy những tập tin thư dạng Netscape.\n"
 "Bạn có muốn nhập chúng vào Evolution?"
 
-#: importers/pine-importer.c:100 mail/importers/pine-importer.c:113
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution đang nhập dữ liệu cũ từ Pine"
 
-#: importers/pine-importer.c:663 mail/importers/pine-importer.c:613
+#: 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?"
@@ -11635,7 +11587,7 @@ msgstr ""
 "Evolution tìm thấy các tập tin Pine.\n"
 "Bạn có muốn nhập chúng vào Evolution?"
 
-#: importers/pine-importer.c:691 mail/importers/pine-importer.c:632
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
 msgid "Pine"
 msgstr "Pine"
 
@@ -11644,59 +11596,68 @@ msgid "Composer Preferences"
 msgstr "Thông số bộ soạn thảo"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Điều khiển cấu hình cho Font hiển thị Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Điều khiển cấu hình cho Tài khoản Thư tín Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Điều khiển cấu hình cho Evolution Mailer."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Điều khiển cấu hình cho Bộ soạn thảo thông điệp Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Cấu hình thông số thư tín, bao gồm tính bảo mật và hiển thị thông điệp, ở "
 "đây."
 
-#: 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 "Cấu hình kiểm tra chính tả, chữ ký, và bộ soạn thảo thông điệp ở đây"
 
-#: 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 "Cấu hình font được dùng bởi Evolution ở đây"
 
-#: 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 "Cấu hình tài khoản thư ở đây"
 
+#: 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 "Factory Điều khiển cấu hình Tóm tắt Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Bộ soạn thư của Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Bộ soạn thư của Evolution."
+
 #: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Thành phần xử lý thư của Evolution."
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution mail composer."
-msgstr "Bộ soạn thư của Evolution."
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Giao diện cấu hình mail."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Thành phần tóm tắt thư của Evolution."
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Thành phần hiển thị thư mục của Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Thành phần hiển thị thư mục của Evolution."
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "Factory for the controls exported by the Evolution Mailer"
-msgstr "Factory Điều khiển được xuất bởi Evolution Mailer"
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Thành phần tóm tắt thư của Evolution."
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:15
 msgid "Font Preferences"
@@ -11706,47 +11667,43 @@ msgstr "Thông số font"
 msgid "Mail Accounts"
 msgstr "Tài khoản thư"
 
-#: 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 "Thông số thư"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:18
-msgid "Mail configuration interface"
-msgstr "Giao diện cấu hình mail."
-
-#: mail/component-factory.c:113
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "Thư mục đang chứa thư"
 
-#: mail/component-factory.c:114
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "Thư công cộng"
 
-#: mail/component-factory.c:114
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "Thư mục công cộng chứa thư"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "Thùng rác ảo"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "Thư mục Thùng rác ảo"
 
-#: mail/component-factory.c:143
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "Thư mục này chứa các thông điệp."
 
-#: mail/component-factory.c:437
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "Thuộc tính..."
 
-#: mail/component-factory.c:437
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "Thay đổi thuộc tính thư mục này"
 
-#: 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."
@@ -11754,68 +11711,56 @@ msgstr ""
 "Một vài thiết lập về thư của bạn đã bị hỏng, vui lòng kiểm tra để chắc chắn "
 "rằng mọi thứ vẫn hoạt động."
 
-#: mail/component-factory.c:988
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "Bạn chưa thiết lập phương thức vận chuyển thư."
 
-#: mail/component-factory.c:1012
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Bạn có vài thông điệp chưa gửi, bạn vẫn muốn thoát chứ?"
 
-#: mail/component-factory.c:1052
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "Thông điệp thư mới"
 
-#: mail/component-factory.c:1052
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "Thông điệp thư"
 
-#: mail/component-factory.c:1053
+#: mail/component-factory.c:1061
 msgid "Compose a new mail message"
 msgstr "Biên soạn thông điệp mới"
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1069
 msgid "New Message Post"
 msgstr "Tạo thông báo mới"
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1069
 msgid "_Post Message"
 msgstr "_Gửi thông điệp"
 
-#: mail/component-factory.c:1062
+#: mail/component-factory.c:1070
 msgid "Post a new mail message"
 msgstr "Gửi thông điệp thư mới"
 
-#: mail/component-factory.c:1090
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Không thể khởi động thành phần thư của Evolution."
-
-#: mail/component-factory.c:1099
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Không thể khởi động thành phần cấu hình thư của Evolution"
-
-#: mail/component-factory.c:1105
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Không thể khởi động thành phần thông tin thư mục của Evolution."
-
-#: mail/component-factory.c:1349 mail/component-factory.c:1379
+#: mail/component-factory.c:1353
 msgid "Connecting..."
 msgstr "Đang kết nối..."
 
-#: mail/component-factory.c:1390
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "Không thể đăng ký kho lưu với shell"
 
-#: mail/folder-browser-ui.c:483
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Thuộc tính của \"%s\""
 
-#: mail/folder-browser-ui.c:485
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:920
+#: 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 "Không thể tạo thư mục tạm: %s"
@@ -11860,129 +11805,129 @@ msgstr "đã gửi %d"
 msgid "%d total"
 msgstr "tổng cộng %d"
 
-#: mail/folder-browser.c:1167
+#: mail/folder-browser.c:1182
 msgid "Create _Virtual Folder From Search..."
 msgstr "Tạo thư mục ả_o từ kết quả tìm kiếm..."
 
-#: mail/folder-browser.c:1714
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "VFolder trên _chủ đề"
 
-#: mail/folder-browser.c:1715
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "VFolder trên _người gửi"
 
-#: mail/folder-browser.c:1716
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "VFolder trên n_gười nhận"
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "VFolder trên Mailing _List"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "Lọc theo _chủ đề"
 
-#: mail/folder-browser.c:1722
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "Lọc theo _người gửi"
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "Lọc theo n_gười nhận"
 
-#: 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 "Lọc _Mailing list"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "_Hiệu chỉnh như thông điệp mới..."
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "_In"
 
-#: 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 "T_rả lời người gửi"
 
-#: 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 "Trả lời _danh sách"
 
-#: 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 "Trả lời _mọi người"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "_Chuyển tiếp"
 
-#: 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 "Xó_a cờ"
 
 #. 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 "Đánh dấu đã đọ_c"
 
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1777
 msgid "Mark as _Unread"
 msgstr "Đánh dấu c_hưa đọc"
 
-#: mail/folder-browser.c:1763
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "Đánh dấu _quan trọng"
 
-#: mail/folder-browser.c:1764
+#: mail/folder-browser.c:1779
 msgid "_Mark as Unimportant"
 msgstr "Đánh dấu _Không quan trọng"
 
-#: 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 "_Chuyển tới thư mục..."
 
-#: 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 "C_hép vào thư mục..."
 
-#: mail/folder-browser.c:1782
+#: mail/folder-browser.c:1797
 msgid "Add Sender to Address_book"
 msgstr "Thêm người _gửi vào sổ địa chỉ"
 
-#: mail/folder-browser.c:1786
+#: mail/folder-browser.c:1801
 msgid "Appl_y Filters"
 msgstr "Áp dụng _bộ lọc"
 
-#: mail/folder-browser.c:1790
+#: mail/folder-browser.c:1805
 msgid "Crea_te Rule From Message"
 msgstr "Tạo _quy tắc từ thông điệp"
 
-#: mail/folder-browser.c:2049
+#: mail/folder-browser.c:2064
 msgid "VFolder on M_ailing List"
 msgstr "VFolder trên M_ailing List"
 
-#: mail/folder-browser.c:2051
+#: mail/folder-browser.c:2066
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Bộ lọc trên _Mailing List (%s)"
 
-#: mail/folder-browser.c:2052
+#: mail/folder-browser.c:2067
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VFolder trên M_ailing List (%s)"
@@ -11995,21 +11940,37 @@ msgstr "Mặc định"
 msgid "Getting Folder Information"
 msgstr "Đang lấy thông tin thư mục"
 
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Bộ soạn thư của 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 "Bộ soạn thư của Evolution."
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "Nhập các tập tin mbox vào 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 "Bộ soạn thư của Evolution."
 
 #: 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"
-msgstr "Nhập tập tin Outlook Express 4 vào 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 "Bộ soạn thư của Evolution."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -12055,55 +12016,55 @@ msgstr "Bạn chưa điền đủ các thông tin yêu cầu."
 msgid "Evolution Account Editor"
 msgstr "Bộ hiệu chỉnh tài khoản"
 
-#: mail/mail-account-gui.c:744 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Máy chủ:"
 
-#: mail/mail-account-gui.c:748 mail/mail-config.glade.h:126
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Tên người dùng:"
 
-#: mail/mail-account-gui.c:752 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "Đường _dẫn:"
 
-#: mail/mail-account-gui.c:1868
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr "Bạn không thể tạo hai tài khoản trùng tên."
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr "Bạn có muốn xóa tài khoản này?"
 
-#: mail/mail-accounts.c:230
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "Không xóa"
 
-#: mail/mail-accounts.c:303 mail/mail-accounts.c:341
-#: mail/mail-composer-prefs.c:651 mail/mail-composer-prefs.c:669
+#: 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 "Tắt"
 
-#: mail/mail-accounts.c:303 mail/mail-accounts.c:343
-#: mail/mail-composer-prefs.c:651 mail/mail-composer-prefs.c:669
+#: 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 "Bật"
 
 #. translators: default account indicator
-#: mail/mail-accounts.c:383
+#: mail/mail-accounts.c:433
 msgid "[Default]"
 msgstr "[Mặc định]"
 
-#: mail/mail-accounts.c:427 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:812
+#: 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 "Bật"
 
-#: mail/mail-accounts.c:432 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Tên tài _khoản:"
 
-#: mail/mail-accounts.c:434 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Giao thức"
 
@@ -12144,11 +12105,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 "Đừng hiện thông báo này lần nữa."
 
-#: 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"
@@ -12160,7 +12121,7 @@ msgstr ""
 "nhận hoặc biên soạn thư.\n"
 "Bán có muốn cấu hình ngay bây giờ không?"
 
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:211
 msgid ""
 "You need to configure an account\n"
 "before you can compose mail."
@@ -12168,7 +12129,7 @@ msgstr ""
 "Bạn cần cấu hình một tài khoản trước\n"
 "khi có thể biên soạn thư."
 
-#: mail/mail-callbacks.c:227
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -12176,7 +12137,7 @@ msgstr ""
 "Bạn cần cấu hình thực thể trước khi\n"
 "có thể biên soạn thư."
 
-#: mail/mail-callbacks.c:234
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -12185,7 +12146,7 @@ msgstr ""
 "khi có thể biên soạn thư."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:256
+#: 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"
@@ -12193,11 +12154,11 @@ msgstr ""
 "Bạn đang gửi một lá thư dùng dạng thức HTML. Vui lòng đảm bảo rằng những\n"
 "người nhận sau có thể nhận thư HTML:\n"
 
-#: mail/mail-callbacks.c:268
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "Gửi bất cứ giá nào?"
 
-#: mail/mail-callbacks.c:289
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12205,7 +12166,7 @@ msgstr ""
 "Thông điệp này chưa có chủ đề.\n"
 "Bạn thật sự muốn gửi chứ?"
 
-#: mail/mail-callbacks.c:315
+#: 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,11 +12174,11 @@ msgstr ""
 "Vì danh sách liên lạc bạn đang gửi được cấu hình để ẩn các địa chỉ trong "
 "danh sách, thông điệp này sẽ chỉ điền người nhận vào trường Bcc."
 
-#: mail/mail-callbacks.c:319
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr "Thông điệp chỉ có người nhận trong 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"
@@ -12227,11 +12188,11 @@ msgstr ""
 "Apparently-To.\n"
 "Gửi bất kỳ giá nào?"
 
-#: mail/mail-callbacks.c:458
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr "Bạn phải chọn người nhận để có thể gửi thông điệp này."
 
-#: mail/mail-callbacks.c:713
+#: 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?"
@@ -12239,49 +12200,49 @@ msgstr ""
 "Không thể mở thư mục Nháp cho tài khoản này.\n"
 "Bạn có muốn dùng thư mục Nháp mặc định?"
 
-#: mail/mail-callbacks.c:1178
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "người gửi lạ"
 
-#: mail/mail-callbacks.c:1182
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Vào ngày %a, %d/%m/%Y lúc %H:%M, %s viết rằng:"
 
-#: mail/mail-callbacks.c:1689 mail/message-browser.c:143
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
 msgid "Move message(s) to"
 msgstr "Chuyển thông điệp tới"
 
-#: mail/mail-callbacks.c:1691 mail/message-browser.c:145
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
 msgid "Copy message(s) to"
 msgstr "Chép thông điệp vào"
 
-#: mail/mail-callbacks.c:2335
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Bạn có chắc muốn sửa tất cả %d thông điệp?"
 
-#: mail/mail-callbacks.c:2351
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr "Bạn chỉ có thể sửa những thông điệp trong thư mục Nháp."
 
-#: mail/mail-callbacks.c:2384
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr "Bạn chỉ có thể gửi lại những thông điệp trong thư mục Đã gửi"
 
-#: mail/mail-callbacks.c:2394
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Bạn có chắc muốn gửi lại %d thông điệp?"
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "Chưa chọn thông điệp"
 
-#: mail/mail-callbacks.c:2456
+#: mail/mail-callbacks.c:2465
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12290,7 +12251,7 @@ msgstr ""
 "Không thể lưu vào `%s'\n"
 "  %s"
 
-#: mail/mail-callbacks.c:2461
+#: mail/mail-callbacks.c:2470
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12299,15 +12260,15 @@ msgstr ""
 "`%s' đã tồn tại.\n"
 "Bạn có muốn ghi đè lên nó không?"
 
-#: mail/mail-callbacks.c:2502
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "Lưu thông điệp là..."
 
-#: mail/mail-callbacks.c:2504
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "Lưu thông điệp là..."
 
-#: mail/mail-callbacks.c:2672
+#: 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"
@@ -12319,7 +12280,7 @@ msgstr ""
 "\n"
 "Bạn có thật sự muốn xóa những thông điệp này không?"
 
-#: mail/mail-callbacks.c:2758
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12328,63 +12289,59 @@ msgstr ""
 "Lỗi khi nạp thông tin bộ lọc:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2766
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Bộ lọc"
 
-#: mail/mail-callbacks.c:2808
+#: mail/mail-callbacks.c:2831
 #, c-format
 msgid "Page %d of %d"
 msgstr "Trang %d trên %d"
 
-#: mail/mail-callbacks.c:2864
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "In thông điệp"
 
-#: mail/mail-callbacks.c:2931
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "Quá trình in thông điệp thất bại"
 
-#: mail/mail-callbacks.c:3121
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Bạn có chắc muốn mở tất cả %d thông điệp trong những cửa sổ riêng biệt không?"
 
-#: mail/mail-composer-prefs.c:227
-msgid ""
-"Please specify signature filename\n"
-"in Advanced section of signature settings."
-msgstr ""
-"Vui lòng xác định tên tập tin chữ ký\n"
-"trong phần Nâng cao của Thiết lập Chữ ký."
-
-#: mail/mail-composer-prefs.c:246 mail/mail-composer-prefs.c:248
-#: mail/mail-composer-prefs.c:377 mail/mail-composer-prefs.c:432
-msgid "[script]"
-msgstr "[script]"
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
+msgid "Unnamed"
+msgstr "Vô danh"
 
-#: mail/mail-composer-prefs.c:321
+#: mail/mail-composer-prefs.c:335
 msgid "You must specify a valid script name."
 msgstr "Bạn phải xác định tên script hợp lệ."
 
-#: mail/mail-composer-prefs.c:336 mail/mail-config.c:1283
-msgid "Unnamed"
-msgstr "Vô danh"
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
+msgid "[script]"
+msgstr "[script]"
 
-#: mail/mail-composer-prefs.c:816
+#: mail/mail-composer-prefs.c:864
 msgid "Language(s)"
 msgstr "Ngôn ngữ"
 
-#: mail/mail-composer-prefs.c:860
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr "Thêm chữ ký tay"
 
-#: mail/mail-composer-prefs.c:879
+#: mail/mail-composer-prefs.c:926
 msgid "Signature(s)"
 msgstr "Chữ ký"
 
-#: mail/mail-config-druid.c:147
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr "Thực thể"
+
+#: 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 "
@@ -12394,7 +12351,12 @@ msgstr ""
 "dưới không cần phải được chọn, trừ khi bạn muốn gộp thông tin vào email bạn "
 "cần gửi."
 
-#: mail/mail-config-druid.c:149
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "_Nhận thư"
+
+#: 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."
@@ -12402,11 +12364,16 @@ msgstr ""
 "Vui lòng nhập thông tin về server nhận thư (incoming mail server) bên dưới. "
 "Nếu bạn không chắc, hãy hỏi quản trị hệ thống hoặc ISP của bạn."
 
-#: mail/mail-config-druid.c:151
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Vui lòng chọn từ các tuỳ chọn sau"
 
-#: mail/mail-config-druid.c:153
+#: mail/mail-config-druid.c:400
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Đan_g gửi thư"
+
+#: 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."
@@ -12414,7 +12381,11 @@ msgstr ""
 "Vui lòng nhập thông tin về cách bạn gửi thư. Nếu bạn không chắc, hãy hỏi "
 "quản trị hệ thống hoặc ISP của bạn."
 
-#: mail/mail-config-druid.c:155
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "Bộ quản lý tài khoản"
+
+#: 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 "
@@ -12427,16 +12398,11 @@ msgstr ""
 "tạo nên một tài khoản thư tín Evolution. Vui lòng nhập tên tài khoản này vào "
 "khoảng trắng dưới đây. Tên này sẽ chỉ được dùng để hiển thị thôi."
 
-#. set window title
-#: mail/mail-config-druid.c:645
-msgid "Evolution Account Assistant"
-msgstr "Phụ tá tài khoản Evolution"
-
-#: mail/mail-config.c:987
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "Đang kiểm tra dịch vụ"
 
-#: mail/mail-config.c:1065 mail/mail-config.c:1069
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 msgid "Connecting to server..."
 msgstr "Đang kết nối tới server..."
 
@@ -12464,10 +12430,6 @@ msgstr "Bộ hiệu chỉnh tài khoản"
 msgid "Account Information"
 msgstr "Thông tin tài khoản"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "Bộ quản lý tài khoản"
-
 #: mail/mail-config.glade.h:11
 msgid "Add Sc_ript"
 msgstr "Thêm _script"
@@ -12591,7 +12553,7 @@ msgstr "Không trích dẫn thông điệp gốc"
 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 "Xong"
 
@@ -12620,220 +12582,221 @@ msgid "Empty _trash folders on exit"
 msgstr "_Xóa thư mục Rác khi thoát"
 
 #: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr "Phụ tá tài khoản Evolution"
+
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Thực hiện lệnh..."
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Độ rộng _cứng:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Font Properties"
 msgstr "Thuộc tính font"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Format messages in _HTML"
 msgstr "Định dạng thông điệp bằng _HTML"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr "Lấy ID số..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Điểm sang _trích dẫn bằng"
 
-#: 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 "Thực thể"
-
-#: 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 "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Nhãn và màu"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Đang nạp ảnh"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Cấu hình thư"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Địa điểm hộp thư"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Bộ soạn thảo thông điệp"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Hiển thị thông điệp"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "Thông điệp chứa"
+
+#: 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 ""
 
-#: 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 "Font màn hình"
-
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Thông tin tùy chọn"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Or_ganization:"
 msgstr "Tổ _chức:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr "_Khóa ID PGP/GPG:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Chọn màu"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "_Nhắc khi gửi thư mà chỉ có người nhận _Bcc"
 
-#: 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 "Font in"
 
-#: 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 "Trích dẫn thông điệp gốc"
 
-#: 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 "_Nhớ mật khẩu này"
 
-#: 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 "Đang nhận email"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "Receiving _Options"
 msgstr "Tùy chọn _nhận"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "Remember this _password"
 msgstr "_Nhớ mật khẩu này"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "Thông tin yêu cầu"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "Restore Defaults"
 msgstr "Phục hồi mặc định"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "S_ecurity"
 msgstr "_Bảo mật"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME bảo mật (S/MIME)"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr "Chọn font HTML độ rộng cứng"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr "Chọn font html độ rộng cứng để in"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr "Chọn font HTML độ rộng thay đổi"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr "Chọn font HTML độ rộng thay đổi để in"
 
-#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
 msgstr "Đang gửi email"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "Thư mục thông điệp đã gửi:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "Thông điệp đã gửi và thông điệp nháp"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver yêu cầu xác thực"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Cấu hình server"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "_Kiểu server:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "Shortcuts _type:"
 msgstr "Loại lối _tắt:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "Specify _filename:"
 msgstr "Xác định _tên tập tin:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr "_Kiểm tra chính tả"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
 msgstr "Dạng thức Unix mbox chuẩn"
 
-#: 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"
@@ -12843,7 +12806,7 @@ msgstr ""
 "Tên bạn xác định sẽ chỉ được dùng cho mục đích\n"
 "hiển thị."
 
-#: 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 "
@@ -12852,7 +12815,7 @@ msgstr ""
 "Trang này cho phép bạn cấu hình hành vi kiểm tra chính tả và ngôn ngữ để "
 "kiểm tra. Danh sách ngôn ngữ phản ánh chỉ những ngôn ngữ bạn có cài đặt."
 
-#: 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\""
@@ -12860,11 +12823,11 @@ msgstr ""
 "Gõ tên mà bạn muốn dùng cho tài khoản này.\n"
 "Ví dụ: \"Work\" hoặc \"Personal\""
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "Độ rộng _thay đổi:"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12874,70 +12837,66 @@ msgstr ""
 "\n"
 "Hãy nhấn \"Kế tiếp\" để bắt đầu."
 
-#: 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 "Thêm chữ _ký"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Luôn nạp ảnh từ mạng"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Luôn ký tên lên các thư cần gửi khi dùng tài khoản này"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Loại xác thực: "
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Loại xác thực: "
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
 msgstr "_Tự động kiểm tra có thư mới"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Tự động chèn ảnh smiley"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Kêu bíp khi có thư mới"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "_ID Chứng nhận:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr "_Xác nhận khi xóa thư mục"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:146
 msgid "_Default signature:"
 msgstr "_Chữ ký mặc định:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:147
 msgid "_Defaults"
 msgstr "_Mặc định"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr "Đừn_g thông báo khi có thư mới"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:151
 msgid "_Enable"
 msgstr "_Bật"
 
-#: mail/mail-config.glade.h:151
-msgid "_Fixed-width:"
-msgstr "Độ rộng _cứng:"
-
 #: mail/mail-config.glade.h:152
 msgid "_Forward style:"
 msgstr "Phong cách _chuyển tiếp:"
@@ -13015,22 +12974,32 @@ msgid "_Signatures"
 msgstr "_Chữ ký"
 
 #: mail/mail-config.glade.h:174
-msgid "_Use secure connection (SSL):"
-msgstr "Dùng kết nối _an toàn (SSL):"
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "Sand Point"
 
 #: mail/mail-config.glade.h:175
-msgid "_Variable-width:"
-msgstr "Độ rộng _thay đổi:"
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "Liên lạc gốc:"
 
 #: mail/mail-config.glade.h:176
+msgid "_Use secure connection (SSL):"
+msgstr "Dùng kết nối _an toàn (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 "_mỗi"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr "màu"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "mô tả"
 
@@ -13063,10 +13032,6 @@ msgstr ""
 "Tập tin `%s' đã có rồi.\n"
 "Ghi đè tập tin này không?"
 
-#: mail/mail-display.c:196
-msgid "Overwrite file?"
-msgstr "Ghi đè tập tin?"
-
 #: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Lưu đồ đính kèm"
@@ -13102,35 +13067,35 @@ msgstr "Ẩn"
 msgid "External Viewer"
 msgstr "Trình xem ngoại"
 
-#: mail/mail-display.c:1346
+#: mail/mail-display.c:1365
 msgid "Downloading images"
 msgstr "Đang tải ảnh về"
 
-#: mail/mail-display.c:1523
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "Đang nạp nôi dung thông điệp"
 
-#: mail/mail-display.c:1860
+#: mail/mail-display.c:1879
 msgid "Overdue:"
 msgstr "Quá hạn:"
 
-#: mail/mail-display.c:1864
+#: mail/mail-display.c:1883
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "bởi %d %B, %Y, %l:%M %P"
 
-#: mail/mail-display.c:2215
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "Mở liên kết bằng trình duyệt"
 
-#: mail/mail-display.c:2216
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "Sao chép vị trí liên kết"
 
-#: mail/mail-display.c:2218
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "Chép liên kết là (CẦN SỬA)"
 
-#: mail/mail-display.c:2220
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "Lưu ảnh là..."
 
@@ -13139,13 +13104,13 @@ msgstr "Lưu ảnh là..."
 msgid "Pinging %s"
 msgstr "Đang \"ping\" %s"
 
-#: mail/mail-format.c:639
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr "%s đồ đính kèm"
 
-#: mail/mail-format.c:681 mail/mail-format.c:1334 mail/mail-format.c:1403
-#: mail/mail-format.c:1523 mail/mail-format.c:1647 mail/mail-format.c:1672
+#: 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 "Không thể phân tích thông điệp MIME. Đang hiện thị mã thô."
 
@@ -13153,74 +13118,74 @@ msgstr "Không thể phân tích thông điệp MIME. Đang hiện thị mã th�
 msgid "Date"
 msgstr "Ngày"
 
-#: mail/mail-format.c:843
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr "Địa chỉ sai"
 
-#: 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 "Từ"
 
-#: mail/mail-format.c:888
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Trả lời cho"
 
-#: 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 "Tới"
 
-#: 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:1446
+#: mail/mail-format.c:1451
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr "Thông điệp này dùng chữ ký số. Nhấn biểu tượng khóa để biết thêm."
 
-#: mail/mail-format.c:1474
+#: mail/mail-format.c:1479
 msgid "Could not create a PGP verfication context"
 msgstr "Không thể tạo ngữ cảnh xác minh PGP"
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1487
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Thông điệp này dùng chữ ký số và đã được xác thực."
 
-#: mail/mail-format.c:1489
+#: mail/mail-format.c:1494
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Thông điệp này dùng chữ ký số nhưng không thể được xác thực."
 
-#: mail/mail-format.c:1753
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Trỏ tới địa chỉ FTP (%s)"
 
-#: mail/mail-format.c:1764
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Trỏ tới tập tin cục bộ hợp lệ (%s) tại địa chỉ \"%s\""
 
-#: mail/mail-format.c:1767
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Trỏ tới tập tin cục bộ (%s)"
 
-#: mail/mail-format.c:1794
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Trỏ tới tập tin từ xa (%s)"
 
-#: mail/mail-format.c:1800
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Trỏ tới dữ liệu lạ bên ngoài (kiểu \"%s\")"
 
-#: mail/mail-format.c:1802
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -13393,7 +13358,7 @@ msgstr "Đang nhận %d thông điệp"
 msgid "Saving %d messsage(s)"
 msgstr "Đang lưu %d thông điệp"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13402,7 +13367,7 @@ msgstr ""
 "Không thể tạo tập tin output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13411,11 +13376,11 @@ msgstr ""
 "Lỗi khi lưu thông điệp vào: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "Đang lưu đồ đính kèm"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13424,58 +13389,54 @@ msgstr ""
 "Không thể tạo tập tin output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Không thể ghi dữ liệu: %s"
 
-#: mail/mail-ops.c:2213
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Đang ngắt kết nối từ %s"
 
-#: mail/mail-ops.c:2213
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Đang tái kết nối tới %s"
 
-#: mail/mail-search-dialogue.c:120 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "_Tìm"
-
-#: mail/mail-search.c:130
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(Thông điệp không tựa)"
 
-#: mail/mail-search.c:221
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "Thông điệp không tựa"
 
-#: mail/mail-search.c:223
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "Thông điệp rỗng"
 
-#: mail/mail-search.c:271
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "Tìm trong thông điệp"
 
-#: mail/mail-search.c:274
+#: mail/mail-search.c:285
 msgid "Search"
 msgstr "Tìm"
 
-#: mail/mail-search.c:300
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "Phân biệt hoa/thường"
 
-#: mail/mail-search.c:302
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr "Tìm tới"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "Tìm:"
 
-#: mail/mail-search.c:325
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "Khớp:"
 
@@ -13527,20 +13488,20 @@ msgstr "Nhập mật khẩu cho %s"
 msgid "Enter Password"
 msgstr "Nhập mật khẩu"
 
-#: mail/mail-session.c:282
+#: mail/mail-session.c:280
 msgid "_Remember this password"
 msgstr "_Nhớ mật khẩu này"
 
-#: mail/mail-session.c:283
+#: mail/mail-session.c:281
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Nhớ mật khẩu này để nhắc nhở cho những lần sử dụng sau"
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-signature-editor.c:80
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Không thể lưu tập tin chữ ký: %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"
@@ -13550,36 +13511,36 @@ msgstr ""
 "\n"
 "Bạn có muốn lưu các thay đổi không?"
 
-#: mail/mail-signature-editor.c:179
+#: mail/mail-signature-editor.c:229
 msgid "_Discard changes"
 msgstr "_Hủy thay đổi"
 
-#: mail/mail-signature-editor.c:183
+#: mail/mail-signature-editor.c:233
 msgid "Save signature"
 msgstr "Lưu chữ ký"
 
-#: mail/mail-signature-editor.c:328
+#: mail/mail-signature-editor.c:389
 msgid "Edit signature"
 msgstr "Sửa chữ ký"
 
-#: mail/mail-signature-editor.c:366
+#: mail/mail-signature-editor.c:429
 msgid "Enter a name for this signature."
 msgstr "Nhập tên cho chữ ký này."
 
-#: mail/mail-signature-editor.c:369 my-evolution/e-summary-preferences.c:622
+#: mail/mail-signature-editor.c:432 my-evolution/e-summary-preferences.c:625
 msgid "Name:"
 msgstr "Tên:"
 
-#: mail/mail-tools.c:267
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Thông điệp chuyển tiếp - %s"
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "Thông điệp chuyển tiếp"
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "Thông điệp chuyển tiếp"
 
@@ -13602,7 +13563,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:777 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "VFolders"
 
@@ -13610,24 +13571,24 @@ msgstr "VFolders"
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:875
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Sửa VFolder"
 
-#: mail/mail-vfolder.c:893
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Đang thử hiệu chỉnh thư mục ảo '%s' - không tồn tại."
 
-#: mail/mail-vfolder.c:946
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "VFolder mới"
 
-#: mail/message-browser.c:219
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(Không chủ đề)"
 
-#: mail/message-browser.c:221
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Thông điệp"
@@ -13668,31 +13629,31 @@ msgstr "Cao hơn"
 msgid "Highest"
 msgstr "Cao nhất"
 
-#: 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 "Hôm nay %l:%M %p"
 
-#: mail/message-list.c:1092
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "Hôm qua %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 "%d %b %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:2602
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "Đang tạo danh sách thông điệp"
 
@@ -13786,12 +13747,12 @@ msgstr "Đến _hạn:"
 msgid "_Flag:"
 msgstr "_Cờ:"
 
-#: mail/subscribe-dialog.c:232
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Đang quét thư mục dưới %s trên \"%s\""
 
-#: mail/subscribe-dialog.c:234
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Đang quét thư mục gốc trên \"%s\""
@@ -13806,28 +13767,24 @@ msgstr "Đang đăng ký trên thư mục \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Đang bỏ đăng ký trên thư mục \"%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 "Thư mục"
 
-#: mail/subscribe-dialog.c:1427
+#: mail/subscribe-dialog.c:1389
 msgid "Scanning folders..."
 msgstr "Đang quét thư mục..."
 
-#: mail/subscribe-dialog.c:1549
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "Chưa chọn server"
 
-#: mail/subscribe-dialog.c:1624
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "Vui lòng chọn một server."
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "All folders"
-msgstr "Mọi thư mục"
-
-#: 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
@@ -13836,47 +13793,46 @@ msgstr "Mọi thư mục"
 msgid "Close"
 msgstr "Đóng"
 
-#: mail/subscribe-dialog.glade.h:6
-msgid "Display Options"
-msgstr "Tùy chọn hiển thị"
-
-#: mail/subscribe-dialog.glade.h:7
-msgid "Folders whose names begin with:"
-msgstr "Thư mục có tên bắt đầu bằng:"
-
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:4
 msgid "Manage Subscriptions"
 msgstr "Quản lý đăng ký"
 
-#: 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 "Cập nhật danh sách"
 
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:6
 msgid "S_elect server: "
 msgstr "_Chọn thư mục: "
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "Đăng _ký"
 
-#: mail/subscribe-dialog.glade.h:12
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "_Bỏ đăng ký"
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
-msgid "Configuration control for the Evolution Summary."
-msgstr "Điều khiển cấu hình cho Tóm tắt Evolution."
-
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Cấu hình diện mạo Tóm tắt Evolution ở đây"
 
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Summary"
+msgstr "Thành phần tóm tắt Evolution."
+
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
-msgid "Evolution Summary component."
+#, fuzzy
+msgid "Evolution Summary component"
 msgstr "Thành phần tóm tắt Evolution."
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
+
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 msgid "Summary Preferences"
 msgstr "Thông số Tóm tắt"
 
@@ -23669,32 +23625,33 @@ msgstr "Zurich"
 msgid "Folder containing the Evolution Summary"
 msgstr "Thư mục chứa Tóm tắt 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 "Cuộc hẹn"
 
-#: my-evolution/e-summary-calendar.c:378
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
 msgstr "Không có cuộc hẹn"
 
-#: 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 "Không có mô tả"
 
-#: my-evolution/e-summary-mail.c:156
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "Tóm tắt thư"
 
-#: 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 "Thư mục cục bộ"
 
@@ -23706,19 +23663,19 @@ msgstr "Dictionary.com Từ trong ngày"
 msgid "Quotes of the Day"
 msgstr "Trích dẫn trong ngày"
 
-#: 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 "Lỗi khi tải xuống RDF"
 
-#: my-evolution/e-summary-rdf.c:447
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr ""
 
@@ -23735,11 +23692,11 @@ msgstr "Thêm"
 msgid "Shown"
 msgstr "Đã hiển thị"
 
-#: my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "Không có công việc"
 
-#: my-evolution/e-summary-tasks.c:371
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(Không có mô tả)"
 
@@ -23747,11 +23704,11 @@ msgstr "(Không có mô tả)"
 msgid "My Weather"
 msgstr "Thời tiết của tôi"
 
-#: my-evolution/e-summary-weather.c:269
+#: my-evolution/e-summary-weather.c:262
 msgid "There was an error downloading data for"
 msgstr "Lỗi tải dữ liệu về cho"
 
-#: my-evolution/e-summary-weather.c:490
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr "Thời tiết"
 
@@ -23759,23 +23716,23 @@ msgstr "Thời tiết"
 #. 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, %B %e %Y"
 
-#: my-evolution/e-summary.c:512
+#: my-evolution/e-summary.c:523
 msgid "Please wait..."
 msgstr "Vui lòng chờ..."
 
-#: 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 "In tóm tắt"
 
-#: my-evolution/e-summary.c:624
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "Lỗi in tóm tắt"
 
@@ -25046,20 +25003,22 @@ msgid "_Weather"
 msgstr "_Thời tiết"
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configuration control for Evolution folder settings."
-msgstr "Điều khiển cấu hình cho thiết lập thư mục Evolution."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Configure special folders and offline folder behavior here"
 msgstr "Cấu hình thư mục đặc biệt và hành vi thư mục ngoại tuyến ở đây"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Vỏ bọc Evolution"
+
 #: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Folder Settings"
-msgstr "Thư lập thư mục"
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "The Evolution shell."
-msgstr "Vỏ bọc Evolution"
+msgid "Folder Settings"
+msgstr "Thư lập thư mục"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25078,7 +25037,7 @@ msgstr ""
 "Không thể chuyển thư mục:\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\" trong \"%s\""
@@ -25091,8 +25050,8 @@ msgstr "Thêm thư mục"
 msgid "Drafts"
 msgstr "Nháp"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:466
-#: shell/e-shell-view.c:470 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 "Thư mục nhận"
 
@@ -25104,11 +25063,11 @@ msgstr "Thư mục gửi"
 msgid "Sent"
 msgstr "Đã gửi"
 
-#: shell/e-setup.c:147
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "Không thể cập nhật tập tin một cách đúng đắn"
 
-#: shell/e-setup.c:168
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -25119,7 +25078,7 @@ msgstr ""
 "%s\n"
 "Lỗi: %s"
 
-#: shell/e-setup.c:179
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -25131,38 +25090,6 @@ msgstr ""
 #: shell/e-setup.c:244
 #, c-format
 msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Evolution không thể tạo thư mục\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 ""
-"Thư mục %s\n"
-"không có quyền truy cập cần thiết. Vui lòng gán quyền đọc và ghi cho thư mục "
-"rồi khởi động lại Evolution."
-
-#: 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 ""
-"Tập tin %s nên được loại bỏ để Evolution có thể làm việc đúng.\n"
-"Vui lòng gỡ bỏ tập tin này và khởi động lại Evolution."
-
-#: 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."
@@ -25171,7 +25098,7 @@ msgstr ""
 "Vui lòng chuyển nó sang chỗ khác để có thể cài đặt các tập tin người dùng "
 "của Evolution."
 
-#: shell/e-setup.c:300
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25205,47 +25132,47 @@ msgstr "Đang lọc thư mục"
 msgid "Autocompletion Folders"
 msgstr "Thư mục tự động hoàn chỉnh"
 
-#: shell/e-shell-folder-commands.c:141
+#: shell/e-shell-folder-commands.c:140
 #, c-format
 msgid "Cannot copy folder: %s"
 msgstr "Không thể sao chép thư mục: %s"
 
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
 #, c-format
 msgid "Cannot move folder: %s"
 msgstr "Không thể di chuyển thư mục: %s"
 
-#: shell/e-shell-folder-commands.c:189
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr "Không thể chuyển thư mục tới chính nó."
 
-#: shell/e-shell-folder-commands.c:191
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot copy a folder over itself."
 msgstr "Không thể chép thư mục vào chính nó."
 
-#: 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 "Không thể chuyển thư mục vào một trong những con cháu của nó."
 
-#: 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 "Xác định một thư mục để chép thư mục \"%s\" vào:"
 
-#: shell/e-shell-folder-commands.c:324
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr "Chép thư mục"
 
-#: 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 "Xác định một thư mục để chuyển thư mục \"%s\" tới:"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "Chuyển thư mục"
 
-#: shell/e-shell-folder-commands.c:392
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25254,17 +25181,17 @@ msgstr ""
 "Không thể xóa thư mục:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:406
+#: shell/e-shell-folder-commands.c:405
 #, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "Bạn thật sự muốn xóa thư mục \"%s\" chứ?"
 
-#: shell/e-shell-folder-commands.c:413
+#: shell/e-shell-folder-commands.c:412
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Xoá \"%s\""
 
-#: shell/e-shell-folder-commands.c:486
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25273,26 +25200,26 @@ msgstr ""
 "Không thể đổi tên thư mục:\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 "Đổi tên thư mục \"%s\" thành:"
 
-#: shell/e-shell-folder-commands.c:541
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr "Đổi tên thư mục"
 
-#: 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 "Tên thư mục xác định không hợp lệ: %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 ""
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:586
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25301,7 +25228,7 @@ msgstr ""
 "Không thể loại bỏ thư mục:\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"
@@ -25310,11 +25237,11 @@ msgstr ""
 "Không thể tạo thư mục đã cho:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:307
+#: shell/e-shell-folder-creation-dialog.c:308
 msgid "Create New Folder"
 msgstr "Tạo thư mục mới"
 
-#: 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 "(Không tựa)"
 
@@ -25336,7 +25263,7 @@ msgstr ""
 "Bạn có thể chọn \"Tự động\" nếu bạn không biết, và Evolution sẽ thử tự tìm "
 "cách hoạt động."
 
-#: 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 "Vui lòng chọn thông tin bạn muốn nhập:"
 
@@ -25349,7 +25276,7 @@ msgstr ""
 "Đang nhập %s\n"
 "Đang nhập mục %d."
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:351
 msgid "Select importer"
 msgstr "Chọn bộ nhập"
 
@@ -25359,7 +25286,7 @@ msgid "File %s does not exist"
 msgstr "Tập tin %s không tồn tại"
 
 #: 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 "Lỗi Evolution"
 
@@ -25390,12 +25317,12 @@ msgstr ""
 msgid "Error starting %s"
 msgstr "Lỗi khởi động %s"
 
-#: shell/e-shell-importer.c:556
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "Lỗi nạp %s"
 
-#: shell/e-shell-importer.c:573
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25404,31 +25331,31 @@ msgstr ""
 "Đang nhập %s\n"
 "Đang nhập mục 1."
 
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "Tự động"
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "Tên tập tin:"
 
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "Chọn tập tin"
 
-#: shell/e-shell-importer.c:690
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "Kiểu tập tin:"
 
-#: shell/e-shell-importer.c:715
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "Nhập dữ liệu và thiết lập từ chương trình cũ"
 
-#: shell/e-shell-importer.c:719
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "Nhập tập tin đơn"
 
-#: 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"
@@ -25436,28 +25363,28 @@ msgstr ""
 "Vui lòng chờ...\n"
 "Đang quét tìm thiết lập hiện có"
 
-#: shell/e-shell-importer.c:788
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "Đang khởi động bộ nhập thông minh"
 
-#: 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 "Từ %s:"
 
-#: shell/e-shell-importer.c:1082
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "Chọn thư mục"
 
-#: shell/e-shell-importer.c:1083
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "Chọn một thư mục đích để nhập dữ liệu này"
 
-#: 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 "Nhập"
 
-#: shell/e-shell-offline-handler.c:588
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "Đang đóng kết nối..."
 
@@ -25480,49 +25407,44 @@ msgstr "Đồng bộ thư mục"
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "Đang đồng bộ \"%s\" (%d trên %d) ..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:345
 msgid "Evolution Settings"
 msgstr "Thiết lập 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 "Vui lòng chọn một server."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 msgid "Opening Folder"
 msgstr "Đang mở thư mục"
 
-#: 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 "Đang mở thư mục \"%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 "trong \"%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 "Không thể mở thư mục chia sẽ: %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 "Không tìm thấy thư mục chia sẽ xác định."
 
-#: shell/e-shell-startup-wizard.c:158
-#, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-"Không thể khởi động giao diện Evolution Mailer Assistant\n"
-"(%s)"
-
-#: shell/e-shell-startup-wizard.c:169
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "Không thể khởi động giao diện Evolution Mailer Assistant\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 "Mới"
 
@@ -25535,10 +25457,16 @@ msgid "Folder name cannot contain the Return character."
 msgstr "Tên thư mục không thể chứa ký tự Enter"
 
 #: shell/e-shell-utils.c:129
-msgid "Folder name cannot contain slashes."
-msgstr "Tên thư mục không thể chứa ký tự '/'"
+#, fuzzy
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "Tên thư mục không thể chứa ký tự Enter"
 
 #: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "Tên thư mục không thể chứa ký tự Enter"
+
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' và '..' là hai tên thư mục đặc biệt, được dành riêng."
 
@@ -25579,49 +25507,49 @@ msgstr "Tạo lối tắt mới"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Chọn thư mục bạn muốn lối tắt chỉ đến:"
 
-#: shell/e-shell-view-menu.c:776
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr "_Trực tuyến"
 
-#: 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 "_Ngoại tuyến"
 
-#: 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 "Ngoại tuyến"
 
-#: shell/e-shell-view.c:233
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "(Chưa hiển thị thư mục)"
 
-#: 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 "(Không)"
 
-#: 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 ""
 "Ximian Evolution hiện thời đang trực tuyến. Nhấn nút này để chuyển sang "
 "ngoại tuyến."
 
-#: shell/e-shell-view.c:2049
+#: shell/e-shell-view.c:2098
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Volution đang trong tiến trình chuyển sang ngoại tuyến."
 
-#: 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 ""
 "Ximian Evolution đang ngoại tuyến. Nhấn nút này để chuyển sang trực tuyến."
 
-#: shell/e-shell.c:176
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25632,12 +25560,12 @@ msgstr ""
 "Lỗi từ hệ thống kích hoạt là:\n"
 "%s"
 
-#: shell/e-shell.c:756
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Không thể thiết lập kho lưu cục bộ -- %s"
 
-#: shell/e-shell.c:1829
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25648,19 +25576,19 @@ msgstr ""
 "dự kiến. Bạn sẽ kết thúc Evolution và khởi động lại để truy cập\n"
 "lại dữ liệu."
 
-#: shell/e-shell.c:2094
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "Đối số không hợp lệ"
 
-#: shell/e-shell.c:2096
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "Không thể đăng ký với OAF"
 
-#: shell/e-shell.c:2098
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "Không tìm thấy cơ sở dữ liệu cấu hình"
 
-#: shell/e-shell.c:2100 shell/e-storage.c:576
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Lỗi chung chung"
 
@@ -25789,59 +25717,59 @@ msgstr "Lối tắt"
 msgid "Checkbox"
 msgstr "Ô kiểm"
 
-#: shell/e-storage.c:574
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "Không có lỗi"
 
-#: shell/e-storage.c:578
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr "Thư mục cùng tên đã tồn tại"
 
-#: shell/e-storage.c:580
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr "Kiểu thư mục không hợp lệ"
 
-#: shell/e-storage.c:582
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "Lỗi I/O"
 
-#: shell/e-storage.c:584
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr "Không đủ chỗ để tạp thư mục"
 
-#: shell/e-storage.c:586
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr "Thư mục không rỗng"
 
-#: shell/e-storage.c:588
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr "Không tìm thấy thư mục"
 
-#: shell/e-storage.c:590
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr "Chức năng này chưa được thực hiện trong kho lưu trữ này"
 
-#: shell/e-storage.c:594
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr "Chưa hỗ trợ tác vụ"
 
-#: shell/e-storage.c:596
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr "Kho chứa này chưa hộ trợ kiểu đã cho"
 
-#: shell/e-storage.c:598
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr "Thư mục đã cho không thể bị thay đổi hoặc loại bỏ"
 
-#: shell/e-storage.c:600
+#: shell/e-storage.c:596
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Không thể tạo một thư mục con của một trong những descendant của nó"
 
-#: shell/e-storage.c:602
+#: shell/e-storage.c:598
 msgid "Cannot create a folder with that name"
 msgstr "Không thể tạo thư mục với tên đó"
 
-#: shell/e-storage.c:604
+#: shell/e-storage.c:600
 msgid "This operation cannot be performed in off-line mode"
 msgstr "Thao tác này không thể được thực hiện trong chế độ ngoại tuyến"
 
@@ -25855,11 +25783,11 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hoàn tất)"
 
-#: shell/evolution-folder-selector-button.c:101
+#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<nhấn đây để chọn thư mục>"
 
-#: shell/evolution-shell-component-utils.c:123
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -25870,7 +25798,7 @@ msgstr ""
 "\n"
 "Lỗi lạ."
 
-#: shell/evolution-shell-component-utils.c:126
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -25883,7 +25811,7 @@ msgstr ""
 "Lỗi từ hệ thống thành phần:\n"
 "%s"
 
-#: shell/evolution-shell-component-utils.c:133
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -25896,63 +25824,63 @@ msgstr ""
 "Lỗi từ hệ thống kích hoạt:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1165
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "Lỗi CORBA"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "Đã ngắt"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "Đối số không hợp lệ"
 
-#: shell/evolution-shell-component.c:1171
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "Đã có chủ sở hữu"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "Không có chủ sở hữu"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "Không tìm thấy"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "Kiểu chưa hỗ trợ"
 
-#: shell/evolution-shell-component.c:1179
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "Lược đồ không hỗ trợ"
 
-#: shell/evolution-shell-component.c:1181
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "Thao tác chưa hỗ trợ"
 
-#: shell/evolution-shell-component.c:1183
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "Lỗi nội tại"
 
-#: shell/evolution-shell-component.c:1187
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "Tồn tại"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "URI sai"
 
-#: shell/evolution-shell-component.c:1193
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "Có thư mục con"
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "Không còn chỗ"
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "Chủ sở hữu cũ đã chết"
 
@@ -25965,18 +25893,10 @@ msgid "Evolution Test Component"
 msgstr "Thành phần kiểm tra Evolution"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr "Kết nối hoạt động"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Click OK to close these connections and go offline"
 msgstr "Nhấn Đồng ý để đóng những kết nối này và chuyển sang ngoại tuyến"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "Máy chủ"
-
-#: 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 "Những kết nối sau đang hoạt động:"
 
@@ -26024,29 +25944,30 @@ msgstr "Tên thư _mục:"
 msgid "_User:"
 msgstr "_Tên người dùng:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Trợ tá thiết lập Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Đang nhập tập tin"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Múi giờ "
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Chào mừng"
 
-#: 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 ""
 "Chào mừng tới Evolution. Những màn hình kế tiếp sẽ cho phép \n"
 "Evolution kết nối với các tài khoản email của bạn, và để\n"
@@ -26054,12 +25975,13 @@ msgstr ""
 "\n"
 "Vui lòng nhấn nút \"Kế tiếp\" để tiếp tục."
 
-#: 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 ""
 "Bạn đã hoàn tất nhập mọi thông tin cần thiết cho Evolution.\n"
 "\n"
@@ -26115,25 +26037,26 @@ msgstr "Đừng hỏi tôi lần nữa"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution có thể nhập dữ liệu từ các tập tin sau:"
 
-#: shell/main.c:107 shell/main.c:529
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:113
+#: shell/main.c:118
 msgid "Evolution is now exiting ..."
 msgstr "Evolution đang thoát..."
 
-#: shell/main.c:212
-#, 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.2.x version instead (1.2.2)\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"
@@ -26155,7 +26078,7 @@ msgstr ""
 "Chúng tôi hy vọng bạn thích kết quả của quá trình làm việc của chúng tôi,\n"
 "và chúng tôi háo hức chờ đời sự đóng góp của bạn!\n"
 
-#: shell/main.c:233
+#: shell/main.c:290
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -26163,40 +26086,44 @@ msgstr ""
 "Xin cám ơn\n"
 "Nhóm Ximian Evolution\n"
 
-#: shell/main.c:241
+#: shell/main.c:298
 msgid "Don't tell me again"
 msgstr "Đừng nói điều này lần nữa"
 
-#: shell/main.c:360
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Không thể truy cập Vỏ bọc Ximian Evolution"
 
-#: shell/main.c:369
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Không thể khởi động Vỏ bọc Ximian Evolution: %s"
 
-#: shell/main.c:501
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "Tắt splash screen"
 
-#: shell/main.c:503
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "Khởi động trong chế độ ngoại tuyến"
 
-#: shell/main.c:505
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "Khởi động trong chế độ trực tuyến"
 
-#: shell/main.c:507
+#: 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 "Gửi thông tin debug của mọi thành phần vào tập tin."
 
-#: shell/main.c:509
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr "Buộc nâng cấp tập tin cấu hình từ Evolution 1.0.x"
 
-#: shell/main.c:533
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26206,7 +26133,6 @@ msgstr ""
 "  Hãy dùng %s --help để biết thêm thông tin.\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 "Lỗi nạp sổ địa chỉ mặc định."
@@ -26216,14 +26142,50 @@ msgstr "Lỗi nạp sổ địa chỉ mặc định."
 msgid "Input File"
 msgstr "Tập tin input"
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "Tập tin output"
-
 #: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Chưa có tên tập tin."
 
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "Thêm đồ đính kèm..."
+
+#: 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 "Mô tả chứa"
+
+#: 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 "Cắt thông điệp đã chọn"
+
+#. 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 "Không thể đổi tên '%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 "Sao chép liên lạc sang thư mục khác..."
@@ -26312,7 +26274,7 @@ msgstr "Xem liên lạc hiện thời"
 #: 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ành động"
 
@@ -26430,7 +26392,7 @@ msgid "Print this item"
 msgstr "In mục này"
 
 #: 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 "Lưu"
 
@@ -26457,7 +26419,7 @@ msgstr "Lưu mục này vào đĩa"
 #: 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 "_Tập tin"
 
@@ -26704,7 +26666,7 @@ msgstr "Danh sách thông điệp theo nhánh"
 msgid "_Expunge"
 msgstr "_Bỏ"
 
-#: 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 "_thư mục"
 
@@ -27108,7 +27070,7 @@ msgstr "_Quoted"
 msgid "_Resend..."
 msgstr "Gửi _lại..."
 
-#: 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 "_Công cụ"
 
@@ -27123,12 +27085,12 @@ msgstr "Đóng cửa sổ này"
 #: 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 "Đón_g"
 
 #: 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 "_Xem"
 
@@ -27307,7 +27269,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Lưu tập tin hiện thời và đóng hộp thoại"
 
-#: 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 "Trợ _giúp"
 
@@ -27484,122 +27446,114 @@ msgid "Pi_lot Settings..."
 msgstr "Thiết lập Pi_lot..."
 
 #: ui/evolution.xml.h:27
-msgid "Pilot Con_duit Settings..."
-msgstr "Thiết lập Con_duit..."
-
-#: ui/evolution.xml.h:28
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "Loại bỏ thư mục được thêm bằng\"Mở thư mục của người dùng khác\""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "Gửi / Nhận"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Send queued items and retrieve new items"
 msgstr "Gửi các mục đang đợi gửi và nhận các mục mới"
 
-#: ui/evolution.xml.h:31
-msgid "Set up Pilot conduit configuration"
-msgstr "Thiết lập cấu hình Pilot conduit"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Set up Pilot configuration"
 msgstr "Thiết lập cấu hình Pilot"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr "Hiện thông tin về Ximian Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Gửi báo cáo lỗi"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "_Gửi báo cáo lỗi"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Báo cáo lỗi, dùng Bug Buddy"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "Bật tắt"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "Bật tắt hiện thanh thư mục"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Bật tắt hiện thanh lối tắt"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr "Bật tắt hoạt động ngoại tuyến"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "Xem thư mục được chọn"
 
-#: 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 "_Giới thiệu Ximian Evolution..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "_Sao chép..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Thanh Thư _mục"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Folder..."
 msgstr "_Thư mục..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "Đ_i tới thư mục..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr "_Nhập..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "_Di chuyển..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "Mớ_i"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "Thư mục mớ_i"
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 msgid "_Remove Other User's Folder"
 msgstr "_Loại bỏ thư mục của người dùng khác"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "Đổi _tên..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "_Gửi / Nhận"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "Thanh _lối tắt"
 
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 msgid "_Shortcut..."
 msgstr "_Lối tắt..."
 
@@ -27675,9 +27629,8 @@ msgstr "Với _phân loại"
 msgid "_Tasks"
 msgstr "Nhiệm _vụ"
 
-#. 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"
 
@@ -27721,24 +27674,24 @@ msgstr "Định nghĩa khung xem"
 
 #. 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 "HBTNSBC"
 
 #. 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 "Bây giờ"
 
-#: 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 "Hôm nay"
 
-#: 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 "Thời gian phải theo dạng thức: %s"
@@ -27747,80 +27700,80 @@ msgstr "Thời gian phải theo dạng thức: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Giá trị phần trăm phải nằm giữa 0 và 100."
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "Baltic"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "Trung Âu"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "Trung Hoa"
 
-#: 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 "Hy Lạp"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr "Do Thái"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr "Nhật Bản"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "Hàn Quốc"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "Thổ Nhĩ Kỳ"
 
-#: 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 "Tây Âu"
 
-#: widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "Truyền thống"
 
-#: 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 "Đơn giản"
 
-#: widgets/misc/e-charset-picker.c:93
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "Ucraina"
 
-#: 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 "Bộ mã lạ: %s"
 
-#: widgets/misc/e-charset-picker.c:207
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr "Nhập vào bộ mã cần dùng"
 
-#: widgets/misc/e-charset-picker.c:282
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "Khác..."
 
-#: widgets/misc/e-charset-picker.c:402
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr "Bộ mã"
 
@@ -27828,11 +27781,12 @@ msgstr "Bộ mã"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:187
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr "Bộ biên soạn tìm kiếm"
 
-#: widgets/misc/e-filter-bar.c:209
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "Lưu tìm kiếm"
 
@@ -27864,43 +27818,435 @@ msgstr "Câu hỏi"
 msgid "Message"
 msgstr "Thông báo"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "_Tìm"
+
+#: widgets/misc/e-search-bar.c:537
 msgid "_Find Now"
 msgstr "Tìm n_gay"
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 msgid "_Clear"
 msgstr "_Xóa"
 
-#: widgets/misc/e-search-bar.c:823
+#: widgets/misc/e-search-bar.c:833
 msgid "Item ID"
 msgstr "ID mục"
 
-#: widgets/misc/e-search-bar.c:830
+#: widgets/misc/e-search-bar.c:840
 msgid "Subitem ID"
 msgstr "ID mục con"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:847
 msgid "Text"
 msgstr "Văn bản"
 
-#: widgets/misc/e-search-bar.c:915
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "Xóa"
 
-#: widgets/misc/e-search-bar.c:917
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "Tìm ngay"
 
 #: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Server Sổ địa chỉ cá nhân"
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Bộ xem Minicard sổ địa chỉ 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 "Server Lịch cá nhân; factory lịch"
+#, fuzzy
+msgid "Evolution Calendar local file backend"
+msgstr "Bộ xem lịch iTip/iMip Evolution"
+
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Bộ xem Minicard sổ địa chỉ evolution"
+
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Factory Nhập tập tin LDIF vào Evolution."
+
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "Nhập tập tin LDIF vào Evolution."
+
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Factory Nhập tập tin VCard vào Evolution."
+
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "Nhập tập tin VCard vào Evolution."
+
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "Điều khiển Bonobo cho popup địa chỉ."
+
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "Điều khiển Bonobo để hiển thị địa chỉ."
+
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "Điều khiển Bonobo mẫu để hiển thị sổ địa chỉ"
+
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr "Điều khiển cấu hình cho Kho lưu sổ địa chỉ Evolution."
+
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "Điều khiển hiển thị Minicard sổ địa chỉ Evolution."
+
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "Thành phần Evolution xử lý liên lạc."
+
+#~ msgid "Factory for the controls exported by the Evolution Addressbook"
+#~ msgstr "Factory Điều khiển được xuất bởi Sổ địa chỉ Evolution"
+
+#~ msgid "1234"
+#~ msgstr "1234"
+
+#~ msgid "380"
+#~ msgstr "380"
+
+#~ msgid "666"
+#~ msgstr "666"
+
+#~ msgid "<- _Remove"
+#~ msgstr "<- _Loại bỏ"
+
+#~ msgid "<< Fewer Options"
+#~ msgstr "<< Ít tùy chọn hơn"
+
+#~ msgid "Add (or Edit) Attribute Mappings"
+#~ msgstr "Thêm (hoặc Sửa) ánh xạ thuộc tính"
+
+#~ msgid "DN Customization"
+#~ msgstr "Tùy biến DN"
+
+#~ msgid "Mappings"
+#~ msgstr "Ánh xạ"
+
+#~ msgid "Objectclasses Used in Evolution:"
+#~ msgstr "Objectclass được Evolution dùng:"
+
+#~ msgid "Objectclasses Used on Server:"
+#~ msgstr "Objectclass được server dùng:"
+
+#~ msgid ""
+#~ "Please select an Evolution attribute and an\n"
+#~ "LDAP attribute to associate with it."
+#~ msgstr ""
+#~ "Vui lòng chọn thuộc tính Evolution và thuộc\n"
+#~ "tính LDAP liên kết với nó."
+
+#~ msgid "R_estore Defaults"
+#~ msgstr "Phục hồi _mặc định"
+
+#~ msgid "Re_store Defaults"
+#~ msgstr "_Phục hồi mặc định"
+
+#~ 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 ""
+#~ "Để thêm thuộc tính vào DN, hãy chọn nó từ danh sách và nhấn nút \n"
+#~ "\"Thêm thuộc tính\". Bất kỳ giá trị nào bạn thêm vào DN sẽ trở thành giá "
+#~ "trị\n"
+#~ "được yêu cầu cho các liên lạc mới mà bạn thêm vào thư mục trên LDAP "
+#~ "server."
+
+#~ msgid "_Add ->"
+#~ msgstr "_Thêm ->"
+
+#~ msgid "_Add Mapping"
+#~ msgstr "_Thêm ánh xạ"
+
+#~ msgid "_Add to DN"
+#~ msgstr "_Thêm vào DN"
+
+#~ msgid "_Always"
+#~ msgstr "_Luôn luôn"
+
+#~ msgid "_Delete Mapping"
+#~ msgstr "_Xóa ánh xạ"
+
+#~ msgid "_Distinguished Name (DN):"
+#~ msgstr "Tên _phân biệt (DN):"
+
+#~ msgid "_Don't use SSL/TLS"
+#~ msgstr "_Không dùng SSL/TLS"
+
+#~ msgid "_Edit Mapping"
+#~ msgstr "_Sửa ánh xạ"
+
+#~ msgid "_Evolution attribute:"
+#~ msgstr "Thuộc tính _Evolution:"
+
+#~ msgid "_If necessary "
+#~ msgstr "_Nếu cần thiết "
+
+#~ msgid "_LDAP attribute:"
+#~ msgstr "Thuộc tính _LDAP:"
+
+#~ msgid "_LDAP attributes:"
+#~ msgstr "Thuộc tính _LDAP:"
+
+#~ msgid "_More Options >>"
+#~ msgstr "_Nhiều tùy chọn hơn >>"
+
+#~ msgid "_Restore Defaults"
+#~ msgstr "Phục hồi _mặc định"
+
+#~ msgid "account-druid"
+#~ msgstr "account-druid"
+
+#~ msgid "account-editor"
+#~ msgstr "account-editor"
+
+#~ 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 "Factory for the Addressbook's name selection interface"
+#~ msgstr "Factory cho giao diện chọn tên sổ địa chỉ"
+
+#~ msgid "Edit Contact List"
+#~ msgstr "Sửa danh sách liên lạc"
+
+#~ msgid "Unnamed Contact List"
+#~ msgstr "Danh sách liên lạc vô danh"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d không hiện)"
+
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "Điều khiển Bonobo để hiển thị danh sách công việc."
+
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "Điều khiển Bonobo mẫu để hiển thị danh sách công việc."
+
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "Điều khiển cấu hình cho Lịch Evolution."
+
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "Thành phần Evolution xử lý lịch."
+
+#~ msgid "Factory for the Evolution Calendar objects"
+#~ msgstr "Factory Đối tượng Lịc Evolution"
+
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr "Factory tập trung hóa hộp thoại soạn thảo thành phần lịch"
+
+#~ msgid "Alarm notification service"
+#~ msgstr "Dịch vụ báo động"
+
+#~ msgid ""
+#~ "Evolution does not yet support email notification for reminders.  You "
+#~ "will not be able to edit the options for this reminder."
+#~ msgstr ""
+#~ "Evolution chưa hỗ trợ thông báo qua email để nhắc nhở. Bạn sẽ không thể "
+#~ "sửa tùy chọn cho bộ nhắc nhở này."
+
+#~ msgid ""
+#~ "Evolution has taken the tasks that were in your calendar folder and "
+#~ "automatically migrated them to the new tasks folder."
+#~ msgstr ""
+#~ "Evolution đã lấy những công việc trong thư mục lịch của bạn và tự động "
+#~ "chuyển qua thư mục công việc mới."
+
+#~ 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 đã cố lấy những công việc trong thư mục lịch của bạn và tự động "
+#~ "chuyển qua thư mục công việc mới.\n"
+#~ "Một vài công việc có thể không được chuyển qua được, vì thế tiến trình "
+#~ "này có thể sẽ được thực hiện lại trong tương lại."
+
+#~ msgid ""
+#~ "Could not open `%s'; no items from the calendar folder will be migrated "
+#~ "to the tasks folder."
+#~ msgstr ""
+#~ "Không thể mở '%s'; không có mục nào trong thư mục lịch để chuyển qua thư "
+#~ "mục công việc."
+
+#~ msgid ""
+#~ "The method required to load `%s' is not supported; no items from the "
+#~ "calendar folder will be migrated to the tasks folder."
+#~ msgstr ""
+#~ "Không hỗ trợ phương thức yêu cầu để nạp '%s'; không có mục nào trong thư "
+#~ "mục lịch để chuyển qua thư mục công việc."
+
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "Factory Nhập tập tin iCalendar vào Evolution"
+
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "Nhập tập tin iCalendar vào Evolution"
+
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "Nhập tập tin vCalendar vào Evolution"
+
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr "Không thể lấy danh sách kho lưu từ registry: %s"
+
+#~ msgid "Can't call getFolderAtPath on storage: %s"
+#~ msgstr "Không thể gọi GetFolderAtPath trên kho lưu: %s"
+
+#~ msgid ""
+#~ "Could not create composer window, because you have not yet\n"
+#~ "configured any identities in the mail component."
+#~ msgstr ""
+#~ "Không thể tạo cửa sổ biên soạn vì bạn chưa cấu hình thực \n"
+#~ "thể nào trong thành phần mail."
+
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "Không thể khởi động bộ soạn thảo của Evolution."
+
+#~ msgid "minute"
+#~ msgstr "phút"
+
+#~ msgid "hour"
+#~ msgstr "giờ"
+
+#~ msgid "week"
+#~ msgstr "tuần"
+
+#~ msgid "year"
+#~ msgstr "năm"
+
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Điều khiển cấu hình cho Font hiển thị Evolution."
+
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Điều khiển cấu hình cho Tài khoản Thư tín Evolution."
+
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Điều khiển cấu hình cho Evolution Mailer."
+
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Điều khiển cấu hình cho Bộ soạn thảo thông điệp Evolution."
+
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Thành phần xử lý thư của Evolution."
+
+#~ msgid "Factory for the controls exported by the Evolution Mailer"
+#~ msgstr "Factory Điều khiển được xuất bởi Evolution Mailer"
+
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "Không thể khởi động thành phần thư của Evolution."
+
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "Không thể khởi động thành phần cấu hình thư của Evolution"
+
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Không thể khởi động thành phần thông tin thư mục của Evolution."
+
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "Nhập các tập tin mbox vào Evolution"
+
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "Nhập tập tin Outlook Express 4 vào Evolution"
+
+#~ msgid ""
+#~ "Please specify signature filename\n"
+#~ "in Advanced section of signature settings."
+#~ msgstr ""
+#~ "Vui lòng xác định tên tập tin chữ ký\n"
+#~ "trong phần Nâng cao của Thiết lập Chữ ký."
+
+#~ msgid "On Screen fonts"
+#~ msgstr "Font màn hình"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "Độ rộng _cứng:"
+
+#~ msgid "_Variable-width:"
+#~ msgstr "Độ rộng _thay đổi:"
+
+#~ msgid "All folders"
+#~ msgstr "Mọi thư mục"
+
+#~ msgid "Display Options"
+#~ msgstr "Tùy chọn hiển thị"
+
+#~ msgid "Folders whose names begin with:"
+#~ msgstr "Thư mục có tên bắt đầu bằng:"
+
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Điều khiển cấu hình cho Tóm tắt Evolution."
+
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Điều khiển cấu hình cho thiết lập thư mục Evolution."
+
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Evolution không thể tạo thư mục\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 ""
+#~ "Thư mục %s\n"
+#~ "không có quyền truy cập cần thiết. Vui lòng gán quyền đọc và ghi cho thư "
+#~ "mục rồi khởi động lại Evolution."
+
+#~ msgid ""
+#~ "File %s\n"
+#~ "should be removed to allow Evolution to work correctly.\n"
+#~ "Please remove this file and restart Evolution."
+#~ msgstr ""
+#~ "Tập tin %s nên được loại bỏ để Evolution có thể làm việc đúng.\n"
+#~ "Vui lòng gỡ bỏ tập tin này và khởi động lại Evolution."
+
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Không thể khởi động giao diện Evolution Mailer Assistant\n"
+#~ "(%s)"
+
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr "Không thể khởi động giao diện Evolution Mailer Assistant\n"
+
+#~ msgid "Folder name cannot contain slashes."
+#~ msgstr "Tên thư mục không thể chứa ký tự '/'"
+
+#~ msgid "Active connections"
+#~ msgstr "Kết nối hoạt động"
+
+#~ msgid "Host"
+#~ msgstr "Máy chủ"
+
+#~ msgid "Output File"
+#~ msgstr "Tập tin output"
+
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "Thiết lập Con_duit..."
+
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "Thiết lập cấu hình Pilot conduit"
+
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "Server Sổ địa chỉ cá nhân"
+
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "Server Lịch cá nhân; factory lịch"
 
 #~ msgid "Factory for the Addressbook Minicard control"
 #~ msgstr "Factory Điều khiển Minicard Sổ địa chỉ"
@@ -27908,9 +28254,6 @@ msgstr "Server Lịch cá nhân; factory lịch"
 #~ msgid "Factory for the Addressbook's address displayer"
 #~ msgstr "Factory Bộ hiển thị địa chỉ của Sổ địa chỉ"
 
-#~ msgid "Factory for the Addressbook's address popup"
-#~ msgstr "Factory popup địa chỉ của Sổ địa chỉ"
-
 #~ msgid "Factory for the sample Addressbook control"
 #~ msgstr "Factory Điều khiển sổ địa chỉ mẫu"
 
@@ -28047,9 +28390,6 @@ msgstr "Server Lịch cá nhân; factory lịch"
 #~ msgid "Apri file"
 #~ msgstr "Tập tin Apri"
 
-#~ msgid "Factory for Evolution Summary's configuration control."
-#~ msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
-
 #~ msgid "Marquette"
 #~ msgstr "Marquette"
 
@@ -28168,15 +28508,9 @@ msgstr "Server Lịch cá nhân; factory lịch"
 #~ "Bộ nhập chưa sẵn sàng\n"
 #~ "Đang đợi 5 giây trước khi thử lại."
 
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Trợ tá bộ nhập Evolution"
-
 #~ msgid "Copy selected messages"
 #~ msgstr "Sao chép thông điệp được chọn"
 
-#~ msgid "Cut selected messages"
-#~ msgstr "Cắt thông điệp đã chọn"
-
 #~ msgid "_Preferences..."
 #~ msgstr "_Thông số..."
 
@@ -28415,9 +28749,6 @@ msgstr "Server Lịch cá nhân; factory lịch"
 #~ msgid "New Contact _List"
 #~ msgstr "_Danh sách liên lạc mới"
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "Sửa Sổ địa chỉ"
-
 #~ msgid "A_uthenticate with server using:"
 #~ msgstr "_Yêu cầu xác thực với server bằng:"
 
@@ -28765,9 +29096,6 @@ msgstr "Server Lịch cá nhân; factory lịch"
 #~ msgid "Mailbox Format"
 #~ msgstr "Dạng thức hộp thư"
 
-#~ msgid "Evolution News Editor"
-#~ msgstr "Bộ soạn tin Evolution"
-
 #~ msgid " (default)"
 #~ msgstr " (mặc định)"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b24354e8bc..42f3c459ea 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,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: 2002-12-21 17:44+0800\n"
 "Last-Translator: Wang Li <charles@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -12,33 +12,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\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.oaf.in.h:1
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr "Evolution 导入 LDIF 文件车间。"
+# shell/importer/import.glade.h:3
+# shell/importer/import.glade.h:3
+# shell/importer/import.glade.h:3
+#: 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.oaf.in.h:2
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "把 LDIF 文件导入 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
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Evolution 导入 VCard 车间。"
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: 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:2
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "将 VCard 文件导入 Evolution"
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: 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/gui/widgets/e-addressbook-view.c:849
@@ -47,6 +51,7 @@ msgstr "将 VCard 文件导入 Evolution"
 # addressbook/backend/ebook/e-card-simple.c:60
 # addressbook/gui/widgets/e-addressbook-view.c:960
 #: 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 "文件另存为"
@@ -55,8 +60,11 @@ msgstr "文件另存为"
 # addressbook/backend/ebook/e-card-simple.c:61
 # addressbook/backend/ebook/e-card-simple.c:61
 #: 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 "姓名"
 
@@ -67,6 +75,7 @@ msgstr "姓名"
 # addressbook/backend/ebook/e-card-simple.c:62
 # addressbook/gui/widgets/e-addressbook-view.c:962
 #: 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 "电子邮件"
@@ -78,7 +87,7 @@ msgstr "电子邮件"
 # addressbook/backend/ebook/e-card-simple.c:63
 # addressbook/gui/contact-editor/e-contact-editor.c:1659
 #: 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 "主要"
 
@@ -103,7 +112,8 @@ msgstr "主要"
 # addressbook/gui/widgets/e-addressbook-view.c:994
 #: 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 "助手"
@@ -125,9 +135,9 @@ msgstr "助手"
 # addressbook/gui/contact-editor/e-contact-editor.c:1712
 #: 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 "商务"
 
@@ -149,7 +159,7 @@ msgstr "商务"
 # addressbook/backend/ebook/e-card-simple.c:66
 # addressbook/gui/contact-editor/e-contact-editor.c:1648
 #: 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 "反馈"
 
@@ -160,7 +170,7 @@ msgstr "反馈"
 # addressbook/backend/ebook/e-card-simple.c:67
 # addressbook/gui/contact-editor/e-contact-editor.c:1650
 #: 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 "公司"
 
@@ -189,8 +199,8 @@ 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 "家庭"
 
@@ -201,6 +211,7 @@ msgstr "家庭"
 # addressbook/backend/ebook/e-card-simple.c:69
 # addressbook/gui/widgets/e-addressbook-view.c:969
 #: 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 "组织"
@@ -223,7 +234,7 @@ msgstr "组织"
 # addressbook/gui/contact-editor/e-contact-editor.c:1655
 #: 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 "手机"
 
@@ -234,7 +245,7 @@ msgstr "手机"
 # addressbook/backend/ebook/e-card-simple.c:73
 # addressbook/gui/contact-editor/e-contact-editor.c:1649
 #: 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 "汽车"
 
@@ -251,8 +262,8 @@ msgstr "汽车"
 # addressbook/gui/contact-editor/e-contact-editor.c:1647
 # addressbook/gui/widgets/e-addressbook-view.c:974
 #: 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 "商务传真"
@@ -274,7 +285,7 @@ msgstr "商务传真"
 # addressbook/gui/contact-editor/e-contact-editor.c:1653
 # addressbook/gui/widgets/e-addressbook-view.c:975
 #: 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 "家庭传真"
@@ -286,7 +297,7 @@ msgstr "家庭传真"
 # addressbook/backend/ebook/e-card-simple.c:76
 # addressbook/gui/contact-editor/e-contact-editor.c:1646
 #: 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"
 
@@ -304,7 +315,7 @@ msgstr "商务 2"
 # addressbook/backend/ebook/e-card-simple.c:77
 # addressbook/gui/contact-editor/e-contact-editor.c:1652
 #: 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"
 
@@ -318,7 +329,7 @@ msgstr "家庭 2"
 # addressbook/gui/contact-editor/e-contact-editor.c:1654
 # addressbook/gui/widgets/e-addressbook-view.c:978
 #: 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"
@@ -340,8 +351,8 @@ msgstr "ISDN"
 # mail/mail-config.glade.h:57
 #: 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 "其它"
 
@@ -355,7 +366,7 @@ msgstr "其它"
 # addressbook/gui/contact-editor/e-contact-editor.c:1657
 # addressbook/gui/widgets/e-addressbook-view.c:980
 #: 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 "其它传真"
@@ -370,7 +381,7 @@ msgstr "其它传真"
 # addressbook/gui/contact-editor/e-contact-editor.c:1658
 # addressbook/gui/widgets/e-addressbook-view.c:981
 #: 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 "传呼机"
@@ -385,7 +396,7 @@ msgstr "传呼机"
 # addressbook/gui/contact-editor/e-contact-editor.c:1660
 # addressbook/gui/widgets/e-addressbook-view.c:982
 #: 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 "收音机"
@@ -400,7 +411,7 @@ msgstr "收音机"
 # addressbook/gui/contact-editor/e-contact-editor.c:1661
 # addressbook/gui/widgets/e-addressbook-view.c:983
 #: 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 "电传"
@@ -429,8 +440,8 @@ msgstr "TTY"
 # addressbook/gui/contact-editor/e-contact-editor.c:1687
 # addressbook/gui/widgets/e-addressbook-view.c:986
 #: 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"
@@ -448,8 +459,8 @@ msgstr "电子邮件 2"
 # addressbook/gui/contact-editor/e-contact-editor.c:1688
 # addressbook/gui/widgets/e-addressbook-view.c:987
 #: 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"
@@ -497,6 +508,7 @@ msgstr "部门"
 # addressbook/backend/ebook/e-card-simple.c:90
 # addressbook/gui/widgets/e-addressbook-view.c:990
 #: 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 "办公室"
@@ -515,6 +527,7 @@ msgstr "办公室"
 # addressbook/backend/ebook/e-card-simple.c:91
 # addressbook/gui/widgets/e-addressbook-view.c:991
 #: 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 "头衔"
@@ -544,6 +557,7 @@ msgstr "职业"
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/gui/widgets/e-addressbook-view.c:993
 #: 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 "经理"
@@ -569,6 +583,7 @@ msgstr "助手"
 # addressbook/backend/ebook/e-card-simple.c:95
 # addressbook/gui/widgets/e-addressbook-view.c:995
 #: 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 "绰号"
@@ -587,6 +602,7 @@ msgstr "绰号"
 # addressbook/backend/ebook/e-card-simple.c:96
 # addressbook/gui/widgets/e-addressbook-view.c:996
 #: 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 "配偶"
@@ -598,6 +614,7 @@ msgstr "配偶"
 # addressbook/backend/ebook/e-card-simple.c:97
 # addressbook/gui/widgets/e-addressbook-view.c:997
 #: 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 "注释"
@@ -606,6 +623,7 @@ msgstr "注释"
 # addressbook/backend/ebook/e-card-simple.c:98
 # addressbook/backend/ebook/e-card-simple.c:98
 #: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1438
 msgid "Calendar URI"
 msgstr "日历 URI"
 
@@ -634,24 +652,40 @@ msgstr "忙闲 URL"
 msgid "FBUrl"
 msgstr "忙闲 URL"
 
+#: addressbook/backend/ebook/e-card-simple.c:100
+msgid "Default server calendar"
+msgstr ""
+
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "icsCalendar"
+msgstr "日历"
+
 # addressbook/backend/ebook/e-card-simple.c:100
 # addressbook/backend/ebook/e-card-simple.c:100
 # addressbook/backend/ebook/e-card-simple.c:100
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: 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:100
 # addressbook/backend/ebook/e-card-simple.c:100
-#: 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:101
 # addressbook/backend/ebook/e-card-simple.c:101
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "生日"
 
@@ -661,7 +695,8 @@ msgstr "生日"
 # calendar/gui/e-calendar-table.etspec.h:4
 # addressbook/backend/ebook/e-card-simple.c:104
 # calendar/gui/e-calendar-table.etspec.h:4
-#: 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 "类别"
@@ -669,14 +704,25 @@ msgstr "类别"
 # addressbook/backend/ebook/e-card-simple.c:105
 # addressbook/backend/ebook/e-card-simple.c:105
 # addressbook/backend/ebook/e-card-simple.c:105
-#: 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:73
+# addressbook/gui/contact-editor/e-contact-editor.c:1649
+# addressbook/backend/ebook/e-card-simple.c:73
+# addressbook/gui/contact-editor/e-contact-editor.c:1649
+# addressbook/backend/ebook/e-card-simple.c:73
+# addressbook/gui/contact-editor/e-contact-editor.c:1649
+#: addressbook/backend/ebook/e-card-simple.c:335
+#, fuzzy
+msgid "ECard"
+msgstr "汽车"
+
 # addressbook/backend/ebook/e-card-simple.c:788
 # addressbook/backend/ebook/e-card-simple.c:788
 # addressbook/backend/ebook/e-card-simple.c:788
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:832
 #, c-format
 msgid "%x"
 msgstr "%x"
@@ -684,25 +730,193 @@ msgstr "%x"
 # addressbook/gui/component/select-names/e-select-names-popup.c:423
 # addressbook/gui/component/select-names/e-select-names-popup.c:423
 # addressbook/gui/component/select-names/e-select-names-popup.c:423
-#: 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:4235
-# addressbook/backend/ebook/e-card.c:4235
-# addressbook/backend/ebook/e-card.c:4235
-#: addressbook/backend/ebook/e-card.c:2683
-msgid "Multiple VCards"
-msgstr "多个 VCard"
+# addressbook/gui/contact-editor/e-contact-quick-add.c:326
+# addressbook/gui/widgets/e-addressbook-view.c:850
+# addressbook/gui/contact-editor/e-contact-quick-add.c:326
+# addressbook/gui/widgets/e-addressbook-view.c:850
+# addressbook/gui/contact-editor/e-contact-quick-add.c:326
+# addressbook/gui/widgets/e-addressbook-view.c:961
+#: 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:4243
-# addressbook/backend/ebook/e-card.c:4243
-# addressbook/backend/ebook/e-card.c:4243
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
-msgstr "%s 的 VCard"
+# addressbook/gui/contact-editor/fulladdr.glade.h:237
+# addressbook/gui/contact-editor/fulladdr.glade.h:237
+# addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "地址(_A)："
+
+# views/addressbook/galview.xml.h:1
+# views/addressbook/galview.xml.h:1
+# views/addressbook/galview.xml.h:1
+#: addressbook/backend/ebook/e-card.c:1328
+#, fuzzy
+msgid "Address Label"
+msgstr "地址卡片"
+
+# mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
+# mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
+# my-evolution/Locations.h:1767
+#: addressbook/backend/ebook/e-card.c:1335
+#, fuzzy
+msgid "Phone"
+msgstr "庞塞"
+
+# addressbook/backend/ebook/e-card-simple.c:101
+# addressbook/backend/ebook/e-card-simple.c:101
+# addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1349
+#, fuzzy
+msgid "Birth date"
+msgstr "生日"
+
+# calendar/gui/e-calendar-table.etspec.h:19
+# calendar/gui/e-calendar-table.etspec.h:19
+# calendar/gui/e-calendar-table.etspec.h:19
+#: addressbook/backend/ebook/e-card.c:1355
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+# addressbook/backend/ebook/e-card-simple.c:69
+# addressbook/gui/widgets/e-addressbook-view.c:858
+# addressbook/backend/ebook/e-card-simple.c:69
+# addressbook/gui/widgets/e-addressbook-view.c:858
+# addressbook/backend/ebook/e-card-simple.c:69
+# addressbook/gui/widgets/e-addressbook-view.c:969
+#: addressbook/backend/ebook/e-card.c:1369
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "组织"
+
+# calendar/gui/dialogs/meeting-page.etspec.h:9
+# calendar/gui/e-meeting-time-sel.etspec.h:9
+# calendar/gui/dialogs/meeting-page.etspec.h:9
+# calendar/gui/e-meeting-time-sel.etspec.h:9
+# calendar/gui/dialogs/meeting-page.etspec.h:9
+# calendar/gui/e-meeting-time-sel.etspec.h:9
+#: 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 "角色"
+
+# importers/elm-importer.c:525 importers/netscape-importer.c:958
+# importers/pine-importer.c:637 mail/component-factory.c:100
+# importers/elm-importer.c:525 importers/netscape-importer.c:958
+# importers/pine-importer.c:637 mail/component-factory.c:100
+# importers/elm-importer.c:525 importers/netscape-importer.c:958
+# importers/pine-importer.c:637 mail/component-factory.c:100
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
+#, fuzzy
+msgid "Mailer"
+msgstr "邮件"
+
+# addressbook/gui/contact-editor/contact-editor.glade.h:13
+# addressbook/gui/contact-editor/contact-editor.glade.h:13
+# addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/backend/ebook/e-card.c:1445
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "忙闲 URL(_R)："
+
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "日历"
+
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+#: addressbook/backend/ebook/e-card.c:1466
+#, fuzzy
+msgid "Related Contacts"
+msgstr "已选中的联系人："
+
+# addressbook/gui/component/addressbook.c:806
+# calendar/gui/cal-search-bar.c:59
+# addressbook/gui/component/addressbook.c:806
+# calendar/gui/cal-search-bar.c:59
+# addressbook/gui/component/addressbook.c:839
+# calendar/gui/cal-search-bar.c:59
+#: 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 ""
+
+# my-evolution/metar.c:262
+# my-evolution/metar.c:262
+# my-evolution/Locations.h:1232
+#: addressbook/backend/ebook/e-card.c:1501
+#, fuzzy
+msgid "List"
+msgstr "霭"
+
+# addressbook/gui/widgets/e-addressbook-view.c:874
+# addressbook/gui/widgets/e-addressbook-view.c:874
+# addressbook/gui/widgets/e-addressbook-view.c:985
+#: addressbook/backend/ebook/e-card.c:1508
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "其它地址"
+
+# addressbook/gui/contact-editor/fulladdr.glade.h:5
+# calendar/zones.h:156
+# my-evolution/Locations.h:81
+#: addressbook/backend/ebook/e-card.c:1515
+#, fuzzy
+msgid "Arbitrary"
+msgstr "阿姆利则"
+
+# addressbook/gui/contact-editor/fullname.glade.h:4
+# addressbook/gui/contact-editor/fullname.glade.h:4
+# addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/backend/ebook/e-card.c:1522
+#, fuzzy
+msgid "ID"
+msgstr "I"
+
+# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:287
+# addressbook/gui/widgets/e-addressbook-view.c:843
+# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
+#: addressbook/backend/ebook/e-card.c:1529
+#, fuzzy
+msgid "Last Use"
+msgstr "粘贴"
+
+# mail/message-list.etspec.h:5
+# mail/message-list.etspec.h:6
+# mail/message-list.etspec.h:6
+#: addressbook/backend/ebook/e-card.c:1540
+#, fuzzy
+msgid "Use Score"
+msgstr "分数"
 
 # addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 # addressbook/backend/ebook/load-pine-addressbook.c:22
@@ -738,18 +952,9 @@ msgstr "%s 的 VCard"
 # tools/evolution-addressbook-abuse.c:132
 # tools/evolution-addressbook-export.c:60
 # tools/evolution-addressbook-import.c:86
-#: 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 "无法初始化 Bonobo"
 
@@ -759,51 +964,65 @@ msgstr "无法初始化 Bonobo"
 # addressbook/backend/pas/pas-backend-ldap.c:2269
 # addressbook/backend/pas/pas-backend-file.c:259
 # addressbook/backend/pas/pas-backend-ldap.c:2272
-#: 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:261
 # addressbook/backend/pas/pas-backend-file.c:261
 # addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-file.c:366
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr "装入..."
 
+# addressbook/gui/component/addressbook-config.glade.h:12
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+#, fuzzy
+msgid "Using Distinguished Name (DN)"
+msgstr "使用已识别的姓名 (DN)"
+
+# addressbook/gui/component/addressbook-config.glade.h:9
+# addressbook/gui/component/addressbook-config.glade.h:9
+# addressbook/gui/component/addressbook-config.glade.h:13
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "使用电子邮件地址"
+
 # addressbook/backend/pas/pas-backend-ldap.c:483
 # addressbook/backend/pas/pas-backend-ldap.c:483
 # addressbook/backend/pas/pas-backend-ldap.c:486
-#: addressbook/backend/pas/pas-backend-ldap.c:687
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 msgid "Reconnecting to LDAP server..."
 msgstr "正在重新连接 LDAP 服务器..."
 
 # addressbook/backend/pas/pas-backend-ldap.c:912
 # addressbook/backend/pas/pas-backend-ldap.c:912
 # addressbook/backend/pas/pas-backend-ldap.c:915
-#: 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:1013
 # addressbook/backend/pas/pas-backend-ldap.c:1013
 # addressbook/backend/pas/pas-backend-ldap.c:1016
-#: 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:1123
 # addressbook/backend/pas/pas-backend-ldap.c:1123
 # addressbook/backend/pas/pas-backend-ldap.c:1126
-#: 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:2214
 # addressbook/backend/pas/pas-backend-ldap.c:2214
 # addressbook/backend/pas/pas-backend-ldap.c:2217
-#: addressbook/backend/pas/pas-backend-ldap.c:2889
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "正在接收 LDAP 的搜索结果..."
 
@@ -813,28 +1032,28 @@ msgstr "正在接收 LDAP 的搜索结果..."
 # addressbook/gui/widgets/e-addressbook-view.c:1278
 # addressbook/gui/widgets/e-addressbook-util.c:95
 # addressbook/gui/widgets/e-addressbook-view.c:1389
-#: addressbook/backend/pas/pas-backend-ldap.c:2998
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 msgid "Error performing search"
 msgstr "执行搜索错误"
 
 # mail/mail-config.glade.h:99
 # mail/mail-config.glade.h:99
 # mail/mail-config.glade.h:108
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "默认的同步地址："
 
 # addressbook/conduit/address-conduit.c:294
 # addressbook/conduit/address-conduit.c:294
 # addressbook/conduit/address-conduit.c:426
-#: 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:307
 # addressbook/conduit/address-conduit.c:307
 # addressbook/conduit/address-conduit.c:439
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "没有装入 EBook\n"
 
@@ -847,9 +1066,9 @@ msgstr "没有装入 EBook\n"
 # addressbook/conduit/address-conduit.c:1220
 # calendar/conduits/calendar/calendar-conduit.c:1203
 # calendar/conduits/todo/todo-conduit.c:824
-#: 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 服务器"
 
@@ -862,9 +1081,9 @@ msgstr "无法启动 wombat 服务器"
 # addressbook/conduit/address-conduit.c:1221
 # calendar/conduits/calendar/calendar-conduit.c:1204
 # calendar/conduits/todo/todo-conduit.c:825
-#: 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"
 
@@ -874,97 +1093,74 @@ msgstr "无法启动 wombat"
 # addressbook/conduit/address-conduit.c:1128
 # addressbook/conduit/address-conduit.c:1251
 # addressbook/conduit/address-conduit.c:1254
-#: 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 的地址应用程序块"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-#: 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
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-#: 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
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-# notes/GNOME_Evolution_Notes.oaf.in.h:1
-#: 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
-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:4
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "显示 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:5
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution 地址簿小卡片显示器"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "处理联系人的 Evolution 成员。"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
-msgstr "地址簿小卡片控制车间"
+# addressbook/gui/component/addressbook-config.c:186
+# addressbook/gui/component/addressbook-config.c:186
+# addressbook/gui/component/addressbook-config.c:223
+#: 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:8
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the Addressbook's address displayer"
-msgstr "地址簿地址显示器车间"
+# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#: 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.oaf.in.h:9
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-#: 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:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
 msgstr "地址簿地址对话框车间"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
-msgid "Factory for the configuration controls for the Evolution Addressbook."
-msgstr "关于 Evolution 地址本的配置控制车间"
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: 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.oaf.in.h:10
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "Factory for the sample Addressbook control"
-msgstr "示例地址簿控制车间"
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: 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.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution 地址簿小卡片显示器"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: 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:71
 # calendar/gui/dialogs/comp-editor-util.c:310
@@ -978,33 +1174,33 @@ msgstr "示例地址簿控制车间"
 # calendar/gui/dialogs/comp-editor-util.c:310
 # calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
 # shell/e-shortcuts.c:1061
-#: 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:71
 # addressbook/gui/component/addressbook-component.c:71
 # addressbook/gui/component/addressbook-component.c:71
-#: 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:73
 # addressbook/gui/component/addressbook-component.c:73
 # addressbook/gui/component/addressbook-component.c:73
-#: 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:73
 # addressbook/gui/component/addressbook-component.c:73
 # addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP server containing contact information"
 msgstr "含有联系人信息的 LDAP 服务器"
 
@@ -1020,14 +1216,14 @@ msgstr "含有联系人信息的 LDAP 服务器"
 # calendar/gui/dialogs/comp-editor-util.c:310
 # calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
 # shell/e-shortcuts.c:1061
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 msgid "Public Contacts"
 msgstr "公共联系人"
 
 # addressbook/gui/component/addressbook-component.c:71
 # addressbook/gui/component/addressbook-component.c:71
 # addressbook/gui/component/addressbook-component.c:71
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 msgid "Public folder containing contact information"
 msgstr "公共文件夹含有联系人信息"
 
@@ -1037,135 +1233,117 @@ msgstr "公共文件夹含有联系人信息"
 # ui/evolution-addressbook.xml.h:11
 # addressbook/gui/component/addressbook-component.c:527
 # ui/evolution-addressbook.xml.h:11
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "新建联系人"
 
 # ui/evolution-addressbook.xml.h:31
 # ui/evolution-addressbook.xml.h:31
 # ui/evolution-addressbook.xml.h:32
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "联系人(_C)"
 
 # ui/evolution-addressbook.xml.h:4
 # ui/evolution-addressbook.xml.h:4
 # ui/evolution-addressbook.xml.h:4
-#: 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:527
 # addressbook/gui/component/addressbook-component.c:527
 # addressbook/gui/component/addressbook-component.c:530
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "新建联系人列表"
 
 # ui/evolution-addressbook.xml.h:32
 # ui/evolution-addressbook.xml.h:32
 # ui/evolution-addressbook.xml.h:33
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "联系人列表(_L)"
 
 # ui/evolution-addressbook.xml.h:5
 # ui/evolution-addressbook.xml.h:5
 # ui/evolution-addressbook.xml.h:5
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:569
 msgid "Create a new contact list"
 msgstr "创建一个新的联系人列表"
 
 # addressbook/backend/pas/pas-backend-ldap.c:493
 # addressbook/backend/pas/pas-backend-ldap.c:493
 # addressbook/backend/pas/pas-backend-ldap.c:496
-#: addressbook/gui/component/addressbook-config.c:197
+#: addressbook/gui/component/addressbook-config.c:206
 msgid "Failed to connect to LDAP server"
 msgstr "连接 LDAP 服务器失败"
 
 # camel/providers/imap/camel-imap-store.c:596
 # camel/providers/imap/camel-imap-store.c:596
 # camel/providers/imap/camel-imap-store.c:596
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 msgid "Failed to authenticate with LDAP server"
 msgstr "LDAP 服务器认证失败"
 
-#: addressbook/gui/component/addressbook-config.c:239
+#: addressbook/gui/component/addressbook-config.c:259
 msgid "Could not perform query on Root DSE"
 msgstr "无法在根 DSE 上执行查询"
 
-#: 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 "该服务器不支持 LDAPv3 schema 信息"
 
 # mail/mail-callbacks.c:2250
 # mail/mail-callbacks.c:2369
 # mail/mail-callbacks.c:2405
-#: addressbook/gui/component/addressbook-config.c:1176
+#: addressbook/gui/component/addressbook-config.c:1215
 msgid "Error retrieving schema information"
 msgstr "检索 schema 信息错误"
 
 # camel/providers/imap/camel-imap-command.c:608
 # camel/providers/imap/camel-imap-command.c:608
 # camel/providers/imap/camel-imap-command.c:610
-#: addressbook/gui/component/addressbook-config.c:1184
+#: addressbook/gui/component/addressbook-config.c:1223
 msgid "Server did not respond with valid schema information"
 msgstr "服务器没有响应有效的 schema 信息"
 
-# mail/mail-config.glade.h:3
-# mail/mail-config.glade.h:3
-# mail/mail-config.glade.h:3
-#: addressbook/gui/component/addressbook-config.c:1630
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "在本次 Evolution 创建中未打开 LDAP 支持"
-
 # addressbook/gui/component/addressbook-config.glade.h:2
 # addressbook/gui/component/addressbook-config.glade.h:2
 # addressbook/gui/component/addressbook-config.glade.h:4
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr "帐号名"
 
 # addressbook/gui/component/addressbook-config.glade.h:14
 # addressbook/gui/component/addressbook-config.glade.h:14
 # addressbook/gui/component/addressbook-config.glade.h:19
-#: 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:70
-# calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-# addressbook/gui/component/addressbook-factory.c:70
-# calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-# addressbook/gui/component/addressbook-factory.c:70
-# calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-#: 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"
+# mail/mail-config.glade.h:3
+# mail/mail-config.glade.h:3
+# mail/mail-config.glade.h:3
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "在本次 Evolution 创建中未打开 LDAP 支持"
 
 # addressbook/gui/component/addressbook-storage.c:167
 # addressbook/gui/component/addressbook-storage.c:167
 # addressbook/gui/component/addressbook-storage.c:168
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
 msgid "Other Contacts"
 msgstr "其他联系人"
 
-# addressbook/gui/component/addressbook.c:485
-# addressbook/gui/component/addressbook.c:485
-# addressbook/gui/component/addressbook.c:499
-#: addressbook/gui/component/addressbook.c:474
-msgid "Unable to open addressbook"
-msgstr "无法打开地址簿"
-
 # addressbook/gui/component/addressbook.c:507
 # addressbook/gui/component/addressbook.c:507
 # addressbook/gui/component/addressbook.c:521
-#: 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."
@@ -1176,7 +1354,7 @@ msgstr ""
 # addressbook/gui/component/addressbook.c:494
 # addressbook/gui/component/addressbook.c:494
 # addressbook/gui/component/addressbook.c:508
-#: 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"
@@ -1189,7 +1367,7 @@ msgstr ""
 # addressbook/gui/component/addressbook.c:499
 # addressbook/gui/component/addressbook.c:499
 # addressbook/gui/component/addressbook.c:513
-#: 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"
@@ -1204,7 +1382,7 @@ msgstr ""
 # addressbook/gui/component/addressbook.c:494
 # addressbook/gui/component/addressbook.c:494
 # addressbook/gui/component/addressbook.c:508
-#: 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"
@@ -1214,15 +1392,21 @@ msgstr ""
 "您输入了错误的 URI，也可能是因为\n"
 "服务器已经关闭。"
 
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:582
+# addressbook/gui/component/addressbook.c:485
+# addressbook/gui/component/addressbook.c:485
+# addressbook/gui/component/addressbook.c:499
+#: addressbook/gui/component/addressbook.c:557
+msgid "Unable to open addressbook"
+msgstr "无法打开地址簿"
+
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr "匿名访问 LDAP 服务器"
 
 # camel/providers/imap/camel-imap-store.c:596
 # camel/providers/imap/camel-imap-store.c:596
 # camel/providers/imap/camel-imap-store.c:596
-#: addressbook/gui/component/addressbook.c:625
+#: addressbook/gui/component/addressbook.c:667
 msgid "Failed to authenticate.\n"
 msgstr "认证失败。\n"
 
@@ -1230,17 +1414,17 @@ msgstr "认证失败。\n"
 # addressbook/gui/component/addressbook.c:640
 # addressbook/gui/component/addressbook.c:655
 # addressbook/gui/component/addressbook.c:658
-#: 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 "%s为 %s 输入口令 (用户 %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
 msgid "Email begins with"
 msgstr "邮件以此开头"
 
@@ -1250,7 +1434,7 @@ msgstr "邮件以此开头"
 # calendar/gui/cal-search-bar.c:59
 # addressbook/gui/component/addressbook.c:839
 # calendar/gui/cal-search-bar.c:59
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "类别为"
@@ -1262,7 +1446,7 @@ msgstr "类别为"
 # addressbook/gui/component/addressbook.c:836
 # calendar/gui/cal-search-bar.c:55
 #. 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 "任何域含有"
@@ -1272,11 +1456,11 @@ msgstr "任何域含有"
 # widgets/misc/e-filter-bar.h:104
 # addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
 # widgets/misc/e-filter-bar.h:104
-#: 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"
@@ -1284,7 +1468,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"
@@ -1292,15 +1476,15 @@ 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 "该查询尚未成功完成。"
 
@@ -1311,15 +1495,15 @@ msgstr "该查询尚未成功完成。"
 # addressbook/gui/component/addressbook.c:1067
 # calendar/gui/cal-search-bar.c:412
 #. 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:1107
 # addressbook/gui/component/addressbook.c:1107
 # addressbook/gui/component/addressbook.c:1150
-#: addressbook/gui/component/addressbook.c:1132
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr "文件夹浏览器将显示的 URI"
 
@@ -1331,7 +1515,7 @@ msgstr "文件夹浏览器将显示的 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 "(无)"
 
@@ -1344,23 +1528,23 @@ 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:1686
-#: 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:587
 # addressbook/gui/component/e-address-popup.c:587
-#: 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:593
 # addressbook/gui/component/e-address-popup.c:593
-#: 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”"
@@ -1368,7 +1552,7 @@ msgstr "创建新联系人“%s”"
 # addressbook/gui/component/e-address-popup.c:605
 # addressbook/gui/component/e-address-popup.c:605
 # addressbook/gui/component/e-address-popup.c:605
-#: 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”添加地址"
@@ -1376,7 +1560,7 @@ msgstr "为现有的联系人“%s”添加地址"
 # addressbook/gui/component/e-address-popup.c:891
 # addressbook/gui/component/e-address-popup.c:891
 # addressbook/gui/component/e-address-popup.c:891
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "查询地址簿..."
 
@@ -1389,9 +1573,8 @@ 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: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 "编辑联系人信息"
 
@@ -1404,137 +1587,119 @@ 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: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:1046
 # addressbook/gui/component/e-address-popup.c:1046
-#: 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:364
 # addressbook/gui/component/e-address-widget.c:364
-#: 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:364
 # addressbook/gui/component/e-address-widget.c:364
-#: 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 ""
+
 # mail/mail-config.glade.h:1
 # mail/mail-config.glade.h:1
 # mail/mail-config.glade.h:1
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
 msgstr " 显示支持的数据库(_H) "
 
-#: addressbook/gui/component/ldap-config.glade.h:2
-msgid "1234"
-msgstr "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 ""
 
 # calendar/gui/e-calendar-table.c:437
 # calendar/gui/e-calendar-table.c:437
 # addressbook/gui/component/addressbook-config.glade.h:1
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "1:00"
 msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "2:30"
 msgstr "2:30"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "3268"
 msgstr "3268"
 
-# calendar/gui/e-calendar-table.c:435
-# calendar/gui/e-calendar-table.c:435
-# calendar/gui/e-calendar-table.c:436
-#: addressbook/gui/component/ldap-config.glade.h:6
-msgid "380"
-msgstr "380"
-
 # addressbook/gui/component/addressbook-config.glade.h:1
 # addressbook/gui/component/addressbook-config.glade.h:1
 # addressbook/gui/component/addressbook-config.glade.h:2
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "5:00"
 msgstr "5:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
-msgid "666"
-msgstr "666"
-
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+# addressbook/gui/component/addressbook-component.c:73
+# addressbook/gui/component/addressbook-component.c:73
+# addressbook/gui/component/addressbook-component.c:73
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "<- _Remove"
-msgstr "<- 删除(_R)"
-
-# addressbook/printing/e-contact-print.glade.h:23
-# addressbook/printing/e-contact-print.glade.h:23
-# addressbook/printing/e-contact-print.glade.h:23
-#: 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 "增加 (或编辑) 属性映射"
+#, fuzzy
+msgid "Add LDAP Server"
+msgstr "LDAP 服务器"
 
 # addressbook/gui/component/addressbook-config.glade.h:4
 # addressbook/gui/component/addressbook-config.glade.h:4
 # addressbook/gui/component/addressbook-config.glade.h:6
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
 msgstr "地址簿资源"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:3
 # addressbook/gui/contact-editor/fulladdr.glade.h:3
 # my-evolution/Locations.h:43
-#: 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 "总是"
 
 # camel/camel-sasl-anonymous.c:33
 # camel/camel-sasl-anonymous.c:33
 # camel/camel-sasl-anonymous.c:33
-#: 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 "相关的 LDAP 属性"
-
-#: 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"
@@ -1546,58 +1711,48 @@ msgstr ""
 # ui/evolution-addressbook.xml.h:31
 # ui/evolution-addressbook.xml.h:31
 # my-evolution/Locations.h:502
-#: 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 "对应的 Evolution 属性"
-
-# calendar/gui/e-meeting-time-sel.c:431
-# calendar/gui/e-meeting-time-sel.c:434
-# calendar/gui/e-meeting-time-sel.c:434
-#: addressbook/gui/component/ldap-config.glade.h:25
-msgid "DN Customization"
-msgstr "定制已识别姓名"
-
 # addressbook/gui/component/addressbook-config.glade.h:8
 # addressbook/gui/component/addressbook-config.glade.h:8
 # addressbook/gui/component/addressbook-config.glade.h:11
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "删除(_L)"
 
 # addressbook/gui/component/addressbook-config.glade.h:32
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "已识别的姓名(_D)："
 
+# addressbook/gui/component/addressbook-component.c:73
+# addressbook/gui/component/addressbook-component.c:73
+# addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid "Edit LDAP Server"
+msgstr "LDAP 服务器"
+
 # mail/mail-config.glade.h:99
 # mail/mail-config.glade.h:99
 # mail/mail-config.glade.h:108
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Email Address:"
 msgstr "电子邮件地址："
 
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-#: addressbook/gui/component/ldap-config.glade.h:29
-msgid "Evolution Attribute"
-msgstr "Evolution 属性"
-
 # addressbook/gui/component/addressbook-config.glade.h:10
 # addressbook/gui/component/addressbook-config.glade.h:10
 # addressbook/gui/component/addressbook-config.glade.h:15
-#: 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 "Evolution 将使用该已识别的名字在服务器上对您进行认证"
 
 # addressbook/gui/component/addressbook-config.glade.h:10
 # addressbook/gui/component/addressbook-config.glade.h:10
 # addressbook/gui/component/addressbook-config.glade.h:15
-#: 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 将使用该电子邮件地址在服务器上对您进行认证"
@@ -1605,45 +1760,34 @@ msgstr "Evolution 将使用该电子邮件地址在服务器上对您进行认�
 # addressbook/gui/component/select-names/select-names.glade.h:3
 # addressbook/gui/component/select-names/select-names.glade.h:3
 # addressbook/gui/component/select-names/select-names.glade.h:2
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Finished"
 msgstr "已完成"
 
 # addressbook/gui/contact-editor/contact-editor.glade.h:16
 # addressbook/gui/contact-editor/contact-editor.glade.h:16
 # addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: 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 "LDAP 属性"
-
 # mail/mail-config.glade.h:15
 # mail/mail-config.glade.h:15
 # mail/mail-config.glade.h:19
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "LDAP Configuration Assistant"
 msgstr "LDAP 配置助手"
 
-# addressbook/printing/e-contact-print.glade.h:21
-# addressbook/printing/e-contact-print.glade.h:21
-# addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Mappings"
-msgstr "正在映射"
-
 # mail/mail-config.glade.h:118
 # mail/mail-config.glade.h:118
 # mail/mail-config.glade.h:127
-#: 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"
@@ -1653,55 +1797,17 @@ 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 "在 Evolution 中使用的对象类："
-
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid "Objectclasses Used on Server:"
-msgstr "用在服务器上的对象类："
-
 # addressbook/gui/component/addressbook-config.glade.h:11
 # addressbook/gui/component/addressbook-config.glade.h:11
 # addressbook/gui/component/addressbook-config.glade.h:16
-#: 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 ""
-
-# mail/mail-config.glade.h:23
-# mail/folder-browser.h:26
-# mail/mail-config.glade.h:30
-#: addressbook/gui/component/ldap-config.glade.h:49
-msgid "R_estore Defaults"
-msgstr "恢复默认值(_E)"
-
-# mail/mail-config.glade.h:23
-# mail/folder-browser.h:26
-# mail/mail-config.glade.h:30
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Re_store Defaults"
-msgstr "恢复默认值(_S)"
-
 # addressbook/gui/component/addressbook-config.glade.h:13
 # addressbook/gui/component/addressbook-config.glade.h:13
 # addressbook/gui/component/addressbook-config.glade.h:18
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "搜索范围(_E)："
 
@@ -1712,24 +1818,17 @@ msgstr "搜索范围(_E)："
 # calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
 # calendar/gui/e-week-view.c:1188
 #. 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 "搜索"
 
-# ui/evolution-addressbook.xml.h:21
-# ui/evolution-addressbook.xml.h:21
-# ui/evolution-addressbook.xml.h:21
-#: 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"
@@ -1738,7 +1837,7 @@ msgstr ""
 "选中该选项意味着 Evolution 只在您的 LDAP 服务器支持\n"
 "SSL 或 TLS 时才连接到您的 LDAP 服务器。"
 
-#: 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"
@@ -1749,7 +1848,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"
@@ -1758,21 +1857,14 @@ 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."
@@ -1781,40 +1873,40 @@ msgstr ""
 # mail/mail-config.glade.h:81
 # mail/mail-config.glade.h:81
 # mail/mail-config.glade.h:90
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 1: Server Information"
 msgstr "第一步：服务器信息"
 
 # mail/mail-config.c:2184 mail/mail-config.c:2188
 # mail/mail-config.c:2233 mail/mail-config.c:2237
 # mail/mail-config.c:2326 mail/mail-config.c:2330
-#: 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/addressbook-config.glade.h:15
 # addressbook/gui/component/addressbook-config.glade.h:15
 # addressbook/gui/component/addressbook-config.glade.h:20
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Sub"
 msgstr ""
 
 # shell/evolution-shell-component.c:1023
 # shell/evolution-shell-component.c:1023
 # shell/evolution-shell-component.c:1036
-#: 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"
@@ -1822,7 +1914,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"
@@ -1831,7 +1923,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"
@@ -1839,17 +1931,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"
@@ -1859,14 +1951,14 @@ 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 "这是您的 LDAP 服务器的完整名字。例如，“ldap.mycompany.com”。"
 
 # addressbook/gui/component/addressbook-config.glade.h:25
-#: 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"
@@ -1876,7 +1968,7 @@ msgstr ""
 "得太大将导致地址本变慢。"
 
 # addressbook/gui/component/addressbook-config.glade.h:26
-#: 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 "
@@ -1888,7 +1980,7 @@ msgstr ""
 # addressbook/gui/component/addressbook-config.glade.h:22
 # addressbook/gui/component/addressbook-config.glade.h:22
 # addressbook/gui/component/addressbook-config.glade.h:29
-#: 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"
@@ -1897,7 +1989,7 @@ msgstr ""
 "这是该服务器在 Evolution 文件夹列表中显示的名子。\n"
 "它只用于显示。"
 
-#: 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"
@@ -1905,37 +1997,28 @@ 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 "使用 SSL/TLS (_S)："
 
 # addressbook/gui/component/addressbook-config.glade.h:12
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr "使用已识别的姓名 (DN)"
 
 # addressbook/gui/component/addressbook-config.glade.h:9
 # addressbook/gui/component/addressbook-config.glade.h:9
 # addressbook/gui/component/addressbook-config.glade.h:13
-#: 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 ""
 
@@ -1954,73 +2037,23 @@ msgstr ""
 # addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 # calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
 # mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
-#: 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 "添加(_A)"
 
-# addressbook/gui/component/addressbook-config.glade.h:24
-# 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:7
-# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:24
-# 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:7
-# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:31
-# 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:7
-# mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
-#: addressbook/gui/component/ldap-config.glade.h:109
-msgid "_Add ->"
-msgstr "添加(_A) ->"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-msgid "_Add Mapping"
-msgstr "添加映射(_A)"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-msgid "_Add to DN"
-msgstr "添加到已识别的名字(_A)"
-
-# calendar/gui/e-calendar-table.etspec.h:3
-# calendar/gui/e-calendar-table.etspec.h:3
-# calendar/gui/e-calendar-table.etspec.h:3
-#: addressbook/gui/component/ldap-config.glade.h:112
-msgid "_Always"
-msgstr "总是(_A)"
-
-# ui/evolution-message-composer.xml.h:46
-# ui/evolution-message-composer.xml.h:46
-# ui/evolution-message-composer.xml.h:46
-#: addressbook/gui/component/ldap-config.glade.h:113
-msgid "_Delete Mapping"
-msgstr "删除映射(_D)"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Display name:"
 msgstr "显示姓名(_D)："
 
-# addressbook/gui/component/addressbook-config.glade.h:12
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_Distinguished Name (DN):"
-msgstr "已识别姓名 (DN)(_D)："
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_Don't use SSL/TLS"
-msgstr "不使用 SSL/TLS(_D)"
-
 # addressbook/gui/component/addressbook-config.glade.h:33
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr "下载上限(_D)："
 
@@ -2042,7 +2075,7 @@ msgstr "下载上限(_D)："
 # ui/evolution-message-composer.xml.h:47
 # ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 # ui/evolution-tasks.xml.h:19
-#: 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
@@ -2052,153 +2085,83 @@ msgstr "下载上限(_D)："
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-# calendar/gui/alarm-notify/alarm-notify.glade.h:4
-# calendar/gui/alarm-notify/alarm-notify.glade.h:4
-# calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: addressbook/gui/component/ldap-config.glade.h:119
-msgid "_Edit Mapping"
-msgstr "编辑映射(_E)"
-
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-#: addressbook/gui/component/ldap-config.glade.h:120
-msgid "_Evolution attribute:"
-msgstr "Evolution 属性(_E)："
-
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_If necessary "
-msgstr "如果必要(_I) "
-
-#: addressbook/gui/component/ldap-config.glade.h:122
-msgid "_LDAP attribute:"
-msgstr "LDAP 属性(_L)："
-
-#: addressbook/gui/component/ldap-config.glade.h:123
-msgid "_LDAP attributes:"
-msgstr "LDAP 属性(_L)："
-
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr ""
 
-# calendar/gui/e-meeting-time-sel.c:467
-# calendar/gui/e-meeting-time-sel.c:470
-# calendar/gui/e-meeting-time-sel.c:470
-#: addressbook/gui/component/ldap-config.glade.h:125
-msgid "_More Options >>"
-msgstr "更多选项(_M) >>"
-
 # addressbook/gui/component/addressbook-config.glade.h:27
 # addressbook/gui/component/addressbook-config.glade.h:27
 # addressbook/gui/component/addressbook-config.glade.h:36
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Port number:"
 msgstr "端口号(_P)："
 
-# mail/mail-config.glade.h:23
-# mail/folder-browser.h:26
-# mail/mail-config.glade.h:30
-#: addressbook/gui/component/ldap-config.glade.h:127
-msgid "_Restore Defaults"
-msgstr "恢复默认值(_R)"
-
 # addressbook/gui/component/addressbook-config.glade.h:12
 # addressbook/gui/component/addressbook-config.glade.h:12
 # addressbook/gui/component/addressbook-config.glade.h:17
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Search base:"
 msgstr "搜索起点(_S)："
 
 # addressbook/gui/component/addressbook-config.glade.h:28
 # addressbook/gui/component/addressbook-config.glade.h:28
 # addressbook/gui/component/addressbook-config.glade.h:37
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "服务器名(_S)："
 
 # calendar/gui/alarm-notify/alarm-notify.glade.h:3
 # calendar/gui/alarm-notify/alarm-notify.glade.h:3
 # calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Timeout (minutes):"
 msgstr "超时(分钟)(_T)："
 
-# mail/mail-config.c:326
-# mail/mail-config.c:329
-# mail/mail-config.c:354
-#: addressbook/gui/component/ldap-config.glade.h:131
-#, fuzzy
-msgid "account-druid"
-msgstr "帐号 %d"
-
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-#: addressbook/gui/component/ldap-config.glade.h:132
-msgid "account-editor"
-msgstr "账号编辑器"
-
 # addressbook/gui/widgets/e-addressbook-model.c:127
 # addressbook/gui/widgets/e-addressbook-model.c:127
 # addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "cards"
 msgstr "卡片"
 
 # mail/mail-ops.c:2089
 # mail/mail-ops.c:2091
 # mail/mail-ops.c:2134
-#: 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/contact-editor/contact-editor.glade.h:16
 # addressbook/gui/contact-editor/contact-editor.glade.h:16
 # addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: 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 "对象类-页"
-
 # calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1675
 # calendar/gui/e-week-view.c:1182
 # calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
 # calendar/gui/e-week-view.c:1184
 # calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
 # calendar/gui/e-week-view.c:1188
-#: 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
 # addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 # addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-#: 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 的地址簿名称选择界面。"
 
-# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-#: 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:178
+# addressbook/gui/component/select-names/e-select-names-popup.c:178
+# addressbook/gui/component/select-names/e-select-names-popup.c:178
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "全部删除"
 
 # addressbook/gui/component/select-names/e-select-names-popup.c:163
 # addressbook/gui/component/select-names/e-select-names.c:777
@@ -2210,82 +2173,91 @@ msgstr "地址簿名称选择界面车间"
 # addressbook/gui/component/select-names/e-select-names.c:830
 # composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:436
 #. 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
-# addressbook/gui/component/select-names/e-select-names-popup.c:178
-# addressbook/gui/component/select-names/e-select-names-popup.c:178
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
-msgid "Remove All"
-msgstr "全部删除"
+# addressbook/gui/component/addressbook-component.c:527
+# addressbook/gui/component/addressbook-component.c:527
+# addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+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: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:973
+# addressbook/gui/component/e-address-widget.c:387
+# addressbook/gui/component/select-names/e-select-names-popup.c:306
+#: 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:202
 # addressbook/gui/component/select-names/e-select-names-popup.c:202
-#: 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
-# addressbook/gui/component/select-names/e-select-names-popup.c:405
-# addressbook/gui/component/select-names/e-select-names-popup.c:405
-#: 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
-# addressbook/gui/component/select-names/e-select-names-popup.c:423
-# addressbook/gui/component/select-names/e-select-names-popup.c:423
-#: 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
-# addressbook/gui/component/select-names/e-select-names-popup.c:440
-# addressbook/gui/component/select-names/e-select-names-popup.c:440
-#: 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:506
 # addressbook/gui/component/select-names/e-select-names-popup.c:506
-#: 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 "未命名的联系人"
 
+# mail/mail-config.glade.h:80
+# mail/mail-config.glade.h:80
+# mail/mail-config.glade.h:89
+#: 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:608
 # addressbook/gui/component/select-names/e-select-names.c:608
 # addressbook/gui/component/select-names/e-select-names.c:671
-#: 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 "从地址簿中选择联系人"
 
 # default_user/searches.xml.h:6
 # default_user/searches.xml.h:6
 # default_user/searches.xml.h:6
-#: 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 "在其中寻找联系人"
 
+# mail/mail-search.c:343
+# mail/mail-search.c:343
+# mail/mail-search.c:343
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Find"
+msgstr "寻找："
+
 # addressbook/gui/component/select-names/select-names.glade.h:4
 # addressbook/gui/component/select-names/select-names.glade.h:4
 # addressbook/gui/component/select-names/select-names.glade.h:3
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "选择姓名"
 
 # addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 # addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 # addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-#: addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "Selected Contacts:"
 msgstr "已选中的联系人："
 
@@ -2301,11 +2273,11 @@ msgstr "已选中的联系人："
 # calendar/gui/dialogs/comp-editor-util.c:310
 # calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
 # shell/e-shortcuts.c:1061
-#: 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:"
@@ -2316,52 +2288,45 @@ msgstr ""
 # addressbook/gui/component/select-names/select-names.glade.h:6
 # addressbook/gui/component/select-names/select-names.glade.h:6
 # addressbook/gui/component/select-names/select-names.glade.h:5
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Category:"
 msgstr "类别(_C)："
 
 # addressbook/gui/component/select-names/select-names.glade.h:7
 # addressbook/gui/component/select-names/select-names.glade.h:7
 # addressbook/gui/component/select-names/select-names.glade.h:6
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr "文件夹(_F)："
 
 # addressbook/gui/contact-editor/contact-editor.glade.h:1
 # addressbook/gui/contact-editor/contact-editor.glade.h:1
 # addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "A_ssistant's name:"
 msgstr "助手姓名(_S)："
 
 # addressbook/gui/contact-editor/contact-editor.glade.h:2
 # addressbook/gui/contact-editor/contact-editor.glade.h:2
 # addressbook/gui/contact-editor/contact-editor.glade.h:2
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Add_ress..."
 msgstr "地址(_R)..."
 
 # addressbook/gui/contact-editor/contact-editor.glade.h:3
 # addressbook/gui/contact-editor/contact-editor.glade.h:3
 # addressbook/gui/contact-editor/contact-editor.glade.h:3
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr "周年(_V)："
 
 # addressbook/gui/contact-editor/contact-editor.glade.h:4
 # addressbook/gui/contact-editor/contact-editor.glade.h:4
 # addressbook/gui/contact-editor/contact-editor.glade.h:4
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Birthda_y:"
 msgstr "生日(_Y)："
 
-# addressbook/gui/contact-editor/contact-editor.glade.h:7
-# addressbook/gui/contact-editor/contact-editor.glade.h:7
-# addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
-msgstr "联系人(_O)..."
-
 # addressbook/gui/contact-editor/contact-editor.glade.h:8
 # calendar/gui/dialogs/event-page.glade.h:3
 # calendar/gui/dialogs/task-page.glade.h:1
@@ -2372,7 +2337,7 @@ msgstr "联系人(_O)..."
 # calendar/gui/dialogs/event-page.glade.h:3
 # calendar/gui/dialogs/task-page.glade.h:1
 #: 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)..."
@@ -2392,7 +2357,7 @@ msgstr "合作"
 # addressbook/gui/contact-editor/e-contact-editor.c:1293
 #. 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 "联系人编辑器"
 
@@ -2410,7 +2375,7 @@ msgstr "部门(_E)："
 # addressbook/gui/contact-editor/contact-editor.glade.h:12
 # calendar/gui/dialogs/task-editor.c:183
 #: 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 "细节"
 
@@ -2473,31 +2438,24 @@ msgstr "组织(_Z)："
 msgid "P_rofession:"
 msgstr "职业(_R)："
 
-# addressbook/gui/contact-editor/contact-editor.glade.h:25
-# addressbook/gui/contact-editor/contact-editor.glade.h:25
-# addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: 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:27
 # addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "S_pouse:"
 msgstr "配偶(_P)："
 
 # addressbook/gui/contact-editor/contact-editor.glade.h:28
 # addressbook/gui/contact-editor/contact-editor.glade.h:28
 # addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: 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 "这是邮件地址(_M)"
 
 # addressbook/gui/contact-editor/contact-editor.glade.h:29
 # addressbook/gui/contact-editor/contact-editor.glade.h:29
 # addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: 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 邮件(_H)"
 
@@ -2519,73 +2477,90 @@ msgstr "愿意接收 HTML 邮件(_H)"
 # mail/folder-browser.c:1478 mail/mail-config.glade.h:105
 # ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:97
 # ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
-#: 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 "删除(_D)"
 
 # addressbook/gui/contact-editor/contact-editor.glade.h:32
 # addressbook/gui/contact-editor/contact-editor.glade.h:32
 # addressbook/gui/contact-editor/contact-editor.glade.h:32
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "职称(_J)："
 
 # addressbook/gui/contact-editor/contact-editor.glade.h:33
 # addressbook/gui/contact-editor/contact-editor.glade.h:33
 # addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr "经理姓名(_M)："
 
 # addressbook/gui/contact-editor/contact-editor.glade.h:34
 # addressbook/gui/contact-editor/contact-editor.glade.h:34
 # addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "绰号(_N)："
 
 # addressbook/gui/contact-editor/contact-editor.glade.h:35
 # addressbook/gui/contact-editor/contact-editor.glade.h:35
 # addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "办公室(_O)："
 
 # addressbook/gui/contact-editor/contact-editor.glade.h:36
 # addressbook/gui/contact-editor/contact-editor.glade.h:36
 # addressbook/gui/contact-editor/contact-editor.glade.h:36
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Public Calendar URL:"
 msgstr "公开日历 URL(_P)："
 
 # addressbook/gui/contact-editor/contact-editor.glade.h:37
 # addressbook/gui/contact-editor/contact-editor.glade.h:37
 # addressbook/gui/contact-editor/contact-editor.glade.h:37
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Web page address:"
 msgstr "网页地址(_W)："
 
+# mail/mail-accounts.c:196
+# mail/mail-accounts.c:196
+# mail/mail-accounts.c:196
+#: 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/fulladdr.glade.h:224
 # addressbook/gui/contact-editor/fulladdr.glade.h:224
 # addressbook/gui/contact-editor/e-contact-editor-address.c:128
 # my-evolution/Locations.h:2343
-#: 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 "美国"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:2
 # addressbook/gui/contact-editor/fulladdr.glade.h:2
 # addressbook/gui/contact-editor/e-contact-editor-address.c:129
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Afghanistan"
 msgstr "阿富汗"
 
@@ -2593,7 +2568,7 @@ msgstr "阿富汗"
 # addressbook/gui/contact-editor/fulladdr.glade.h:3
 # addressbook/gui/contact-editor/e-contact-editor-address.c:130
 # my-evolution/Locations.h:42
-#: 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 "阿尔巴尼亚"
@@ -2602,7 +2577,7 @@ msgstr "阿尔巴尼亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:4
 # addressbook/gui/contact-editor/e-contact-editor-address.c:131
 # my-evolution/Locations.h:54
-#: 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 "阿尔及利亚"
@@ -2610,42 +2585,42 @@ msgstr "阿尔及利亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:5
 # addressbook/gui/contact-editor/fulladdr.glade.h:5
 # addressbook/gui/contact-editor/e-contact-editor-address.c:132
-#: 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/fulladdr.glade.h:6
 # addressbook/gui/contact-editor/fulladdr.glade.h:6
 # addressbook/gui/contact-editor/e-contact-editor-address.c:133
-#: 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/fulladdr.glade.h:7
 # addressbook/gui/contact-editor/fulladdr.glade.h:7
 # addressbook/gui/contact-editor/e-contact-editor-address.c:134
-#: 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/fulladdr.glade.h:8
 # addressbook/gui/contact-editor/fulladdr.glade.h:8
 # addressbook/gui/contact-editor/e-contact-editor-address.c:135
-#: 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/fulladdr.glade.h:9
 # addressbook/gui/contact-editor/fulladdr.glade.h:9
 # addressbook/gui/contact-editor/e-contact-editor-address.c:136
-#: 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/fulladdr.glade.h:10
 # addressbook/gui/contact-editor/fulladdr.glade.h:10
 # addressbook/gui/contact-editor/e-contact-editor-address.c:137
-#: 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 "安提瓜和巴布达"
 
@@ -2653,7 +2628,7 @@ msgstr "安提瓜和巴布达"
 # addressbook/gui/contact-editor/fulladdr.glade.h:11
 # addressbook/gui/contact-editor/e-contact-editor-address.c:138
 # my-evolution/Locations.h:120
-#: 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 "阿根廷"
@@ -2661,14 +2636,14 @@ msgstr "阿根廷"
 # addressbook/gui/contact-editor/fulladdr.glade.h:12
 # addressbook/gui/contact-editor/fulladdr.glade.h:12
 # addressbook/gui/contact-editor/e-contact-editor-address.c:139
-#: 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/fulladdr.glade.h:13
 # addressbook/gui/contact-editor/fulladdr.glade.h:13
 # addressbook/gui/contact-editor/e-contact-editor-address.c:140
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Aruba"
 msgstr "阿鲁巴岛"
 
@@ -2676,7 +2651,7 @@ msgstr "阿鲁巴岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # addressbook/gui/contact-editor/e-contact-editor-address.c:141
 # my-evolution/Locations.h:154
-#: 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 "澳大利亚"
@@ -2685,7 +2660,7 @@ msgstr "澳大利亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:15
 # addressbook/gui/contact-editor/e-contact-editor-address.c:142
 # my-evolution/Locations.h:155
-#: 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 "奥地利"
@@ -2693,7 +2668,7 @@ msgstr "奥地利"
 # addressbook/gui/contact-editor/fulladdr.glade.h:16
 # addressbook/gui/contact-editor/fulladdr.glade.h:16
 # addressbook/gui/contact-editor/e-contact-editor-address.c:143
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Azerbaijan"
 msgstr "阿塞拜疆"
 
@@ -2701,7 +2676,7 @@ msgstr "阿塞拜疆"
 # addressbook/gui/contact-editor/fulladdr.glade.h:17
 # addressbook/gui/contact-editor/e-contact-editor-address.c:144
 # my-evolution/Locations.h:161
-#: 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 "巴哈马群岛"
@@ -2710,7 +2685,7 @@ msgstr "巴哈马群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:18
 # addressbook/gui/contact-editor/e-contact-editor-address.c:145
 # my-evolution/Locations.h:164
-#: 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 "巴林岛"
@@ -2718,21 +2693,21 @@ msgstr "巴林岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:19
 # addressbook/gui/contact-editor/fulladdr.glade.h:19
 # addressbook/gui/contact-editor/e-contact-editor-address.c:146
-#: 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/fulladdr.glade.h:20
 # addressbook/gui/contact-editor/fulladdr.glade.h:20
 # addressbook/gui/contact-editor/e-contact-editor-address.c:147
-#: 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/fulladdr.glade.h:21
 # addressbook/gui/contact-editor/fulladdr.glade.h:21
 # addressbook/gui/contact-editor/e-contact-editor-address.c:148
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Belarus"
 msgstr "白俄罗斯"
 
@@ -2740,7 +2715,7 @@ msgstr "白俄罗斯"
 # addressbook/gui/contact-editor/fulladdr.glade.h:22
 # addressbook/gui/contact-editor/e-contact-editor-address.c:149
 # my-evolution/Locations.h:216
-#: 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 "比利时"
@@ -2749,7 +2724,7 @@ msgstr "比利时"
 # addressbook/gui/contact-editor/fulladdr.glade.h:23
 # addressbook/gui/contact-editor/e-contact-editor-address.c:150
 # my-evolution/Locations.h:218
-#: 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 "伯利兹"
@@ -2757,21 +2732,21 @@ msgstr "伯利兹"
 # addressbook/gui/contact-editor/fulladdr.glade.h:24
 # addressbook/gui/contact-editor/fulladdr.glade.h:24
 # addressbook/gui/contact-editor/e-contact-editor-address.c:151
-#: 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/fulladdr.glade.h:25
 # addressbook/gui/contact-editor/fulladdr.glade.h:25
 # addressbook/gui/contact-editor/e-contact-editor-address.c:152
-#: 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/fulladdr.glade.h:26
 # addressbook/gui/contact-editor/fulladdr.glade.h:26
 # addressbook/gui/contact-editor/e-contact-editor-address.c:153
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bhutan"
 msgstr "不丹"
 
@@ -2779,7 +2754,7 @@ msgstr "不丹"
 # addressbook/gui/contact-editor/fulladdr.glade.h:27
 # addressbook/gui/contact-editor/e-contact-editor-address.c:154
 # my-evolution/Locations.h:270
-#: 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 "玻利维亚"
@@ -2787,21 +2762,21 @@ msgstr "玻利维亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:28
 # addressbook/gui/contact-editor/fulladdr.glade.h:28
 # addressbook/gui/contact-editor/e-contact-editor-address.c:155
-#: 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/fulladdr.glade.h:29
 # addressbook/gui/contact-editor/fulladdr.glade.h:29
 # addressbook/gui/contact-editor/e-contact-editor-address.c:156
-#: 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/fulladdr.glade.h:30
 # addressbook/gui/contact-editor/fulladdr.glade.h:30
 # addressbook/gui/contact-editor/e-contact-editor-address.c:157
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bouvet Island"
 msgstr "布维岛"
 
@@ -2809,7 +2784,7 @@ msgstr "布维岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:31
 # addressbook/gui/contact-editor/e-contact-editor-address.c:158
 # my-evolution/Locations.h:294
-#: 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 "巴西"
@@ -2817,14 +2792,14 @@ msgstr "巴西"
 # addressbook/gui/contact-editor/fulladdr.glade.h:32
 # addressbook/gui/contact-editor/fulladdr.glade.h:32
 # addressbook/gui/contact-editor/e-contact-editor-address.c:159
-#: 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/fulladdr.glade.h:34
 # addressbook/gui/contact-editor/fulladdr.glade.h:34
 # addressbook/gui/contact-editor/e-contact-editor-address.c:160
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brunei Darussalam"
 msgstr "文莱 德鲁萨兰"
 
@@ -2832,7 +2807,7 @@ msgstr "文莱 德鲁萨兰"
 # addressbook/gui/contact-editor/fulladdr.glade.h:35
 # addressbook/gui/contact-editor/e-contact-editor-address.c:161
 # my-evolution/Locations.h:320
-#: 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 "保加利亚"
@@ -2840,28 +2815,28 @@ msgstr "保加利亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:36
 # addressbook/gui/contact-editor/fulladdr.glade.h:36
 # addressbook/gui/contact-editor/e-contact-editor-address.c:162
-#: 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/fulladdr.glade.h:37
 # addressbook/gui/contact-editor/fulladdr.glade.h:37
 # addressbook/gui/contact-editor/e-contact-editor-address.c:163
-#: 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/fulladdr.glade.h:38
 # addressbook/gui/contact-editor/fulladdr.glade.h:38
 # addressbook/gui/contact-editor/e-contact-editor-address.c:164
-#: 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/fulladdr.glade.h:39
 # addressbook/gui/contact-editor/fulladdr.glade.h:39
 # addressbook/gui/contact-editor/e-contact-editor-address.c:165
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cameroon"
 msgstr "喀麦隆"
 
@@ -2869,7 +2844,7 @@ msgstr "喀麦隆"
 # addressbook/gui/contact-editor/fulladdr.glade.h:40
 # addressbook/gui/contact-editor/e-contact-editor-address.c:166
 # my-evolution/Locations.h:354
-#: 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 "加拿大"
@@ -2877,7 +2852,7 @@ msgstr "加拿大"
 # addressbook/gui/contact-editor/fulladdr.glade.h:41
 # addressbook/gui/contact-editor/fulladdr.glade.h:41
 # addressbook/gui/contact-editor/e-contact-editor-address.c:167
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cape Verde"
 msgstr "佛得角"
 
@@ -2885,7 +2860,7 @@ msgstr "佛得角"
 # addressbook/gui/contact-editor/fulladdr.glade.h:42
 # addressbook/gui/contact-editor/e-contact-editor-address.c:168
 # my-evolution/Locations.h:389
-#: 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 "开曼群岛"
@@ -2893,14 +2868,14 @@ msgstr "开曼群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:43
 # addressbook/gui/contact-editor/fulladdr.glade.h:43
 # addressbook/gui/contact-editor/e-contact-editor-address.c:169
-#: 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/fulladdr.glade.h:44
 # addressbook/gui/contact-editor/fulladdr.glade.h:44
 # addressbook/gui/contact-editor/e-contact-editor-address.c:170
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Chad"
 msgstr "乍得"
 
@@ -2908,7 +2883,7 @@ msgstr "乍得"
 # addressbook/gui/contact-editor/fulladdr.glade.h:46
 # addressbook/gui/contact-editor/e-contact-editor-address.c:171
 # my-evolution/Locations.h:438
-#: 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 "智利"
@@ -2916,7 +2891,7 @@ msgstr "智利"
 # addressbook/gui/contact-editor/fulladdr.glade.h:47
 # addressbook/gui/contact-editor/fulladdr.glade.h:47
 # addressbook/gui/contact-editor/e-contact-editor-address.c:172
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "China"
 msgstr "中国"
 
@@ -2924,7 +2899,7 @@ msgstr "中国"
 # addressbook/gui/contact-editor/fulladdr.glade.h:48
 # addressbook/gui/contact-editor/e-contact-editor-address.c:173
 # my-evolution/Locations.h:451
-#: 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 "圣诞岛"
@@ -2932,7 +2907,7 @@ msgstr "圣诞岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:49
 # addressbook/gui/contact-editor/fulladdr.glade.h:49
 # addressbook/gui/contact-editor/e-contact-editor-address.c:174
-#: 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 "科科斯群岛"
 
@@ -2940,7 +2915,7 @@ msgstr "科科斯群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:50
 # addressbook/gui/contact-editor/e-contact-editor-address.c:175
 # my-evolution/Locations.h:483
-#: 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 "哥伦比亚"
@@ -2948,7 +2923,7 @@ msgstr "哥伦比亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:51
 # addressbook/gui/contact-editor/fulladdr.glade.h:51
 # addressbook/gui/contact-editor/e-contact-editor-address.c:176
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Comoros"
 msgstr "科摩罗群岛"
 
@@ -2956,15 +2931,15 @@ msgstr "科摩罗群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:52
 # addressbook/gui/contact-editor/e-contact-editor-address.c:177
 # addressbook/gui/contact-editor/e-contact-editor-address.c:178
-#: 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/fulladdr.glade.h:53
 # addressbook/gui/contact-editor/fulladdr.glade.h:53
 # addressbook/gui/contact-editor/e-contact-editor-address.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cook Islands"
 msgstr "库克群岛"
 
@@ -2972,7 +2947,7 @@ msgstr "库克群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:54
 # addressbook/gui/contact-editor/e-contact-editor-address.c:180
 # my-evolution/Locations.h:517
-#: 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 "哥斯达黎加"
@@ -2980,7 +2955,7 @@ msgstr "哥斯达黎加"
 # addressbook/gui/contact-editor/fulladdr.glade.h:55
 # addressbook/gui/contact-editor/fulladdr.glade.h:55
 # addressbook/gui/contact-editor/e-contact-editor-address.c:181
-#: 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 "科特迪瓦"
 
@@ -2988,7 +2963,7 @@ msgstr "科特迪瓦"
 # addressbook/gui/contact-editor/fulladdr.glade.h:57
 # addressbook/gui/contact-editor/e-contact-editor-address.c:182
 # my-evolution/Locations.h:528
-#: 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 "克罗地亚"
@@ -2997,7 +2972,7 @@ msgstr "克罗地亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:58
 # addressbook/gui/contact-editor/e-contact-editor-address.c:183
 # my-evolution/Locations.h:532
-#: 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 "古巴"
@@ -3006,7 +2981,7 @@ msgstr "古巴"
 # addressbook/gui/contact-editor/fulladdr.glade.h:59
 # addressbook/gui/contact-editor/e-contact-editor-address.c:184
 # my-evolution/Locations.h:545
-#: 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 "塞浦路斯"
@@ -3015,7 +2990,7 @@ msgstr "塞浦路斯"
 # addressbook/gui/contact-editor/fulladdr.glade.h:60
 # addressbook/gui/contact-editor/e-contact-editor-address.c:185
 # my-evolution/Locations.h:546
-#: 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 "捷克共和国"
@@ -3024,7 +2999,7 @@ msgstr "捷克共和国"
 # addressbook/gui/contact-editor/fulladdr.glade.h:61
 # addressbook/gui/contact-editor/e-contact-editor-address.c:186
 # my-evolution/Locations.h:580
-#: 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 "丹麦"
@@ -3032,14 +3007,14 @@ msgstr "丹麦"
 # addressbook/gui/contact-editor/fulladdr.glade.h:62
 # addressbook/gui/contact-editor/fulladdr.glade.h:62
 # addressbook/gui/contact-editor/e-contact-editor-address.c:187
-#: 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/fulladdr.glade.h:63
 # addressbook/gui/contact-editor/fulladdr.glade.h:63
 # addressbook/gui/contact-editor/e-contact-editor-address.c:188
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Dominica"
 msgstr "多米尼加"
 
@@ -3047,7 +3022,7 @@ msgstr "多米尼加"
 # addressbook/gui/contact-editor/fulladdr.glade.h:64
 # addressbook/gui/contact-editor/e-contact-editor-address.c:189
 # my-evolution/Locations.h:608
-#: 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 "多米尼加共和国"
@@ -3055,7 +3030,7 @@ msgstr "多米尼加共和国"
 # addressbook/gui/contact-editor/fulladdr.glade.h:65
 # addressbook/gui/contact-editor/fulladdr.glade.h:65
 # addressbook/gui/contact-editor/e-contact-editor-address.c:190
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr "东帝汶"
 
@@ -3063,7 +3038,7 @@ msgstr "东帝汶"
 # addressbook/gui/contact-editor/fulladdr.glade.h:66
 # addressbook/gui/contact-editor/e-contact-editor-address.c:191
 # my-evolution/Locations.h:641
-#: 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 "厄瓜多尔"
@@ -3072,7 +3047,7 @@ msgstr "厄瓜多尔"
 # addressbook/gui/contact-editor/fulladdr.glade.h:67
 # addressbook/gui/contact-editor/e-contact-editor-address.c:192
 # my-evolution/Locations.h:650
-#: 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 "埃及"
@@ -3081,7 +3056,7 @@ msgstr "埃及"
 # addressbook/gui/contact-editor/fulladdr.glade.h:68
 # addressbook/gui/contact-editor/e-contact-editor-address.c:193
 # my-evolution/Locations.h:666
-#: 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 "萨尔瓦多"
@@ -3089,14 +3064,14 @@ msgstr "萨尔瓦多"
 # addressbook/gui/contact-editor/fulladdr.glade.h:69
 # addressbook/gui/contact-editor/fulladdr.glade.h:69
 # addressbook/gui/contact-editor/e-contact-editor-address.c:194
-#: 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/fulladdr.glade.h:70
 # addressbook/gui/contact-editor/fulladdr.glade.h:70
 # addressbook/gui/contact-editor/e-contact-editor-address.c:195
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "厄立特里亚"
 
@@ -3104,7 +3079,7 @@ msgstr "厄立特里亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:71
 # addressbook/gui/contact-editor/e-contact-editor-address.c:196
 # my-evolution/Locations.h:684
-#: 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 "爱沙尼亚"
@@ -3112,28 +3087,28 @@ msgstr "爱沙尼亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:72
 # addressbook/gui/contact-editor/fulladdr.glade.h:72
 # addressbook/gui/contact-editor/e-contact-editor-address.c:197
-#: 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/fulladdr.glade.h:73
 # addressbook/gui/contact-editor/fulladdr.glade.h:73
 # addressbook/gui/contact-editor/e-contact-editor-address.c:198
-#: 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/fulladdr.glade.h:74
 # addressbook/gui/contact-editor/fulladdr.glade.h:74
 # addressbook/gui/contact-editor/e-contact-editor-address.c:199
-#: 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/fulladdr.glade.h:75
 # addressbook/gui/contact-editor/fulladdr.glade.h:75
 # addressbook/gui/contact-editor/e-contact-editor-address.c:200
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "斐济"
 
@@ -3141,7 +3116,7 @@ msgstr "斐济"
 # addressbook/gui/contact-editor/fulladdr.glade.h:76
 # addressbook/gui/contact-editor/e-contact-editor-address.c:201
 # my-evolution/Locations.h:716
-#: 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 "芬兰"
@@ -3150,7 +3125,7 @@ msgstr "芬兰"
 # addressbook/gui/contact-editor/fulladdr.glade.h:77
 # addressbook/gui/contact-editor/e-contact-editor-address.c:202
 # my-evolution/Locations.h:766
-#: 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 "法国"
@@ -3158,35 +3133,35 @@ msgstr "法国"
 # addressbook/gui/contact-editor/fulladdr.glade.h:78
 # addressbook/gui/contact-editor/fulladdr.glade.h:78
 # addressbook/gui/contact-editor/e-contact-editor-address.c:203
-#: 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/fulladdr.glade.h:79
 # addressbook/gui/contact-editor/fulladdr.glade.h:79
 # addressbook/gui/contact-editor/e-contact-editor-address.c:204
-#: 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/fulladdr.glade.h:80
 # addressbook/gui/contact-editor/fulladdr.glade.h:80
 # addressbook/gui/contact-editor/e-contact-editor-address.c:205
-#: 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/fulladdr.glade.h:81
 # addressbook/gui/contact-editor/fulladdr.glade.h:81
 # addressbook/gui/contact-editor/e-contact-editor-address.c:206
-#: 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/fulladdr.glade.h:82
 # addressbook/gui/contact-editor/fulladdr.glade.h:82
 # addressbook/gui/contact-editor/e-contact-editor-address.c:207
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "冈比亚"
 
@@ -3194,7 +3169,7 @@ msgstr "冈比亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:83
 # addressbook/gui/contact-editor/e-contact-editor-address.c:208
 # my-evolution/Locations.h:811
-#: 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 "格鲁吉亚"
@@ -3203,7 +3178,7 @@ msgstr "格鲁吉亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:84
 # addressbook/gui/contact-editor/e-contact-editor-address.c:209
 # my-evolution/Locations.h:812
-#: 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 "德国"
@@ -3211,7 +3186,7 @@ msgstr "德国"
 # addressbook/gui/contact-editor/fulladdr.glade.h:85
 # addressbook/gui/contact-editor/fulladdr.glade.h:85
 # addressbook/gui/contact-editor/e-contact-editor-address.c:210
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "加纳"
 
@@ -3219,7 +3194,7 @@ msgstr "加纳"
 # addressbook/gui/contact-editor/fulladdr.glade.h:86
 # addressbook/gui/contact-editor/e-contact-editor-address.c:211
 # my-evolution/Locations.h:815
-#: 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 "直布罗陀"
@@ -3228,7 +3203,7 @@ msgstr "直布罗陀"
 # addressbook/gui/contact-editor/fulladdr.glade.h:87
 # addressbook/gui/contact-editor/e-contact-editor-address.c:212
 # my-evolution/Locations.h:846
-#: 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 "希腊"
@@ -3236,28 +3211,28 @@ msgstr "希腊"
 # addressbook/gui/contact-editor/fulladdr.glade.h:88
 # addressbook/gui/contact-editor/fulladdr.glade.h:88
 # addressbook/gui/contact-editor/e-contact-editor-address.c:213
-#: 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/fulladdr.glade.h:89
 # addressbook/gui/contact-editor/fulladdr.glade.h:89
 # addressbook/gui/contact-editor/e-contact-editor-address.c:214
-#: 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/fulladdr.glade.h:90
 # addressbook/gui/contact-editor/fulladdr.glade.h:90
 # addressbook/gui/contact-editor/e-contact-editor-address.c:215
-#: 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/fulladdr.glade.h:91
 # addressbook/gui/contact-editor/fulladdr.glade.h:91
 # addressbook/gui/contact-editor/e-contact-editor-address.c:216
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "关岛"
 
@@ -3265,7 +3240,7 @@ msgstr "关岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:92
 # addressbook/gui/contact-editor/e-contact-editor-address.c:217
 # my-evolution/Locations.h:867
-#: 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 "危地马拉"
@@ -3273,21 +3248,21 @@ msgstr "危地马拉"
 # addressbook/gui/contact-editor/fulladdr.glade.h:93
 # addressbook/gui/contact-editor/fulladdr.glade.h:93
 # addressbook/gui/contact-editor/e-contact-editor-address.c:218
-#: 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/fulladdr.glade.h:94
 # addressbook/gui/contact-editor/fulladdr.glade.h:94
 # addressbook/gui/contact-editor/e-contact-editor-address.c:219
-#: 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/fulladdr.glade.h:95
 # addressbook/gui/contact-editor/fulladdr.glade.h:95
 # addressbook/gui/contact-editor/e-contact-editor-address.c:220
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guyana"
 msgstr "圭亚那"
 
@@ -3295,7 +3270,7 @@ msgstr "圭亚那"
 # addressbook/gui/contact-editor/fulladdr.glade.h:96
 # addressbook/gui/contact-editor/e-contact-editor-address.c:221
 # my-evolution/Locations.h:888
-#: 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 "海地"
@@ -3303,14 +3278,14 @@ msgstr "海地"
 # addressbook/gui/contact-editor/fulladdr.glade.h:97
 # addressbook/gui/contact-editor/fulladdr.glade.h:97
 # addressbook/gui/contact-editor/e-contact-editor-address.c:222
-#: 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/fulladdr.glade.h:98
 # addressbook/gui/contact-editor/fulladdr.glade.h:98
 # addressbook/gui/contact-editor/e-contact-editor-address.c:223
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr "圣座"
 
@@ -3318,7 +3293,7 @@ msgstr "圣座"
 # addressbook/gui/contact-editor/fulladdr.glade.h:99
 # addressbook/gui/contact-editor/e-contact-editor-address.c:224
 # my-evolution/Locations.h:945
-#: 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 "洪都拉斯"
@@ -3327,7 +3302,7 @@ msgstr "洪都拉斯"
 # addressbook/gui/contact-editor/fulladdr.glade.h:100
 # addressbook/gui/contact-editor/e-contact-editor-address.c:225
 # my-evolution/Locations.h:946
-#: 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 "香港"
@@ -3336,7 +3311,7 @@ msgstr "香港"
 # addressbook/gui/contact-editor/fulladdr.glade.h:101
 # addressbook/gui/contact-editor/e-contact-editor-address.c:226
 # my-evolution/Locations.h:966
-#: 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 "匈牙利"
@@ -3345,7 +3320,7 @@ msgstr "匈牙利"
 # addressbook/gui/contact-editor/fulladdr.glade.h:102
 # addressbook/gui/contact-editor/e-contact-editor-address.c:227
 # my-evolution/Locations.h:978
-#: 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 "冰岛"
@@ -3354,7 +3329,7 @@ msgstr "冰岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:103
 # addressbook/gui/contact-editor/e-contact-editor-address.c:228
 # my-evolution/Locations.h:991
-#: 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 "印度"
@@ -3362,7 +3337,7 @@ msgstr "印度"
 # addressbook/gui/contact-editor/fulladdr.glade.h:104
 # addressbook/gui/contact-editor/fulladdr.glade.h:104
 # addressbook/gui/contact-editor/e-contact-editor-address.c:229
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Indonesia"
 msgstr "印度尼西亚"
 
@@ -3370,7 +3345,7 @@ msgstr "印度尼西亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:105
 # addressbook/gui/contact-editor/e-contact-editor-address.c:230
 # my-evolution/Locations.h:1007
-#: 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 "爱尔兰"
@@ -3378,7 +3353,7 @@ msgstr "爱尔兰"
 # addressbook/gui/contact-editor/fulladdr.glade.h:106
 # addressbook/gui/contact-editor/fulladdr.glade.h:106
 # addressbook/gui/contact-editor/e-contact-editor-address.c:231
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "以色列"
 
@@ -3386,7 +3361,7 @@ msgstr "以色列"
 # addressbook/gui/contact-editor/fulladdr.glade.h:107
 # addressbook/gui/contact-editor/e-contact-editor-address.c:232
 # my-evolution/Locations.h:1016
-#: 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 "意大利"
@@ -3395,7 +3370,7 @@ msgstr "意大利"
 # addressbook/gui/contact-editor/fulladdr.glade.h:108
 # addressbook/gui/contact-editor/e-contact-editor-address.c:233
 # my-evolution/Locations.h:1031
-#: 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 "牙买加"
@@ -3404,7 +3379,7 @@ msgstr "牙买加"
 # addressbook/gui/contact-editor/fulladdr.glade.h:109
 # addressbook/gui/contact-editor/e-contact-editor-address.c:234
 # my-evolution/Locations.h:1035
-#: 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 "日本"
@@ -3413,7 +3388,7 @@ msgstr "日本"
 # addressbook/gui/contact-editor/fulladdr.glade.h:110
 # addressbook/gui/contact-editor/e-contact-editor-address.c:235
 # my-evolution/Locations.h:1046
-#: 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 "约旦"
@@ -3421,28 +3396,28 @@ msgstr "约旦"
 # addressbook/gui/contact-editor/fulladdr.glade.h:111
 # addressbook/gui/contact-editor/fulladdr.glade.h:111
 # addressbook/gui/contact-editor/e-contact-editor-address.c:236
-#: 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/fulladdr.glade.h:112
 # addressbook/gui/contact-editor/fulladdr.glade.h:112
 # addressbook/gui/contact-editor/e-contact-editor-address.c:237
-#: 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/fulladdr.glade.h:113
 # addressbook/gui/contact-editor/fulladdr.glade.h:113
 # addressbook/gui/contact-editor/e-contact-editor-address.c:238
-#: 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/fulladdr.glade.h:60
 # addressbook/gui/contact-editor/fulladdr.glade.h:60
 # addressbook/gui/contact-editor/e-contact-editor-address.c:239
-#: 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 "大韩民国"
 
@@ -3450,7 +3425,7 @@ msgstr "大韩民国"
 # addressbook/gui/contact-editor/fulladdr.glade.h:114
 # addressbook/gui/contact-editor/e-contact-editor-address.c:240
 # my-evolution/Locations.h:1146
-#: 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 "科威特"
@@ -3458,14 +3433,14 @@ msgstr "科威特"
 # addressbook/gui/contact-editor/fulladdr.glade.h:115
 # addressbook/gui/contact-editor/fulladdr.glade.h:115
 # addressbook/gui/contact-editor/e-contact-editor-address.c:241
-#: 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/fulladdr.glade.h:116
 # addressbook/gui/contact-editor/fulladdr.glade.h:116
 # addressbook/gui/contact-editor/e-contact-editor-address.c:242
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Laos"
 msgstr "老挝"
 
@@ -3473,7 +3448,7 @@ msgstr "老挝"
 # addressbook/gui/contact-editor/fulladdr.glade.h:117
 # addressbook/gui/contact-editor/e-contact-editor-address.c:243
 # my-evolution/Locations.h:1190
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Latvia"
 msgstr "拉脱维亚"
 
@@ -3481,7 +3456,7 @@ msgstr "拉脱维亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:118
 # addressbook/gui/contact-editor/e-contact-editor-address.c:244
 # my-evolution/Locations.h:1198
-#: 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 "黎巴嫩"
@@ -3489,7 +3464,7 @@ msgstr "黎巴嫩"
 # addressbook/gui/contact-editor/fulladdr.glade.h:119
 # addressbook/gui/contact-editor/fulladdr.glade.h:119
 # addressbook/gui/contact-editor/e-contact-editor-address.c:245
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lesotho"
 msgstr "莱索托"
 
@@ -3497,7 +3472,7 @@ msgstr "莱索托"
 # addressbook/gui/contact-editor/fulladdr.glade.h:120
 # addressbook/gui/contact-editor/e-contact-editor-address.c:246
 # my-evolution/Locations.h:1218
-#: 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 "利比里亚"
@@ -3505,7 +3480,7 @@ msgstr "利比里亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:121
 # addressbook/gui/contact-editor/fulladdr.glade.h:121
 # addressbook/gui/contact-editor/e-contact-editor-address.c:247
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liechtenstein"
 msgstr "列支敦士登"
 
@@ -3513,7 +3488,7 @@ msgstr "列支敦士登"
 # addressbook/gui/contact-editor/fulladdr.glade.h:122
 # addressbook/gui/contact-editor/e-contact-editor-address.c:248
 # my-evolution/Locations.h:1234
-#: 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 "立陶宛"
@@ -3522,7 +3497,7 @@ msgstr "立陶宛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:123
 # addressbook/gui/contact-editor/e-contact-editor-address.c:249
 # my-evolution/Locations.h:1268
-#: 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 "卢森堡"
@@ -3530,49 +3505,49 @@ msgstr "卢森堡"
 # addressbook/gui/contact-editor/fulladdr.glade.h:124
 # addressbook/gui/contact-editor/fulladdr.glade.h:124
 # addressbook/gui/contact-editor/e-contact-editor-address.c:250
-#: 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/fulladdr.glade.h:125
 # addressbook/gui/contact-editor/fulladdr.glade.h:125
 # addressbook/gui/contact-editor/e-contact-editor-address.c:251
-#: 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/fulladdr.glade.h:126
 # addressbook/gui/contact-editor/fulladdr.glade.h:126
 # addressbook/gui/contact-editor/e-contact-editor-address.c:252
-#: 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/fulladdr.glade.h:127
 # addressbook/gui/contact-editor/fulladdr.glade.h:127
 # addressbook/gui/contact-editor/e-contact-editor-address.c:253
-#: 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/fulladdr.glade.h:128
 # addressbook/gui/contact-editor/fulladdr.glade.h:128
 # addressbook/gui/contact-editor/e-contact-editor-address.c:254
-#: 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/fulladdr.glade.h:129
 # addressbook/gui/contact-editor/fulladdr.glade.h:129
 # addressbook/gui/contact-editor/e-contact-editor-address.c:255
-#: 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/fulladdr.glade.h:130
 # addressbook/gui/contact-editor/fulladdr.glade.h:130
 # addressbook/gui/contact-editor/e-contact-editor-address.c:256
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mali"
 msgstr "马里"
 
@@ -3580,7 +3555,7 @@ msgstr "马里"
 # addressbook/gui/contact-editor/fulladdr.glade.h:131
 # addressbook/gui/contact-editor/e-contact-editor-address.c:257
 # my-evolution/Locations.h:1297
-#: 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 "马耳他"
@@ -3588,35 +3563,35 @@ msgstr "马耳他"
 # addressbook/gui/contact-editor/fulladdr.glade.h:132
 # addressbook/gui/contact-editor/fulladdr.glade.h:132
 # addressbook/gui/contact-editor/e-contact-editor-address.c:258
-#: 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/fulladdr.glade.h:133
 # addressbook/gui/contact-editor/fulladdr.glade.h:133
 # addressbook/gui/contact-editor/e-contact-editor-address.c:259
-#: 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/fulladdr.glade.h:134
 # addressbook/gui/contact-editor/fulladdr.glade.h:134
 # addressbook/gui/contact-editor/e-contact-editor-address.c:260
-#: 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/fulladdr.glade.h:135
 # addressbook/gui/contact-editor/fulladdr.glade.h:135
 # addressbook/gui/contact-editor/e-contact-editor-address.c:261
-#: 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/fulladdr.glade.h:136
 # addressbook/gui/contact-editor/fulladdr.glade.h:136
 # addressbook/gui/contact-editor/e-contact-editor-address.c:262
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mayotte"
 msgstr "马约特岛"
 
@@ -3624,43 +3599,43 @@ msgstr "马约特岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:137
 # addressbook/gui/contact-editor/e-contact-editor-address.c:263
 # my-evolution/Locations.h:1387
-#: 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/fulladdr.glade.h:138
 # addressbook/gui/contact-editor/fulladdr.glade.h:138
 # addressbook/gui/contact-editor/e-contact-editor-address.c:264
-#: 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/fulladdr.glade.h:60
 # addressbook/gui/contact-editor/fulladdr.glade.h:60
 # addressbook/gui/contact-editor/e-contact-editor-address.c:265
-#: 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/fulladdr.glade.h:139
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # addressbook/gui/contact-editor/e-contact-editor-address.c:266
-#: 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/fulladdr.glade.h:140
 # addressbook/gui/contact-editor/fulladdr.glade.h:140
 # addressbook/gui/contact-editor/e-contact-editor-address.c:267
-#: 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/fulladdr.glade.h:141
 # addressbook/gui/contact-editor/fulladdr.glade.h:141
 # addressbook/gui/contact-editor/e-contact-editor-address.c:268
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Montserrat"
 msgstr "蒙特塞拉特群岛"
 
@@ -3668,43 +3643,43 @@ msgstr "蒙特塞拉特群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:142
 # addressbook/gui/contact-editor/e-contact-editor-address.c:269
 # my-evolution/Locations.h:1470
-#: 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/fulladdr.glade.h:143
 # addressbook/gui/contact-editor/fulladdr.glade.h:143
 # addressbook/gui/contact-editor/e-contact-editor-address.c:270
-#: 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/fulladdr.glade.h:144
 # addressbook/gui/contact-editor/fulladdr.glade.h:144
 # addressbook/gui/contact-editor/e-contact-editor-address.c:271
-#: 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/fulladdr.glade.h:145
 # addressbook/gui/contact-editor/fulladdr.glade.h:145
 # addressbook/gui/contact-editor/e-contact-editor-address.c:272
-#: 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/fulladdr.glade.h:146
 # addressbook/gui/contact-editor/fulladdr.glade.h:146
 # addressbook/gui/contact-editor/e-contact-editor-address.c:273
-#: 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/fulladdr.glade.h:147
 # addressbook/gui/contact-editor/fulladdr.glade.h:147
 # addressbook/gui/contact-editor/e-contact-editor-address.c:274
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nepal"
 msgstr "尼泊尔"
 
@@ -3712,22 +3687,22 @@ msgstr "尼泊尔"
 # addressbook/gui/contact-editor/fulladdr.glade.h:148
 # addressbook/gui/contact-editor/e-contact-editor-address.c:275
 # my-evolution/Locations.h:1531
-#: 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/fulladdr.glade.h:149
 # addressbook/gui/contact-editor/fulladdr.glade.h:149
 # addressbook/gui/contact-editor/e-contact-editor-address.c:276
-#: 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/fulladdr.glade.h:150
 # addressbook/gui/contact-editor/fulladdr.glade.h:150
 # addressbook/gui/contact-editor/e-contact-editor-address.c:277
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "New Caledonia"
 msgstr "新喀里多尼亚"
 
@@ -3735,8 +3710,8 @@ msgstr "新喀里多尼亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:151
 # addressbook/gui/contact-editor/e-contact-editor-address.c:278
 # my-evolution/Locations.h:1560
-#: 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 "新西兰"
 
@@ -3744,29 +3719,29 @@ msgstr "新西兰"
 # addressbook/gui/contact-editor/fulladdr.glade.h:152
 # addressbook/gui/contact-editor/e-contact-editor-address.c:279
 # my-evolution/Locations.h:1562
-#: 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/fulladdr.glade.h:153
 # addressbook/gui/contact-editor/fulladdr.glade.h:153
 # addressbook/gui/contact-editor/e-contact-editor-address.c:280
-#: 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/fulladdr.glade.h:154
 # addressbook/gui/contact-editor/fulladdr.glade.h:154
 # addressbook/gui/contact-editor/e-contact-editor-address.c:281
-#: 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/fulladdr.glade.h:155
 # addressbook/gui/contact-editor/fulladdr.glade.h:155
 # addressbook/gui/contact-editor/e-contact-editor-address.c:282
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niue"
 msgstr "纽埃岛"
 
@@ -3774,15 +3749,15 @@ msgstr "纽埃岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:156
 # addressbook/gui/contact-editor/e-contact-editor-address.c:283
 # my-evolution/Locations.h:1574
-#: 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/fulladdr.glade.h:157
 # addressbook/gui/contact-editor/fulladdr.glade.h:157
 # addressbook/gui/contact-editor/e-contact-editor-address.c:284
-#: 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 "北马里亚那群岛"
 
@@ -3790,8 +3765,8 @@ msgstr "北马里亚那群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:158
 # addressbook/gui/contact-editor/e-contact-editor-address.c:285
 # my-evolution/Locations.h:1587
-#: 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 "挪威"
 
@@ -3799,8 +3774,8 @@ msgstr "挪威"
 # addressbook/gui/contact-editor/fulladdr.glade.h:159
 # addressbook/gui/contact-editor/e-contact-editor-address.c:286
 # my-evolution/Locations.h:1632
-#: 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 "阿曼"
 
@@ -3808,22 +3783,22 @@ msgstr "阿曼"
 # addressbook/gui/contact-editor/fulladdr.glade.h:160
 # addressbook/gui/contact-editor/e-contact-editor-address.c:287
 # my-evolution/Locations.h:1673
-#: 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/fulladdr.glade.h:161
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # addressbook/gui/contact-editor/e-contact-editor-address.c:288
-#: 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/fulladdr.glade.h:162
 # addressbook/gui/contact-editor/fulladdr.glade.h:162
 # addressbook/gui/contact-editor/e-contact-editor-address.c:289
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Palestinian Territory"
 msgstr "巴勒斯坦地区"
 
@@ -3831,15 +3806,15 @@ msgstr "巴勒斯坦地区"
 # addressbook/gui/contact-editor/fulladdr.glade.h:163
 # addressbook/gui/contact-editor/e-contact-editor-address.c:290
 # my-evolution/Locations.h:1683
-#: 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/fulladdr.glade.h:164
 # addressbook/gui/contact-editor/fulladdr.glade.h:164
 # addressbook/gui/contact-editor/e-contact-editor-address.c:291
-#: 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 "巴布亚新几内亚"
 
@@ -3847,8 +3822,8 @@ msgstr "巴布亚新几内亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:165
 # addressbook/gui/contact-editor/e-contact-editor-address.c:292
 # my-evolution/Locations.h:1688
-#: 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 "巴拉圭"
 
@@ -3856,22 +3831,22 @@ msgstr "巴拉圭"
 # addressbook/gui/contact-editor/fulladdr.glade.h:166
 # addressbook/gui/contact-editor/e-contact-editor-address.c:293
 # my-evolution/Locations.h:1723
-#: 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/fulladdr.glade.h:167
 # addressbook/gui/contact-editor/fulladdr.glade.h:167
 # addressbook/gui/contact-editor/e-contact-editor-address.c:294
-#: 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/fulladdr.glade.h:168
 # addressbook/gui/contact-editor/fulladdr.glade.h:168
 # addressbook/gui/contact-editor/e-contact-editor-address.c:295
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pitcairn"
 msgstr "皮特克恩岛"
 
@@ -3879,8 +3854,8 @@ msgstr "皮特克恩岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # addressbook/gui/contact-editor/e-contact-editor-address.c:296
 # my-evolution/Locations.h:1764
-#: 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 "波兰"
 
@@ -3888,8 +3863,8 @@ msgstr "波兰"
 # addressbook/gui/contact-editor/fulladdr.glade.h:170
 # addressbook/gui/contact-editor/e-contact-editor-address.c:297
 # my-evolution/Locations.h:1791
-#: 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 "葡萄牙"
 
@@ -3897,8 +3872,8 @@ msgstr "葡萄牙"
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # addressbook/gui/contact-editor/e-contact-editor-address.c:298
 # my-evolution/Locations.h:1824
-#: 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 "波多黎各"
 
@@ -3906,15 +3881,15 @@ msgstr "波多黎各"
 # addressbook/gui/contact-editor/fulladdr.glade.h:172
 # addressbook/gui/contact-editor/e-contact-editor-address.c:299
 # my-evolution/Locations.h:1836
-#: 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/fulladdr.glade.h:175
 # addressbook/gui/contact-editor/fulladdr.glade.h:175
 # addressbook/gui/contact-editor/e-contact-editor-address.c:300
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Reunion"
 msgstr "留尼汪"
 
@@ -3922,64 +3897,64 @@ msgstr "留尼汪"
 # addressbook/gui/contact-editor/fulladdr.glade.h:176
 # addressbook/gui/contact-editor/e-contact-editor-address.c:301
 # my-evolution/Locations.h:1912
-#: 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/fulladdr.glade.h:177
 # addressbook/gui/contact-editor/fulladdr.glade.h:177
 # addressbook/gui/contact-editor/e-contact-editor-address.c:302
-#: 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/fulladdr.glade.h:178
 # addressbook/gui/contact-editor/fulladdr.glade.h:178
 # addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: 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/fulladdr.glade.h:179
 # addressbook/gui/contact-editor/fulladdr.glade.h:179
 # addressbook/gui/contact-editor/e-contact-editor-address.c:304
-#: 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/fulladdr.glade.h:180
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # addressbook/gui/contact-editor/e-contact-editor-address.c:305
-#: 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/fulladdr.glade.h:181
 # addressbook/gui/contact-editor/fulladdr.glade.h:181
 # addressbook/gui/contact-editor/e-contact-editor-address.c:306
-#: 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/fulladdr.glade.h:182
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # addressbook/gui/contact-editor/e-contact-editor-address.c:307
-#: 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/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/e-contact-editor-address.c:308
-#: 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/fulladdr.glade.h:184
 # addressbook/gui/contact-editor/fulladdr.glade.h:184
 # addressbook/gui/contact-editor/e-contact-editor-address.c:309
-#: 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 "圣多美和普林西比"
 
@@ -3987,29 +3962,29 @@ msgstr "圣多美和普林西比"
 # addressbook/gui/contact-editor/fulladdr.glade.h:185
 # addressbook/gui/contact-editor/e-contact-editor-address.c:310
 # my-evolution/Locations.h:2035
-#: 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/fulladdr.glade.h:186
 # addressbook/gui/contact-editor/fulladdr.glade.h:186
 # addressbook/gui/contact-editor/e-contact-editor-address.c:311
-#: 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/fulladdr.glade.h:187
 # addressbook/gui/contact-editor/fulladdr.glade.h:187
 # addressbook/gui/contact-editor/e-contact-editor-address.c:312
-#: 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/fulladdr.glade.h:188
 # addressbook/gui/contact-editor/fulladdr.glade.h:188
 # addressbook/gui/contact-editor/e-contact-editor-address.c:313
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Sierra Leone"
 msgstr "塞拉利昂"
 
@@ -4017,8 +3992,8 @@ msgstr "塞拉利昂"
 # addressbook/gui/contact-editor/fulladdr.glade.h:189
 # addressbook/gui/contact-editor/e-contact-editor-address.c:314
 # my-evolution/Locations.h:2090
-#: 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 "新加坡"
 
@@ -4026,8 +4001,8 @@ msgstr "新加坡"
 # addressbook/gui/contact-editor/fulladdr.glade.h:190
 # addressbook/gui/contact-editor/e-contact-editor-address.c:315
 # my-evolution/Locations.h:2103
-#: 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 "斯洛伐克"
 
@@ -4035,22 +4010,22 @@ msgstr "斯洛伐克"
 # addressbook/gui/contact-editor/fulladdr.glade.h:191
 # addressbook/gui/contact-editor/e-contact-editor-address.c:316
 # my-evolution/Locations.h:2104
-#: 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/fulladdr.glade.h:192
 # addressbook/gui/contact-editor/fulladdr.glade.h:192
 # addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#: 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/fulladdr.glade.h:193
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # addressbook/gui/contact-editor/e-contact-editor-address.c:318
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Somalia"
 msgstr "索马里"
 
@@ -4058,15 +4033,15 @@ msgstr "索马里"
 # addressbook/gui/contact-editor/fulladdr.glade.h:194
 # addressbook/gui/contact-editor/e-contact-editor-address.c:319
 # my-evolution/Locations.h:2119
-#: 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/fulladdr.glade.h:195
 # addressbook/gui/contact-editor/fulladdr.glade.h:195
 # addressbook/gui/contact-editor/e-contact-editor-address.c:320
-#: 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 "南乔治亚和南三文治群岛"
 
@@ -4074,36 +4049,36 @@ msgstr "南乔治亚和南三文治群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:196
 # addressbook/gui/contact-editor/e-contact-editor-address.c:321
 # my-evolution/Locations.h:2127
-#: 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/fulladdr.glade.h:197
 # addressbook/gui/contact-editor/fulladdr.glade.h:197
 # addressbook/gui/contact-editor/e-contact-editor-address.c:322
-#: 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/fulladdr.glade.h:198
 # addressbook/gui/contact-editor/fulladdr.glade.h:198
 # addressbook/gui/contact-editor/e-contact-editor-address.c:323
-#: 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/fulladdr.glade.h:199
 # addressbook/gui/contact-editor/fulladdr.glade.h:199
 # addressbook/gui/contact-editor/e-contact-editor-address.c:324
-#: 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/fulladdr.glade.h:200
 # addressbook/gui/contact-editor/fulladdr.glade.h:200
 # addressbook/gui/contact-editor/e-contact-editor-address.c:325
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sudan"
 msgstr "苏丹"
 
@@ -4111,22 +4086,22 @@ msgstr "苏丹"
 # addressbook/gui/contact-editor/fulladdr.glade.h:201
 # addressbook/gui/contact-editor/e-contact-editor-address.c:326
 # my-evolution/Locations.h:2176
-#: 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/fulladdr.glade.h:202
 # addressbook/gui/contact-editor/fulladdr.glade.h:202
 # addressbook/gui/contact-editor/e-contact-editor-address.c:327
-#: 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/fulladdr.glade.h:203
 # addressbook/gui/contact-editor/fulladdr.glade.h:203
 # addressbook/gui/contact-editor/e-contact-editor-address.c:328
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Swaziland"
 msgstr "斯威士兰"
 
@@ -4134,8 +4109,8 @@ msgstr "斯威士兰"
 # addressbook/gui/contact-editor/fulladdr.glade.h:204
 # addressbook/gui/contact-editor/e-contact-editor-address.c:329
 # my-evolution/Locations.h:2181
-#: 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 "瑞典"
 
@@ -4143,8 +4118,8 @@ msgstr "瑞典"
 # addressbook/gui/contact-editor/fulladdr.glade.h:205
 # addressbook/gui/contact-editor/e-contact-editor-address.c:330
 # my-evolution/Locations.h:2183
-#: 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 "瑞士"
 
@@ -4152,64 +4127,64 @@ msgstr "瑞士"
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/e-contact-editor-address.c:331
 # my-evolution/Locations.h:2205
-#: 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/fulladdr.glade.h:207
 # addressbook/gui/contact-editor/fulladdr.glade.h:207
 # addressbook/gui/contact-editor/e-contact-editor-address.c:332
-#: 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/fulladdr.glade.h:223
 # addressbook/gui/contact-editor/fulladdr.glade.h:223
 # addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#: 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/fulladdr.glade.h:208
 # addressbook/gui/contact-editor/fulladdr.glade.h:208
 # addressbook/gui/contact-editor/e-contact-editor-address.c:334
-#: 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/fulladdr.glade.h:209
 # addressbook/gui/contact-editor/fulladdr.glade.h:209
 # addressbook/gui/contact-editor/e-contact-editor-address.c:335
-#: 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/fulladdr.glade.h:210
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # addressbook/gui/contact-editor/e-contact-editor-address.c:336
-#: 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/fulladdr.glade.h:211
 # addressbook/gui/contact-editor/fulladdr.glade.h:211
 # addressbook/gui/contact-editor/e-contact-editor-address.c:337
-#: 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/fulladdr.glade.h:212
 # addressbook/gui/contact-editor/fulladdr.glade.h:212
 # addressbook/gui/contact-editor/e-contact-editor-address.c:338
-#: 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/fulladdr.glade.h:213
 # addressbook/gui/contact-editor/fulladdr.glade.h:213
 # addressbook/gui/contact-editor/e-contact-editor-address.c:339
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tunisia"
 msgstr "突尼斯"
 
@@ -4217,36 +4192,36 @@ msgstr "突尼斯"
 # addressbook/gui/contact-editor/fulladdr.glade.h:214
 # addressbook/gui/contact-editor/e-contact-editor-address.c:340
 # my-evolution/Locations.h:2321
-#: 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/fulladdr.glade.h:215
 # addressbook/gui/contact-editor/fulladdr.glade.h:215
 # addressbook/gui/contact-editor/e-contact-editor-address.c:341
-#: 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/fulladdr.glade.h:216
 # addressbook/gui/contact-editor/fulladdr.glade.h:216
 # addressbook/gui/contact-editor/e-contact-editor-address.c:342
-#: 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/fulladdr.glade.h:217
 # addressbook/gui/contact-editor/fulladdr.glade.h:217
 # addressbook/gui/contact-editor/e-contact-editor-address.c:343
-#: 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/fulladdr.glade.h:219
 # addressbook/gui/contact-editor/fulladdr.glade.h:219
 # addressbook/gui/contact-editor/e-contact-editor-address.c:344
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Uganda"
 msgstr "乌干达"
 
@@ -4254,15 +4229,15 @@ msgstr "乌干达"
 # addressbook/gui/contact-editor/fulladdr.glade.h:220
 # addressbook/gui/contact-editor/e-contact-editor-address.c:345
 # my-evolution/Locations.h:2334
-#: 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/fulladdr.glade.h:221
 # addressbook/gui/contact-editor/fulladdr.glade.h:221
 # addressbook/gui/contact-editor/e-contact-editor-address.c:346
-#: 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 "阿拉伯联合酋长国"
 
@@ -4270,15 +4245,15 @@ msgstr "阿拉伯联合酋长国"
 # addressbook/gui/contact-editor/fulladdr.glade.h:222
 # addressbook/gui/contact-editor/e-contact-editor-address.c:347
 # my-evolution/Locations.h:2342
-#: 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/fulladdr.glade.h:225
 # addressbook/gui/contact-editor/fulladdr.glade.h:225
 # addressbook/gui/contact-editor/e-contact-editor-address.c:348
-#: 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 "美国小型外岛"
 
@@ -4286,22 +4261,22 @@ msgstr "美国小型外岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:226
 # addressbook/gui/contact-editor/e-contact-editor-address.c:349
 # my-evolution/Locations.h:2348
-#: 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/fulladdr.glade.h:227
 # addressbook/gui/contact-editor/fulladdr.glade.h:227
 # addressbook/gui/contact-editor/e-contact-editor-address.c:350
-#: 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/fulladdr.glade.h:228
 # addressbook/gui/contact-editor/fulladdr.glade.h:228
 # addressbook/gui/contact-editor/e-contact-editor-address.c:351
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Vanuatu"
 msgstr "努瓦阿图"
 
@@ -4309,8 +4284,8 @@ msgstr "努瓦阿图"
 # addressbook/gui/contact-editor/fulladdr.glade.h:229
 # addressbook/gui/contact-editor/e-contact-editor-address.c:352
 # my-evolution/Locations.h:2380
-#: 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 "委内瑞拉"
 
@@ -4318,36 +4293,36 @@ msgstr "委内瑞拉"
 # addressbook/gui/contact-editor/fulladdr.glade.h:230
 # addressbook/gui/contact-editor/e-contact-editor-address.c:353
 # my-evolution/Locations.h:2392
-#: 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/fulladdr.glade.h:218
 # addressbook/gui/contact-editor/fulladdr.glade.h:218
 # addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: 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/fulladdr.glade.h:218
 # addressbook/gui/contact-editor/fulladdr.glade.h:218
 # addressbook/gui/contact-editor/e-contact-editor-address.c:355
-#: 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/fulladdr.glade.h:231
 # addressbook/gui/contact-editor/fulladdr.glade.h:231
 # addressbook/gui/contact-editor/e-contact-editor-address.c:356
-#: 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/fulladdr.glade.h:232
 # addressbook/gui/contact-editor/fulladdr.glade.h:232
 # addressbook/gui/contact-editor/e-contact-editor-address.c:357
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Western Sahara"
 msgstr "西撒哈拉"
 
@@ -4355,8 +4330,8 @@ msgstr "西撒哈拉"
 # addressbook/gui/contact-editor/fulladdr.glade.h:233
 # addressbook/gui/contact-editor/e-contact-editor-address.c:358
 # my-evolution/Locations.h:2512
-#: 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 "也门"
 
@@ -4364,73 +4339,124 @@ msgstr "也门"
 # addressbook/gui/contact-editor/fulladdr.glade.h:234
 # addressbook/gui/contact-editor/e-contact-editor-address.c:359
 # my-evolution/Locations.h:2524
-#: 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/fulladdr.glade.h:235
 # addressbook/gui/contact-editor/fulladdr.glade.h:235
 # addressbook/gui/contact-editor/e-contact-editor-address.c:360
-#: 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/fulladdr.glade.h:236
 # addressbook/gui/contact-editor/fulladdr.glade.h:236
 # addressbook/gui/contact-editor/e-contact-editor-address.c:361
-#: 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-confirm-delete.glade.h:1
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr "您确定要删除该联系人吗？"
+# addressbook/printing/e-contact-print.glade.h:4
+# addressbook/printing/e-contact-print.glade.h:4
+# my-evolution/Locations.h:267
+#: 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
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "删除联系人？"
+# addressbook/backend/ebook/e-card-simple.c:73
+# addressbook/gui/contact-editor/e-contact-editor.c:1649
+# addressbook/backend/ebook/e-card-simple.c:73
+# addressbook/gui/contact-editor/e-contact-editor.c:1649
+# addressbook/backend/ebook/e-card-simple.c:73
+# addressbook/gui/contact-editor/e-contact-editor.c:1649
+#: 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:170
+msgid "Is New Card"
+msgstr ""
+
+# ui/evolution-message-composer.xml.h:49
+# ui/evolution-message-composer.xml.h:49
+# my-evolution/Locations.h:1381
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
+#, fuzzy
+msgid "Writable Fields"
+msgstr "发件人域(_F)"
+
+# addressbook/gui/contact-editor/fulladdr.glade.h:44
+# addressbook/gui/contact-editor/fulladdr.glade.h:44
+# addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#, fuzzy
+msgid "Changed"
+msgstr "乍得"
 
 # addressbook/gui/contact-editor/e-contact-editor.c:757
 # addressbook/gui/contact-editor/e-contact-editor.c:757
 # addressbook/gui/contact-editor/e-contact-editor.c:757
-#: 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:764
 # addressbook/gui/contact-editor/e-contact-editor.c:764
 # addressbook/gui/contact-editor/e-contact-editor.c:764
-#: 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:978
 # addressbook/gui/contact-editor/e-contact-editor.c:978
 # addressbook/gui/contact-editor/e-contact-editor.c:978
-#: 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-confirm-delete.glade.h:1
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr "您确定要删除该联系人吗？"
+
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: 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:1662
 # addressbook/gui/contact-editor/e-contact-editor.c:1662
 # addressbook/gui/contact-editor/e-contact-editor.c:1662
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 # addressbook/gui/contact-editor/e-contact-editor.c:2287
 # addressbook/gui/contact-editor/e-contact-editor.c:2287
 # addressbook/gui/contact-editor/e-contact-editor.c:2309
-#: 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”"
@@ -4438,54 +4464,51 @@ msgstr "无法为域找到构件：“%s”"
 # addressbook/gui/contact-editor/e-contact-quick-add.c:298
 # addressbook/gui/contact-editor/e-contact-quick-add.c:298
 # addressbook/gui/contact-editor/e-contact-quick-add.c:298
-#: 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:300
 # addressbook/gui/contact-editor/e-contact-quick-add.c:300
 # addressbook/gui/contact-editor/e-contact-quick-add.c:300
-#: 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/widgets/e-addressbook-view.c:850
-# addressbook/gui/contact-editor/e-contact-quick-add.c:326
-# addressbook/gui/widgets/e-addressbook-view.c:850
-# addressbook/gui/contact-editor/e-contact-quick-add.c:326
-# addressbook/gui/widgets/e-addressbook-view.c:961
-#: 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:332
 # addressbook/gui/contact-editor/e-contact-quick-add.c:332
 # addressbook/gui/contact-editor/e-contact-quick-add.c:332
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "E-mail"
 msgstr "电子邮件"
 
+# composer/e-msg-composer.c:978
+# composer/e-msg-composer.c:982
+# composer/e-msg-composer.c:947
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, fuzzy, c-format
+msgid "Error saving %s: %s"
+msgstr "保存文件错误： %s"
+
 # addressbook/gui/contact-editor/e-contact-save-as.c:106
 # addressbook/gui/contact-editor/e-contact-save-as.c:106
 # addressbook/gui/contact-editor/e-contact-save-as.c:106
 #. 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:170
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
-#: 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:201
 # addressbook/gui/contact-editor/e-contact-save-as.c:201
 # addressbook/gui/contact-editor/e-contact-save-as.c:201
-#: 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"
@@ -4494,224 +4517,216 @@ 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 ""
-
 # calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1908
 # mail/mail-display.c:102
 # calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:2027
 # mail/mail-display.c:102
 # calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2063
 # mail/mail-display.c:101
-#: 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:1
 # addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "地址 2(_2):"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:45
 # addressbook/gui/contact-editor/fulladdr.glade.h:45
 # addressbook/gui/contact-editor/fulladdr.glade.h: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:56
 # addressbook/gui/contact-editor/fulladdr.glade.h:56
 # addressbook/gui/contact-editor/fulladdr.glade.h:3
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "国家(_Y)："
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:237
 # addressbook/gui/contact-editor/fulladdr.glade.h:237
 # addressbook/gui/contact-editor/fulladdr.glade.h:4
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "地址(_A)："
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:238
 # addressbook/gui/contact-editor/fulladdr.glade.h:238
 # addressbook/gui/contact-editor/fulladdr.glade.h:5
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr "城市(_C)："
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:239
 # addressbook/gui/contact-editor/fulladdr.glade.h:239
 # addressbook/gui/contact-editor/fulladdr.glade.h:6
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "邮局邮箱(_P)："
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:240
 # addressbook/gui/contact-editor/fulladdr.glade.h:240
 # addressbook/gui/contact-editor/fulladdr.glade.h:7
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "州/省(_S)："
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:241
 # addressbook/gui/contact-editor/fulladdr.glade.h:241
 # addressbook/gui/contact-editor/fulladdr.glade.h:8
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "邮政编码(_Z)："
 
 # addressbook/gui/contact-editor/fullname.glade.h:1
 # addressbook/gui/contact-editor/fullname.glade.h:1
 # addressbook/gui/contact-editor/fullname.glade.h:1
-#: 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:2
 # addressbook/gui/contact-editor/fullname.glade.h:2
-#: 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:3
 # addressbook/gui/contact-editor/fullname.glade.h:3
-#: 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:4
 # addressbook/gui/contact-editor/fullname.glade.h:4
-#: 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:5
 # addressbook/gui/contact-editor/fullname.glade.h:5
-#: 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:6
 # addressbook/gui/contact-editor/fullname.glade.h:6
-#: 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:7
 # addressbook/gui/contact-editor/fullname.glade.h:7
-#: 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:8
 # addressbook/gui/contact-editor/fullname.glade.h:8
-#: 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:9
 # addressbook/gui/contact-editor/fullname.glade.h:9
-#: 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:10
 # addressbook/gui/contact-editor/fullname.glade.h:10
-#: 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:11
 # addressbook/gui/contact-editor/fullname.glade.h:11
-#: 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:12
 # addressbook/gui/contact-editor/fullname.glade.h:12
-#: 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:13
 # addressbook/gui/contact-editor/fullname.glade.h:13
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "名(_F)："
 
 # addressbook/gui/contact-editor/fullname.glade.h:14
 # addressbook/gui/contact-editor/fullname.glade.h:14
 # addressbook/gui/contact-editor/fullname.glade.h:14
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "姓(_L)："
 
 # addressbook/gui/contact-editor/fullname.glade.h:15
 # addressbook/gui/contact-editor/fullname.glade.h:15
 # addressbook/gui/contact-editor/fullname.glade.h:15
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "中间名(_M)："
 
 # addressbook/gui/contact-editor/fullname.glade.h:16
 # addressbook/gui/contact-editor/fullname.glade.h:16
 # addressbook/gui/contact-editor/fullname.glade.h:16
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "后缀(_S)："
 
 # addressbook/gui/contact-editor/fullname.glade.h:17
 # addressbook/gui/contact-editor/fullname.glade.h:17
 # addressbook/gui/contact-editor/fullname.glade.h:17
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "头衔(_T):"
 
 # addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 # addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 # addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: 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 "列举姓名(_N)："
 
 # addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
 # addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
 # addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: 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:3
 # addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: 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:5
 # addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: 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 "在往该列表发送邮件时隐藏地址(_H)"
 
@@ -4721,7 +4736,7 @@ msgstr "在往该列表发送邮件时隐藏地址(_H)"
 # calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 # addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 # calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
-#: 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 "删除(_R)"
@@ -4729,22 +4744,30 @@ msgstr "删除(_R)"
 # addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 # addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 # addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-#: 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 "联系人列表编辑器"
 
+# ui/evolution-addressbook.xml.h:12
+# ui/evolution-addressbook.xml.h:12
+# ui/evolution-addressbook.xml.h:12
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+#, fuzzy
+msgid "Is New List"
+msgstr "新列表"
+
 # addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
 # addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
 # addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
 #. 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:428
 # addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
 # addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
-#: 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"
 
@@ -4845,52 +4868,66 @@ msgstr ""
 # widgets/misc/e-filter-bar.c:238
 # addressbook/gui/search/e-addressbook-search-dialog.c:145
 # widgets/misc/e-filter-bar.c:238
-#: 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
-# addressbook/gui/search/e-addressbook-search-dialog.c:151
-# mail/mail-search.c:263
-# addressbook/gui/search/e-addressbook-search-dialog.c:151
-# mail/mail-search.c:263
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr "搜索"
-
 # addressbook/gui/widgets/e-addressbook-model.c:127
 # addressbook/gui/widgets/e-addressbook-model.c:127
 # addressbook/gui/widgets/e-addressbook-model.c:127
-#: 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:130
 # addressbook/gui/widgets/e-addressbook-model.c:130
 # addressbook/gui/widgets/e-addressbook-model.c:130
-#: 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:133
 # addressbook/gui/widgets/e-addressbook-model.c:133
 # addressbook/gui/widgets/e-addressbook-model.c:133
-#: 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/contact-editor/fulladdr.glade.h:84
+# addressbook/gui/contact-editor/fulladdr.glade.h:84
+# my-evolution/Locations.h:870
+#: 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 "格恩西岛"
+
 # shell/e-shell-importer.c:455
 # shell/e-shell-importer.c:455
 # shell/e-shell-importer.c:466
-#: addressbook/gui/widgets/e-addressbook-model.c:408
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 #, fuzzy
 msgid "Error getting book view"
 msgstr "启动 %s 错误"
 
+# 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:1655
+# 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:1655
+# my-evolution/Locations.h:1433
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#, fuzzy
+msgid "Model"
+msgstr "手机"
+
 # addressbook/gui/widgets/e-addressbook-table-adapter.c:140
 # addressbook/gui/widgets/e-addressbook-util.c:85
 # addressbook/gui/widgets/e-minicard.c:475
@@ -4901,8 +4938,8 @@ msgstr "启动 %s 错误"
 # addressbook/gui/widgets/e-addressbook-util.c:85
 # addressbook/gui/widgets/e-minicard.c:475
 #: 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 "修改卡片错误"
 
@@ -4912,8 +4949,8 @@ msgstr "修改卡片错误"
 # shell/evolution-shell-component.c:1007
 # addressbook/gui/widgets/e-addressbook-util.c:33
 # shell/evolution-shell-component.c:1020
-#: 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 "成功"
 
@@ -4929,18 +4966,19 @@ msgstr "成功"
 # camel/providers/imap/camel-imap-command.c:275
 # camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1895
 # shell/e-storage.c:528 shell/evolution-shell-component.c:1057
-#: 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:35
 # addressbook/gui/widgets/e-addressbook-util.c:35
 # addressbook/gui/widgets/e-addressbook-util.c:35
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "仓库离线"
 
@@ -4950,29 +4988,29 @@ msgstr "仓库离线"
 # shell/evolution-shell-component.c:1035
 # addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
 # shell/evolution-shell-component.c:1048
-#: 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:37
 # addressbook/gui/widgets/e-addressbook-util.c:37
 # addressbook/gui/widgets/e-addressbook-util.c:37
-#: 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:38
 # addressbook/gui/widgets/e-addressbook-util.c:38
 # addressbook/gui/widgets/e-addressbook-util.c:38
-#: 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:39
 # addressbook/gui/widgets/e-addressbook-util.c:39
 # addressbook/gui/widgets/e-addressbook-util.c:39
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "不支持的协议"
 
@@ -4991,46 +5029,46 @@ msgstr "不支持的协议"
 # calendar/gui/dialogs/task-details-page.glade.h:3
 # calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
 # camel/camel-service.c:610 camel/camel-service.c:646
-#: 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 "已经取消"
 
 # camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 # camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 # camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr "认证失败"
 
 # camel/providers/smtp/camel-smtp-transport.c:222
 # camel/providers/smtp/camel-smtp-transport.c:222
 # camel/providers/smtp/camel-smtp-transport.c:223
-#: 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 不可用"
 
 # shell/e-shell-importer.c:397
 # shell/e-shell-importer.c:397
 # shell/e-shell-importer.c:409
-#: 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:41
 # addressbook/gui/widgets/e-addressbook-util.c:41
 # addressbook/gui/widgets/e-addressbook-util.c:41
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "其它错误"
 
@@ -5040,37 +5078,47 @@ msgstr "其它错误"
 # calendar/gui/dialogs/save-comp.c:50
 # addressbook/gui/widgets/e-addressbook-util.c:57
 # calendar/gui/dialogs/save-comp.c:50
-#: 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/printing/e-contact-print.c:1171
+# addressbook/printing/e-contact-print.c:1193
+# addressbook/printing/e-contact-print.c:1171
+# addressbook/printing/e-contact-print.c:1193
+# my-evolution/Locations.h:600
+#: addressbook/gui/widgets/e-addressbook-util.c:77
+#, fuzzy
+msgid "_Discard"
+msgstr "打印卡片"
+
 # addressbook/gui/widgets/e-addressbook-util.c:76
 # addressbook/gui/widgets/e-addressbook-util.c:76
 # addressbook/gui/widgets/e-addressbook-util.c:76
-#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "添加列表错误"
 
 # addressbook/gui/widgets/e-addressbook-util.c:76
 # addressbook/gui/widgets/e-addressbook-util.c:76
 # addressbook/gui/widgets/e-addressbook-util.c:76
-#: 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:85
 # addressbook/gui/widgets/e-addressbook-util.c:85
 # addressbook/gui/widgets/e-addressbook-util.c:85
-#: 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:95
 # addressbook/gui/widgets/e-addressbook-util.c:95
 # addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "删除列表错误"
 
@@ -5080,28 +5128,13 @@ msgstr "删除列表错误"
 # addressbook/gui/widgets/e-addressbook-view.c:1278
 # addressbook/gui/widgets/e-addressbook-util.c:95
 # addressbook/gui/widgets/e-addressbook-view.c:1389
-#: 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 "删除卡片错误"
 
-# mail/mail-config.glade.h:28
-# mail/mail-config.glade.h:28
-# addressbook/gui/widgets/e-addressbook-util.c:202
-#: addressbook/gui/widgets/e-addressbook-util.c:208
-msgid "Display Cards?"
-msgstr "显示卡片？"
-
-# mail/mail-config.glade.h:28
-# mail/mail-config.glade.h:28
-# addressbook/gui/widgets/e-addressbook-util.c:203
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-msgid "Display Cards"
-msgstr "显示卡片"
-
 # addressbook/gui/widgets/e-addressbook-util.c:207
-#: 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"
@@ -5113,36 +5146,71 @@ msgstr ""
 # mail/mail-callbacks.c:1281 mail/message-browser.c:130
 # mail/mail-callbacks.c:1376 mail/message-browser.c:130
 # mail/mail-callbacks.c:1411 mail/message-browser.c:130
-#: addressbook/gui/widgets/e-addressbook-util.c:348
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr "将卡片移动到"
 
 # ui/evolution-tasks.xml.h:4
 # ui/evolution-tasks.xml.h:4
 # ui/evolution-tasks.xml.h:4
-#: 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-model.c:127
 # addressbook/gui/widgets/e-addressbook-model.c:127
 # addressbook/gui/widgets/e-addressbook-model.c:127
-#: 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-model.c:127
 # addressbook/gui/widgets/e-addressbook-model.c:127
 # addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/widgets/e-addressbook-util.c:355
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "将卡片复制到"
 
+# addressbook/backend/ebook/e-card.c:4235
+# addressbook/backend/ebook/e-card.c:4235
+# addressbook/backend/ebook/e-card.c:4235
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "多个 VCard"
+
+# addressbook/backend/ebook/e-card.c:4243
+# addressbook/backend/ebook/e-card.c:4243
+# addressbook/backend/ebook/e-card.c:4243
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "%s 的 VCard"
+
+# 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 mail/mail-config.glade.h:85
+# shell/glade/e-active-connection-dialog.glade.h:5
+# 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 mail/mail-config.glade.h:85
+# shell/glade/e-active-connection-dialog.glade.h:5
+# 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 mail/mail-config.glade.h:94
+# shell/glade/e-active-connection-dialog.glade.h:5
+#: 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 "类型"
+
 # importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 # importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 # importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: 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 "地址簿"
 
@@ -5164,9 +5232,9 @@ msgstr "地址簿"
 # addressbook/gui/widgets/e-addressbook-view.c:834
 # addressbook/gui/widgets/e-addressbook-view.c:1516
 # ui/evolution-addressbook.xml.h:19
-#: 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"
@@ -5177,49 +5245,49 @@ msgstr "保存为 VCard"
 # ui/evolution-addressbook.xml.h:11
 # addressbook/gui/component/addressbook-component.c:527
 # ui/evolution-addressbook.xml.h:11
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "New Contact..."
 msgstr "新建联系人..."
 
 # addressbook/gui/component/addressbook-component.c:527
 # addressbook/gui/component/addressbook-component.c:527
 # addressbook/gui/component/addressbook-component.c:530
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "New Contact List..."
 msgstr "新建联系人列表..."
 
 # ui/evolution.xml.h:39
 # ui/evolution.xml.h:39
 # ui/evolution.xml.h:39
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Go to Folder..."
 msgstr "转到文件夹..."
 
 # ui/evolution.xml.h:41
 # ui/evolution.xml.h:41
 # ui/evolution.xml.h:41
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Import..."
 msgstr "正在导入..."
 
 # ui/evolution-addressbook.xml.h:39
 # ui/evolution-addressbook.xml.h:39
 # ui/evolution-addressbook.xml.h:41
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Search for Contacts..."
 msgstr "搜索联系人..."
 
 # ui/evolution-addressbook.xml.h:30
 # ui/evolution-addressbook.xml.h:30
 # ui/evolution-addressbook.xml.h:31
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Addressbook Sources..."
 msgstr "地址簿来源..."
 
 # ui/evolution.xml.h:45
 # ui/evolution.xml.h:45
 # ui/evolution.xml.h:45
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Pilot Settings..."
 msgstr "Pilot 设置..."
 
@@ -5232,7 +5300,7 @@ msgstr "Pilot 设置..."
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:279
 # addressbook/gui/widgets/e-addressbook-view.c:835
 # ui/evolution-addressbook.xml.h:10
-#: 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 "转发联系人"
@@ -5243,7 +5311,7 @@ msgstr "转发联系人"
 # addressbook/gui/widgets/e-addressbook-view.c:735
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
 # addressbook/gui/widgets/e-addressbook-view.c:836
-#: addressbook/gui/widgets/e-addressbook-view.c:815
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr "给联系人发邮件"
 
@@ -5262,7 +5330,7 @@ msgstr "给联系人发邮件"
 # 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:2
-#: 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
@@ -5275,21 +5343,21 @@ msgstr "打印"
 # addressbook/gui/widgets/e-addressbook-view.c:738
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:283
 # addressbook/gui/widgets/e-addressbook-view.c:839
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr "打印信封"
 
 # mail/folder-browser.c:1467
 # mail/folder-browser.c:1476
 # mail/folder-browser.c:1477
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Copy to folder..."
 msgstr "复制到文件夹..."
 
 # mail/folder-browser.c:1466
 # mail/folder-browser.c:1475
 # mail/folder-browser.c:1476
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Move to folder..."
 msgstr "移动到文件夹..."
 
@@ -5298,7 +5366,7 @@ msgstr "移动到文件夹..."
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:285
 # addressbook/gui/widgets/e-addressbook-view.c:841
 # ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:7
-#: 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 "剪切"
@@ -5311,7 +5379,7 @@ msgstr "剪切"
 # addressbook/gui/widgets/e-addressbook-view.c:842
 # ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
 # ui/evolution-tasks.xml.h:3
-#: 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"
@@ -5322,7 +5390,7 @@ msgstr "复制"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:287
 # addressbook/gui/widgets/e-addressbook-view.c:843
 # ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
-#: 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 "粘贴"
@@ -5344,10 +5412,9 @@ msgstr "粘贴"
 # mail/mail-accounts.c:296 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:18
-#: 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 "删除"
@@ -5355,8 +5422,8 @@ msgstr "删除"
 # widgets/menus/gal-view-menus.c:195
 # widgets/menus/gal-view-menus.c:195
 # widgets/menus/gal-view-menus.c:195
-#: 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 "当前视图"
 
@@ -5367,7 +5434,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,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"
 
@@ -5378,11 +5445,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"
@@ -5498,7 +5565,7 @@ msgstr "主要电话"
 # addressbook/gui/widgets/e-minicard-control.c:185
 # addressbook/gui/widgets/e-minicard-control.c:185
 # addressbook/gui/widgets/e-minicard-control.c:185
-#: 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 张卡片。"
@@ -5506,21 +5573,80 @@ msgstr "以及另外 %d 张卡片。"
 # addressbook/gui/widgets/e-minicard-control.c:187
 # addressbook/gui/widgets/e-minicard-control.c:187
 # addressbook/gui/widgets/e-minicard-control.c:187
-#: 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:316
 # addressbook/gui/widgets/e-minicard-control.c:316
-#: addressbook/gui/widgets/e-minicard-control.c:316
+#: addressbook/gui/widgets/e-minicard-control.c:318
 msgid "Save in addressbook"
 msgstr "保存在地址簿中"
 
+# addressbook/printing/e-contact-print.glade.h:41
+# addressbook/printing/e-contact-print.glade.h:41
+# addressbook/printing/e-contact-print.glade.h:41
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+#, fuzzy
+msgid "Width"
+msgstr "宽度："
+
+# addressbook/printing/e-contact-print.glade.h:15
+# addressbook/printing/e-contact-print.glade.h:15
+# addressbook/printing/e-contact-print.glade.h:15
+#: 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 ""
+
+# ui/evolution-message-composer.xml.h:49
+# ui/evolution-message-composer.xml.h:49
+# my-evolution/Locations.h:698
+#: addressbook/gui/widgets/e-minicard-label.c:136
+#, fuzzy
+msgid "Field"
+msgstr "发件人域(_F)"
+
+# addressbook/backend/ebook/e-card-simple.c:105
+# addressbook/backend/ebook/e-card-simple.c:105
+# addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/gui/widgets/e-minicard-label.c:143
+#, fuzzy
+msgid "Field Name"
+msgstr "姓"
+
+# ui/evolution-mail-message.xml.h:85
+# ui/evolution-mail-message.xml.h:85
+# ui/evolution-mail-message.xml.h:87
+#: addressbook/gui/widgets/e-minicard-label.c:150
+#, fuzzy
+msgid "Text Model"
+msgstr "文本大小(_Z)"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr ""
+
+# addressbook/gui/contact-editor/fulladdr.glade.h:50
+# addressbook/gui/contact-editor/fulladdr.glade.h:50
+# my-evolution/Locations.h:487
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#, fuzzy
+msgid "Column Width"
+msgstr "哥伦比亚"
+
 # addressbook/gui/widgets/e-minicard-view.c:150
 # addressbook/gui/widgets/e-minicard-view.c:150
 # addressbook/gui/widgets/e-minicard-view.c:150
-#: addressbook/gui/widgets/e-minicard-view.c:140
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -5537,35 +5663,67 @@ msgstr ""
 # addressbook/gui/widgets/e-minicard-view.c:150
 # addressbook/gui/widgets/e-minicard-view.c:150
 # addressbook/gui/widgets/e-minicard-view.c:150
-#: 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 "\n\n本视图中没有可显示的项。"
+msgstr ""
+"\n"
+"\n"
+"本视图中没有可显示的项。"
+
+# addressbook/gui/contact-editor/fulladdr.glade.h:6
+# addressbook/gui/contact-editor/fulladdr.glade.h:6
+# my-evolution/Locations.h:18
+#: addressbook/gui/widgets/e-minicard-view.c:452
+#, fuzzy
+msgid "Adapter"
+msgstr "安道尔"
+
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "已选择："
+
+# calendar/gui/e-calendar-table.etspec.h:17
+# calendar/gui/e-calendar-table.etspec.h:17
+# calendar/gui/e-calendar-table.etspec.h:17
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "任务排序"
 
 # addressbook/gui/widgets/gal-view-factory-minicard.c:26
 # addressbook/gui/widgets/gal-view-factory-minicard.c:26
 # addressbook/gui/widgets/gal-view-factory-minicard.c:26
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "卡片视图"
 
+# calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+# calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+# calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
+#, fuzzy
+msgid "GTK Tree View"
+msgstr "周视图"
+
 # addressbook/printing/e-contact-print-envelope.c:215
 # addressbook/printing/e-contact-print-envelope.c:236
 # addressbook/printing/e-contact-print-envelope.c:215
 # addressbook/printing/e-contact-print-envelope.c:236
 # addressbook/printing/e-contact-print-envelope.c:215
 # addressbook/printing/e-contact-print-envelope.c:236
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
+#: 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:1111
 # addressbook/printing/e-contact-print.c:1111
 # addressbook/printing/e-contact-print.c:1115
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1130
 msgid "Print cards"
 msgstr "打印卡片"
 
@@ -5575,8 +5733,8 @@ msgstr "打印卡片"
 # addressbook/printing/e-contact-print.c:1193
 # addressbook/printing/e-contact-print.c:1175
 # addressbook/printing/e-contact-print.c:1197
-#: 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 "打印卡片"
 
@@ -5703,7 +5861,6 @@ msgstr "包含："
 # addressbook/printing/e-contact-print.glade.h:18
 # addressbook/printing/e-contact-print.glade.h:18
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "横向"
 
@@ -5738,7 +5895,7 @@ msgstr "列数："
 # addressbook/printing/e-contact-print.glade.h:23
 # addressbook/printing/e-contact-print.glade.h:23
 # addressbook/printing/e-contact-print.glade.h:23
-#: 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 "选项"
 
@@ -5746,7 +5903,6 @@ msgstr "选项"
 # addressbook/printing/e-contact-print.glade.h:24
 # addressbook/printing/e-contact-print.glade.h:24
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "方向"
 
@@ -5755,7 +5911,7 @@ msgstr "方向"
 # addressbook/printing/e-contact-print.glade.h:25
 # my-evolution/Locations.h:1672
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "页面"
 
@@ -5783,9 +5939,7 @@ msgstr "纸张来源："
 # addressbook/printing/e-contact-print.glade.h:29
 # addressbook/printing/e-contact-print.glade.h:29
 # addressbook/printing/e-contact-print.glade.h:29
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "纵向"
 
@@ -5887,6 +6041,223 @@ msgstr "字体(_F)..."
 msgid "Untitled appointment"
 msgstr "无标题约会"
 
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
+msgid "1st"
+msgstr "一号"
+
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
+msgid "2nd"
+msgstr "二号"
+
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
+msgid "3rd"
+msgstr "三号"
+
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:478
+msgid "4th"
+msgstr "四号"
+
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:478
+msgid "5th"
+msgstr "五号"
+
+# calendar/gui/print.c:426
+# calendar/gui/print.c:426
+# calendar/gui/print.c:426
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
+msgid "6th"
+msgstr "六号"
+
+# calendar/gui/print.c:426
+# calendar/gui/print.c:426
+# calendar/gui/print.c:426
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
+msgid "7th"
+msgstr "七号"
+
+# calendar/gui/print.c:426
+# calendar/gui/print.c:426
+# calendar/gui/print.c:426
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
+msgid "8th"
+msgstr "八号"
+
+# calendar/gui/print.c:426
+# calendar/gui/print.c:426
+# calendar/gui/print.c:426
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:479
+msgid "9th"
+msgstr "九号"
+
+# calendar/gui/print.c:426
+# calendar/gui/print.c:426
+# calendar/gui/print.c:426
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:479
+msgid "10th"
+msgstr "十号"
+
+# calendar/gui/print.c:427
+# calendar/gui/print.c:427
+# calendar/gui/print.c:427
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
+msgid "11th"
+msgstr "十一号"
+
+# calendar/gui/print.c:427
+# calendar/gui/print.c:427
+# calendar/gui/print.c:427
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
+msgid "12th"
+msgstr "十二号"
+
+# calendar/gui/print.c:427
+# calendar/gui/print.c:427
+# calendar/gui/print.c:427
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
+msgid "13th"
+msgstr "十三号"
+
+# calendar/gui/print.c:427
+# calendar/gui/print.c:427
+# calendar/gui/print.c:427
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:480
+msgid "14th"
+msgstr "十四号"
+
+# calendar/gui/print.c:427
+# calendar/gui/print.c:427
+# calendar/gui/print.c:427
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:480
+msgid "15th"
+msgstr "十五号"
+
+# calendar/gui/print.c:428
+# calendar/gui/print.c:428
+# calendar/gui/print.c:428
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
+msgid "16th"
+msgstr "十六号"
+
+# calendar/gui/print.c:428
+# calendar/gui/print.c:428
+# calendar/gui/print.c:428
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
+msgid "17th"
+msgstr "十七号"
+
+# calendar/gui/print.c:428
+# calendar/gui/print.c:428
+# calendar/gui/print.c:428
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
+msgid "18th"
+msgstr "十八号"
+
+# calendar/gui/print.c:428
+# calendar/gui/print.c:428
+# calendar/gui/print.c:428
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:481
+msgid "19th"
+msgstr "十九号"
+
+# calendar/gui/print.c:428
+# calendar/gui/print.c:428
+# calendar/gui/print.c:428
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:481
+msgid "20th"
+msgstr "二十号"
+
+# calendar/gui/print.c:429
+# calendar/gui/print.c:429
+# calendar/gui/print.c:429
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
+msgid "21st"
+msgstr "二十一号"
+
+# calendar/gui/print.c:429
+# calendar/gui/print.c:429
+# calendar/gui/print.c:429
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
+msgid "22nd"
+msgstr "二十二号"
+
+# calendar/gui/print.c:429
+# calendar/gui/print.c:429
+# calendar/gui/print.c:429
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
+msgid "23rd"
+msgstr "二十三号"
+
+# calendar/gui/print.c:429
+# calendar/gui/print.c:429
+# calendar/gui/print.c:429
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:482
+msgid "24th"
+msgstr "二十四号"
+
+# calendar/gui/print.c:429
+# calendar/gui/print.c:429
+# calendar/gui/print.c:429
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:482
+msgid "25th"
+msgstr "二十五号"
+
+# calendar/gui/print.c:430
+# calendar/gui/print.c:430
+# calendar/gui/print.c:430
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
+msgid "26th"
+msgstr "二十六号"
+
+# calendar/gui/print.c:430
+# calendar/gui/print.c:430
+# calendar/gui/print.c:430
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
+msgid "27th"
+msgstr "二十七号"
+
+# calendar/gui/print.c:430
+# calendar/gui/print.c:430
+# calendar/gui/print.c:430
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
+msgid "28th"
+msgstr "二十八号"
+
+# calendar/gui/print.c:430
+# calendar/gui/print.c:430
+# calendar/gui/print.c:430
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:483
+msgid "29th"
+msgstr "二十九号"
+
+# calendar/gui/print.c:430
+# calendar/gui/print.c:430
+# calendar/gui/print.c:430
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:483
+msgid "30th"
+msgstr "三十号"
+
+# calendar/gui/print.c:431
+# calendar/gui/print.c:431
+# calendar/gui/print.c:431
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:484
+msgid "31st"
+msgstr "三十一号"
+
 # calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
 # calendar/gui/dialogs/task-details-page.glade.h:6
 # calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
@@ -5896,9 +6267,9 @@ msgstr "无标题约会"
 # calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
 # calendar/gui/dialogs/task-details-page.glade.h:6
 # calendar/gui/e-calendar-table.c:406 mail/message-list.c:679
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: 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 "高"
 
@@ -5914,10 +6285,10 @@ msgstr "高"
 # calendar/gui/calendar-model.c:1711
 # calendar/gui/dialogs/task-details-page.glade.h:9
 # calendar/gui/e-calendar-table.c:407 mail/message-list.c:678
-#: 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 "中"
 
@@ -5930,9 +6301,9 @@ msgstr "中"
 # calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 # calendar/gui/dialogs/task-details-page.glade.h:8
 # calendar/gui/e-calendar-table.c:408 mail/message-list.c:677
-#: 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 "低"
 
@@ -5946,13 +6317,13 @@ msgstr "低"
 # calendar/gui/dialogs/task-details-page.glade.h:13
 # calendar/gui/e-calendar-table.c:409
 #. 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 "分割多日事件："
 
@@ -5962,8 +6333,8 @@ msgstr "分割多日事件："
 # calendar/conduits/todo/todo-conduit.c:649
 # calendar/conduits/calendar/calendar-conduit.c:1150
 # calendar/conduits/todo/todo-conduit.c:770
-#: 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 "在与日历服务器通讯时发生错误"
 
@@ -5973,8 +6344,8 @@ msgstr "在与日历服务器通讯时发生错误"
 # calendar/conduits/calendar/calendar-conduit.c:1175
 # calendar/conduits/calendar/calendar-conduit.c:1297
 # calendar/conduits/calendar/calendar-conduit.c:1300
-#: 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 日历应用程序块"
 
@@ -5991,138 +6362,118 @@ msgstr "默认优先级："
 # calendar/conduits/todo/todo-conduit.c:759
 # calendar/conduits/todo/todo-conduit.c:886
 # calendar/conduits/todo/todo-conduit.c:889
-#: 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 ToDo 应用程序块"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-#: 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
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "显示日历的示例 Bonobo 控制。"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 msgid "Calendar and Tasks"
 msgstr "日历和任务"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-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:4
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution 日历 iTip/iMip 查看器"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: 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:5
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "处理日历的 Evolution 组件。"
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: 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:7
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#: 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:8
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the calendar iTip view control"
-msgstr "日历 iTip 视图控制车间"
-
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-msgid "Factory for the sample Calendar control"
-msgstr "日历控制示例车间"
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: 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
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "日历组件编辑器对话框集中车间"
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: 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
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
-msgid "Factory to create a component editor factory"
-msgstr "创建组件编辑车间的车间"
+# mail/mail-account-editor-news.c:160
+# mail/mail-account-editor-news.c:160
+# mail/mail-account-editor-news.c:160
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution 新闻编辑器"
 
-# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "提醒服务"
+# mail/mail-account-editor-news.c:160
+# mail/mail-account-editor-news.c:160
+# mail/mail-account-editor-news.c:160
+#: 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:2
 # calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
 # calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-#: 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 "提醒服务车间"
 
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-#: 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:218
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-#: 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:231
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:231
-#: 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:276
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-#: 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:371
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:371
-#: 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 时提醒"
@@ -6162,14 +6513,25 @@ msgstr "编辑约会(_E)"
 # calendar/gui/alarm-notify/alarm-queue.c:670
 # calendar/gui/alarm-notify/alarm-queue.c:670
 # calendar/gui/alarm-notify/alarm-queue.c:675
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
 msgid "No description available."
 msgstr "没有描述。"
 
+# mail/mail-callbacks.c:2128 widgets/misc/e-messagebox.c:159
+# mail/mail-callbacks.c:2247 widgets/misc/e-messagebox.c:159
+# calendar/gui/alarm-notify/alarm-queue.c:753
+# calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2283
+# widgets/misc/e-messagebox.c:159
+#: 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:730
 # calendar/gui/alarm-notify/alarm-queue.c:730
 # calendar/gui/alarm-notify/alarm-queue.c:735
-#: calendar/gui/alarm-notify/alarm-queue.c:741
+#: 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"
@@ -6181,21 +6543,10 @@ msgstr ""
 "发送电子邮件。Evolution 将以\n"
 "显示普通提示会话框代替。"
 
-# mail/mail-callbacks.c:2128 widgets/misc/e-messagebox.c:159
-# mail/mail-callbacks.c:2247 widgets/misc/e-messagebox.c:159
-# calendar/gui/alarm-notify/alarm-queue.c:753
-# calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2283
-# widgets/misc/e-messagebox.c:159
-#: 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:781
 # calendar/gui/alarm-notify/alarm-queue.c:781
 # calendar/gui/alarm-notify/alarm-queue.c:758
-#: 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 "
@@ -6214,21 +6565,24 @@ msgstr ""
 # mail/mail-callbacks.c:2142
 # mail/mail-callbacks.c:2261
 # calendar/gui/alarm-notify/alarm-queue.c:772
-#: 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:166 calendar/gui/main.c:57
-# calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
-# calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
-#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
-msgid "Could not initialize GNOME"
-msgstr "无法初始化 GNOME"
+# addressbook/gui/component/addressbook-factory.c:70
+# calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+# addressbook/gui/component/addressbook-factory.c:70
+# calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+# addressbook/gui/component/addressbook-factory.c:70
+# calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize gnome-vfs"
+msgstr "无法创始化 gnome-vfs"
 
 # calendar/gui/alarm-notify/notify-main.c:186
 # calendar/gui/alarm-notify/notify-main.c:186
 # calendar/gui/alarm-notify/notify-main.c:186
-#: 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 "无法创建提醒服务车间"
 
@@ -6256,14 +6610,14 @@ msgstr "注释含有"
 # calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1072
 # calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1074
 # calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1117
-#: 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:446
 # calendar/gui/calendar-commands.c:446
 # calendar/gui/calendar-commands.c:446
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:404
 msgid "%A %d %B %Y"
 msgstr "%Y %B %d %A"
 
@@ -6275,8 +6629,8 @@ msgstr "%Y %B %d %A"
 # calendar/gui/e-day-view.c:1403 calendar/gui/e-week-view-main-item.c:333
 #. 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 "%b %d %a"
 
@@ -6286,8 +6640,8 @@ msgstr "%b %d %a"
 # calendar/gui/calendar-commands.c:458
 # calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
 # calendar/gui/calendar-commands.c:458
-#: 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 "%Y %b %d %a"
 
@@ -6297,8 +6651,8 @@ msgstr "%Y %b %d %a"
 # calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 # calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
 # calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
-#: 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"
 
@@ -6311,8 +6665,8 @@ 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"
 
@@ -6324,14 +6678,187 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "无法创建日历视图。 请检查您的 ORBit 和 OAF 设置。"
 
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: 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:64
+# calendar/gui/component-factory.c:64
+# calendar/gui/component-factory.c:64
+#: calendar/gui/calendar-component.c:71
+msgid "Folder containing appointments and events"
+msgstr "文件夹含有约会和事件"
+
+# addressbook/gui/contact-editor/contact-editor.glade.h:36
+# addressbook/gui/contact-editor/contact-editor.glade.h:36
+# addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: calendar/gui/calendar-component.c:75
+msgid "Public Calendar"
+msgstr "公共日历"
+
+# calendar/gui/component-factory.c:64
+# calendar/gui/component-factory.c:64
+# calendar/gui/component-factory.c:64
+#: calendar/gui/calendar-component.c:76
+msgid "Public folder containing appointments and events"
+msgstr "公共文件夹含有约会和事件"
+
+# calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+# my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
+# views/tasks/galview.xml.h:1
+# calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+# my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
+# views/tasks/galview.xml.h:1
+# calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+# my-evolution/e-summary-tasks.c:240 my-evolution/e-summary-tasks.c:257
+# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
+# views/tasks/galview.xml.h:1
+#: 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:69
+# calendar/gui/component-factory.c:69
+# calendar/gui/component-factory.c:69
+#: calendar/gui/calendar-component.c:81
+msgid "Folder containing to-do items"
+msgstr "文件夹含有 to-do 项"
+
+# addressbook/printing/e-contact-print.c:1111
+# addressbook/printing/e-contact-print.c:1111
+# addressbook/printing/e-contact-print.c:1115
+#: calendar/gui/calendar-component.c:85
+msgid "Public Tasks"
+msgstr "公共任务"
+
+# calendar/gui/component-factory.c:69
+# calendar/gui/component-factory.c:69
+# calendar/gui/component-factory.c:69
+#: calendar/gui/calendar-component.c:86
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "文件夹含有 to-do 项"
+
+# ui/evolution-calendar.xml.h:21
+# ui/evolution-calendar.xml.h:21
+# ui/evolution-calendar.xml.h:21
+#: calendar/gui/calendar-component.c:730
+msgid "New appointment"
+msgstr "新建约会"
+
+# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/calendar-component.c:730
+msgid "_Appointment"
+msgstr "约会(_A)"
+
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+#: calendar/gui/calendar-component.c:731
+msgid "Create a new appointment"
+msgstr "创建新约会"
+
+# my-evolution/my-evolution.glade.h:10
+# my-evolution/my-evolution.glade.h:10
+# my-evolution/my-evolution.glade.h:10
+#: calendar/gui/calendar-component.c:735
+msgid "New meeting"
+msgstr "新闻会议"
+
+# calendar/gui/dialogs/event-editor.c:207
+# calendar/gui/dialogs/event-editor.c:263
+# calendar/gui/dialogs/event-editor.c:366
+# calendar/gui/dialogs/event-editor.c:207
+# calendar/gui/dialogs/event-editor.c:263
+# calendar/gui/dialogs/event-editor.c:366
+# calendar/gui/dialogs/event-editor.c:207
+# calendar/gui/dialogs/event-editor.c:263
+# calendar/gui/dialogs/event-editor.c:366
+#: calendar/gui/calendar-component.c:735
+msgid "_Meeting"
+msgstr "会议(_M)"
+
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:6
+#: calendar/gui/calendar-component.c:736
+msgid "Create a new meeting request"
+msgstr "创建一条新任务请求"
+
+# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
+#: calendar/gui/calendar-component.c:740
+msgid "New task"
+msgstr "新建任务"
+
+# ui/evolution-tasks.xml.h:18
+# ui/evolution-tasks.xml.h:18
+# ui/evolution-tasks.xml.h:22
+#: calendar/gui/calendar-component.c:740
+msgid "_Task"
+msgstr "任务(_T)"
+
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:6
+#: calendar/gui/calendar-component.c:741
+msgid "Create a new task"
+msgstr "创建新任务"
+
+# ui/evolution-calendar.xml.h:21
+# ui/evolution-calendar.xml.h:21
+# ui/evolution-calendar.xml.h:21
+#: calendar/gui/calendar-component.c:745
+msgid "New All Day Appointment"
+msgstr "新建全天约会"
+
+# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
+# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
+# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
+#: calendar/gui/calendar-component.c:745
+msgid "All _Day Appointment"
+msgstr "全天约会(_D)"
+
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+#: calendar/gui/calendar-component.c:746
+msgid "Create a new all-day appointment"
+msgstr "创建一个新的全天约会创建新约会"
+
 # calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
 # calendar/gui/e-calendar-table.c:384
 # calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
 # calendar/gui/e-calendar-table.c:384
 # calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
 # calendar/gui/e-calendar-table.c:385
-#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
+#: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "保密"
 
@@ -6341,43 +6868,43 @@ msgstr "保密"
 # calendar/gui/e-calendar-table.c:385
 # calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
 # calendar/gui/e-calendar-table.c:386
-#: 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:424 calendar/gui/e-calendar-table.c:383
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
-#: 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:536
 # calendar/gui/calendar-model.c:536
 # calendar/gui/calendar-model.c:536
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "N"
 msgstr "北"
 
 # calendar/gui/calendar-model.c:536
 # calendar/gui/calendar-model.c:536
 # calendar/gui/calendar-model.c:536
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "S"
 msgstr "南"
 
 # calendar/gui/calendar-model.c:538
 # calendar/gui/calendar-model.c:538
 # calendar/gui/calendar-model.c:538
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "E"
 msgstr "东"
 
 # calendar/gui/calendar-model.c:538
 # calendar/gui/calendar-model.c:538
 # calendar/gui/calendar-model.c:538
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "W"
 msgstr "西"
 
@@ -6387,8 +6914,8 @@ msgstr "西"
 # calendar/gui/e-calendar-table.c:457
 # calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
 # calendar/gui/e-calendar-table.c:458
-#: 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 "放假"
 
@@ -6401,9 +6928,9 @@ msgstr "放假"
 # calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:459
 # calendar/gui/e-meeting-time-sel.c:432
 # shell/evolution-shell-component.c:1042
-#: 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 "繁忙"
 
@@ -6416,9 +6943,9 @@ msgstr "繁忙"
 # calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 # calendar/gui/dialogs/task-details-page.glade.h:10
 # calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2246
-#: 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 "尚未开始"
 
@@ -6431,9 +6958,9 @@ msgstr "尚未开始"
 # calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 # calendar/gui/dialogs/task-details-page.glade.h:7
 # calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2249
-#: 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 "正在进行中"
 
@@ -6449,17 +6976,17 @@ msgstr "正在进行中"
 # calendar/gui/dialogs/task-details-page.glade.h:4
 # calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:329
 # calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
-#: 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:1052
 # calendar/gui/calendar-model.c:1052
 # calendar/gui/calendar-model.c:1052
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6491,28 +7018,28 @@ msgstr ""
 # widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 # widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 #. 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:1713
 # calendar/gui/calendar-model.c:1713
 # calendar/gui/calendar-model.c:1713
-#: calendar/gui/calendar-model.c:1723
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "正在重复"
 
 # calendar/gui/calendar-model.c:1715
 # calendar/gui/calendar-model.c:1715
 # calendar/gui/calendar-model.c:1715
-#: calendar/gui/calendar-model.c:1725
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "已分派"
 
@@ -6525,9 +7052,9 @@ msgstr "已分派"
 # calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:301
 # calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:536
 # calendar/gui/e-meeting-model.c:810
-#: 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 "是"
 
@@ -6537,215 +7064,69 @@ msgstr "是"
 # calendar/gui/e-meeting-model.c:811
 # calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
 # calendar/gui/e-meeting-model.c:811
-#: 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 views/calendar/galview.xml.h:1
 # calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 # calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
-#: 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 views/calendar/galview.xml.h:4
 # calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 # calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
-#: 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 views/calendar/galview.xml.h:3
 # calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 # calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
-#: 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 views/calendar/galview.xml.h:2
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
-#: calendar/gui/calendar-view-factory.c:157
+#: calendar/gui/calendar-view-factory.c:127
 msgid "Month View"
 msgstr "月视图"
 
-# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-#: 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:64
-# calendar/gui/component-factory.c:64
-# calendar/gui/component-factory.c:64
-#: calendar/gui/component-factory.c:72
-msgid "Folder containing appointments and events"
-msgstr "文件夹含有约会和事件"
-
-# addressbook/gui/contact-editor/contact-editor.glade.h:36
-# addressbook/gui/contact-editor/contact-editor.glade.h:36
-# addressbook/gui/contact-editor/contact-editor.glade.h:36
-#: calendar/gui/component-factory.c:76
-msgid "Public Calendar"
-msgstr "公共日历"
-
-# calendar/gui/component-factory.c:64
-# calendar/gui/component-factory.c:64
-# calendar/gui/component-factory.c:64
-#: calendar/gui/component-factory.c:77
-msgid "Public folder containing appointments and events"
-msgstr "公共文件夹含有约会和事件"
-
-# calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
-# my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
-# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
-# views/tasks/galview.xml.h:1
-# calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
-# my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
-# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
-# views/tasks/galview.xml.h:1
-# calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
-# my-evolution/e-summary-tasks.c:240 my-evolution/e-summary-tasks.c:257
-# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
-# views/tasks/galview.xml.h:1
-#: 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:69
-# calendar/gui/component-factory.c:69
-# calendar/gui/component-factory.c:69
-#: calendar/gui/component-factory.c:82
-msgid "Folder containing to-do items"
-msgstr "文件夹含有 to-do 项"
-
-# addressbook/printing/e-contact-print.c:1111
-# addressbook/printing/e-contact-print.c:1111
-# addressbook/printing/e-contact-print.c:1115
-#: calendar/gui/component-factory.c:86
-msgid "Public Tasks"
-msgstr "公共任务"
-
-# calendar/gui/component-factory.c:69
-# calendar/gui/component-factory.c:69
-# calendar/gui/component-factory.c:69
-#: calendar/gui/component-factory.c:87
+# calendar/conduits/calendar/calendar-conduit.c:937
+# calendar/conduits/todo/todo-conduit.c:649
+# calendar/conduits/calendar/calendar-conduit.c:1034
+# calendar/conduits/todo/todo-conduit.c:649
+# calendar/conduits/calendar/calendar-conduit.c:1150
+# calendar/conduits/todo/todo-conduit.c:770
+#: calendar/gui/comp-editor-factory.c:456
 #, fuzzy
-msgid "Public folder containing to-do items"
-msgstr "文件夹含有 to-do 项"
-
-# ui/evolution-calendar.xml.h:21
-# ui/evolution-calendar.xml.h:21
-# ui/evolution-calendar.xml.h:21
-#: calendar/gui/component-factory.c:750
-msgid "New appointment"
-msgstr "新建约会"
-
-# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-#: calendar/gui/component-factory.c:750
-msgid "_Appointment"
-msgstr "约会(_A)"
-
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-#: calendar/gui/component-factory.c:751
-msgid "Create a new appointment"
-msgstr "创建新约会"
-
-# my-evolution/my-evolution.glade.h:10
-# my-evolution/my-evolution.glade.h:10
-# my-evolution/my-evolution.glade.h:10
-#: calendar/gui/component-factory.c:755
-msgid "New meeting"
-msgstr "新闻会议"
-
-# calendar/gui/dialogs/event-editor.c:207
-# calendar/gui/dialogs/event-editor.c:263
-# calendar/gui/dialogs/event-editor.c:366
-# calendar/gui/dialogs/event-editor.c:207
-# calendar/gui/dialogs/event-editor.c:263
-# calendar/gui/dialogs/event-editor.c:366
-# calendar/gui/dialogs/event-editor.c:207
-# calendar/gui/dialogs/event-editor.c:263
-# calendar/gui/dialogs/event-editor.c:366
-#: calendar/gui/component-factory.c:755
-msgid "_Meeting"
-msgstr "会议(_M)"
-
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:5
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:5
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:6
-#: calendar/gui/component-factory.c:756
-msgid "Create a new meeting request"
-msgstr "创建一条新任务请求"
-
-# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-#: calendar/gui/component-factory.c:760
-msgid "New task"
-msgstr "新建任务"
-
-# ui/evolution-tasks.xml.h:18
-# ui/evolution-tasks.xml.h:18
-# ui/evolution-tasks.xml.h:22
-#: calendar/gui/component-factory.c:760
-msgid "_Task"
-msgstr "任务(_T)"
-
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:5
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:5
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:6
-#: calendar/gui/component-factory.c:761
-msgid "Create a new task"
-msgstr "创建新任务"
-
-# ui/evolution-calendar.xml.h:21
-# ui/evolution-calendar.xml.h:21
-# ui/evolution-calendar.xml.h:21
-#: calendar/gui/component-factory.c:765
-msgid "New All Day Appointment"
-msgstr "新建全天约会"
+msgid "Error while opening the calendar"
+msgstr "在与日历服务器通讯时发生错误"
 
-# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
-# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-#: calendar/gui/component-factory.c:765
-msgid "All _Day Appointment"
-msgstr "全天约会(_D)"
+#: calendar/gui/comp-editor-factory.c:467
+msgid "Method not supported when opening the calendar"
+msgstr ""
 
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-#: calendar/gui/component-factory.c:766
-msgid "Create a new all-day appointment"
-msgstr "创建一个新的全天约会创建新约会"
+# addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+# shell/evolution-shell-component.c:1035
+# addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+# shell/evolution-shell-component.c:1035
+# addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+# shell/evolution-shell-component.c:1048
+#: calendar/gui/comp-editor-factory.c:473
+#, fuzzy
+msgid "Permission denied to open the calendar"
+msgstr "没有权限"
 
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1493
-#: calendar/gui/control-factory.c:123
+#: calendar/gui/control-factory.c:119
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "无法在“%s”中打开文件夹"
@@ -6753,71 +7134,60 @@ msgstr "无法在“%s”中打开文件夹"
 # calendar/gui/control-factory.c:127
 # calendar/gui/control-factory.c:127
 # calendar/gui/control-factory.c:127
-#: calendar/gui/control-factory.c:167
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "日历将显示的 URI"
 
 # ui/evolution.xml.h:3
 # ui/evolution.xml.h:3
 # executive-summary/component/e-summary-url.c:72
-#: 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:359
 # calendar/gui/dialogs/alarm-options.c:359
-#: 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:368
 # calendar/gui/dialogs/alarm-options.c:368
-#: 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
 # calendar/gui/dialogs/alarm-options.c:377
 # calendar/gui/dialogs/alarm-options.c:377
-#: 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:386
 # calendar/gui/dialogs/alarm-options.c:386
-#: 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:395
 # calendar/gui/dialogs/alarm-options.c:395
-#: 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:1
 # calendar/gui/dialogs/alarm-options.glade.h:1
-#: 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:6
-# calendar/gui/dialogs/alarm-options.glade.h:6
-# calendar/gui/dialogs/alarm-options.glade.h:6
-#: 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 ""
-"这是电子邮件提示器，但 Evolution 尚不支持这类提示器。您无法为该提示器编辑选"
-"项。"
-
 # calendar/gui/dialogs/alarm-options.glade.h:2
 # calendar/gui/dialogs/alarm-options.glade.h:2
 # calendar/gui/dialogs/alarm-options.glade.h:2
@@ -6825,54 +7195,70 @@ msgstr ""
 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:3
 # calendar/gui/dialogs/alarm-options.glade.h:3
 # calendar/gui/dialogs/alarm-options.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "播放声音："
 
 # calendar/gui/dialogs/alarm-options.glade.h:4
 # calendar/gui/dialogs/alarm-options.glade.h:4
 # calendar/gui/dialogs/alarm-options.glade.h:4
-#: 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:5
 # calendar/gui/dialogs/alarm-options.glade.h:5
 # calendar/gui/dialogs/alarm-options.glade.h:5
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "运行程序："
 
+# ui/evolution-message-composer.xml.h:27
+# ui/evolution-message-composer.xml.h:27
+# ui/evolution-message-composer.xml.h:27
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "发送"
+
 # calendar/gui/dialogs/alarm-options.glade.h:7
 # calendar/gui/dialogs/alarm-options.glade.h:7
 # calendar/gui/dialogs/alarm-options.glade.h:7
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: 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:83
 # calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
 # calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
-#: 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:11
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
+msgstr ""
+
 # calendar/gui/dialogs/alarm-options.glade.h:9
 # calendar/gui/dialogs/alarm-options.glade.h:9
 # calendar/gui/dialogs/alarm-options.glade.h:9
-#: calendar/gui/dialogs/alarm-options.glade.h:9
+#: 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:84
 # calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
 # calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
-#: 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 "小时"
 
@@ -6880,197 +7266,10 @@ msgstr "小时"
 # calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
 # calendar/gui/dialogs/alarm-options.glade.h:11
 # executive-summary/test-service/rdf-summary.c:806
-#: 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:309
-# calendar/gui/dialogs/alarm-page.c:309
-# calendar/gui/dialogs/alarm-page.c:309
-#: calendar/gui/dialogs/alarm-page.c:319
-#, c-format
-msgid "%d days"
-msgstr "%d 天"
-
-# calendar/gui/dialogs/alarm-page.c:312
-# calendar/gui/dialogs/alarm-page.c:312
-# calendar/gui/dialogs/alarm-page.c:312
-#: calendar/gui/dialogs/alarm-page.c:322
-msgid "1 day"
-msgstr "1 天"
-
-# calendar/gui/dialogs/alarm-page.c:317
-# calendar/gui/dialogs/alarm-page.c:317
-# calendar/gui/dialogs/alarm-page.c:317
-#: calendar/gui/dialogs/alarm-page.c:327
-#, c-format
-msgid "%d weeks"
-msgstr "%d 周"
-
-# calendar/gui/dialogs/alarm-page.c:320
-# calendar/gui/dialogs/alarm-page.c:320
-# calendar/gui/dialogs/alarm-page.c:320
-#: calendar/gui/dialogs/alarm-page.c:330
-msgid "1 week"
-msgstr "1 周"
-
-# calendar/gui/dialogs/alarm-page.c:325
-# calendar/gui/dialogs/alarm-page.c:325
-# calendar/gui/dialogs/alarm-page.c:325
-#: calendar/gui/dialogs/alarm-page.c:335
-#, c-format
-msgid "%d hours"
-msgstr "%d 小时"
-
-# calendar/gui/dialogs/alarm-page.c:328
-# calendar/gui/dialogs/alarm-page.c:328
-# calendar/gui/dialogs/alarm-page.c:328
-#: calendar/gui/dialogs/alarm-page.c:338
-msgid "1 hour"
-msgstr "1 小时"
-
-# calendar/gui/dialogs/alarm-page.c:333
-# calendar/gui/dialogs/alarm-page.c:333
-# calendar/gui/dialogs/alarm-page.c:333
-#: calendar/gui/dialogs/alarm-page.c:343
-#, c-format
-msgid "%d minutes"
-msgstr "%d 分钟"
-
-# calendar/gui/dialogs/alarm-page.c:336
-# calendar/gui/dialogs/alarm-page.c:336
-# calendar/gui/dialogs/alarm-page.c:336
-#: calendar/gui/dialogs/alarm-page.c:346
-msgid "1 minute"
-msgstr "1 分钟"
-
-# calendar/gui/dialogs/alarm-page.c:341
-# calendar/gui/dialogs/alarm-page.c:341
-# calendar/gui/dialogs/alarm-page.c:341
-#: calendar/gui/dialogs/alarm-page.c:351
-#, c-format
-msgid "%d seconds"
-msgstr "%d 秒"
-
-# calendar/gui/dialogs/alarm-page.c:344
-# calendar/gui/dialogs/alarm-page.c:344
-# calendar/gui/dialogs/alarm-page.c:344
-#: calendar/gui/dialogs/alarm-page.c:354
-msgid "1 second"
-msgstr "1 秒"
-
-# calendar/gui/dialogs/alarm-page.c:373
-# calendar/gui/dialogs/alarm-page.glade.h:4
-# calendar/gui/dialogs/alarm-page.c:373
-# calendar/gui/dialogs/alarm-page.glade.h:4
-# calendar/gui/dialogs/alarm-page.c:373
-# calendar/gui/dialogs/alarm-page.glade.h:4
-#: 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:377
-# calendar/gui/dialogs/alarm-page.glade.h:3
-# calendar/gui/dialogs/alarm-page.c:377
-# calendar/gui/dialogs/alarm-page.glade.h:3
-# calendar/gui/dialogs/alarm-page.c:377
-# calendar/gui/dialogs/alarm-page.glade.h:3
-#: 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:381
-# calendar/gui/dialogs/alarm-page.c:381
-# calendar/gui/dialogs/alarm-page.c:381
-#: calendar/gui/dialogs/alarm-page.c:391
-msgid "Send an email"
-msgstr "发送电子邮件"
-
-# calendar/gui/dialogs/alarm-page.c:385
-# calendar/gui/dialogs/alarm-page.glade.h:6
-# calendar/gui/dialogs/alarm-page.c:385
-# calendar/gui/dialogs/alarm-page.glade.h:6
-# calendar/gui/dialogs/alarm-page.c:385
-# calendar/gui/dialogs/alarm-page.glade.h:6
-#: 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:391
-# calendar/gui/dialogs/alarm-page.c:391
-# calendar/gui/dialogs/alarm-page.c:391
-#: calendar/gui/dialogs/alarm-page.c:401
-msgid "Unknown action to be performed"
-msgstr "执行未知的动作"
-
-# calendar/gui/dialogs/alarm-page.c:403
-# calendar/gui/dialogs/alarm-page.c:403
-# calendar/gui/dialogs/alarm-page.c:403
-#: 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:406
-# calendar/gui/dialogs/alarm-page.c:406
-# calendar/gui/dialogs/alarm-page.c:406
-#: 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:411
-# calendar/gui/dialogs/alarm-page.c:411
-# calendar/gui/dialogs/alarm-page.c:411
-#: 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:420
-# calendar/gui/dialogs/alarm-page.c:420
-# calendar/gui/dialogs/alarm-page.c:420
-#: 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:423
-# calendar/gui/dialogs/alarm-page.c:423
-# calendar/gui/dialogs/alarm-page.c:423
-#: 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:428
-# calendar/gui/dialogs/alarm-page.c:428
-# calendar/gui/dialogs/alarm-page.c:428
-#: 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:453
-# calendar/gui/dialogs/alarm-page.c:453
-# calendar/gui/dialogs/alarm-page.c:452
-#: calendar/gui/dialogs/alarm-page.c:462
-#, c-format
-msgid "%s at %s"
-msgstr "在 %2$s 时 %1$s"
-
-# calendar/gui/dialogs/alarm-page.c:459
-# calendar/gui/dialogs/alarm-page.c:459
-# calendar/gui/dialogs/alarm-page.c:458
-#: 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
 # calendar/gui/dialogs/alarm-page.glade.h:1
@@ -7093,6 +7292,26 @@ msgstr "基本"
 msgid "Date/Time:"
 msgstr "日期/时间："
 
+# calendar/gui/dialogs/alarm-page.c:377
+# calendar/gui/dialogs/alarm-page.glade.h:3
+# calendar/gui/dialogs/alarm-page.c:377
+# calendar/gui/dialogs/alarm-page.glade.h:3
+# calendar/gui/dialogs/alarm-page.c:377
+# calendar/gui/dialogs/alarm-page.glade.h:3
+#: 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:373
+# calendar/gui/dialogs/alarm-page.glade.h:4
+# calendar/gui/dialogs/alarm-page.c:373
+# calendar/gui/dialogs/alarm-page.glade.h:4
+# calendar/gui/dialogs/alarm-page.c:373
+# calendar/gui/dialogs/alarm-page.glade.h:4
+#: 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
 # calendar/gui/dialogs/alarm-page.glade.h:5
 # calendar/gui/dialogs/alarm-page.glade.h:5
@@ -7100,6 +7319,24 @@ msgstr "日期/时间："
 msgid "Reminders"
 msgstr "提示器"
 
+# calendar/gui/dialogs/alarm-page.c:385
+# calendar/gui/dialogs/alarm-page.glade.h:6
+# calendar/gui/dialogs/alarm-page.c:385
+# calendar/gui/dialogs/alarm-page.glade.h:6
+# calendar/gui/dialogs/alarm-page.c:385
+# calendar/gui/dialogs/alarm-page.glade.h:6
+#: 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:381
+# calendar/gui/dialogs/alarm-page.c:381
+# calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "发送电子邮件"
+
 # calendar/gui/dialogs/alarm-page.glade.h:7
 # calendar/gui/dialogs/recurrence-page.glade.h:8
 # calendar/gui/e-itip-control.c:745 calendar/gui/e-itip-control.glade.h:11
@@ -7109,30 +7346,30 @@ msgstr "提示器"
 # calendar/gui/dialogs/alarm-page.glade.h:7
 # calendar/gui/dialogs/recurrence-page.glade.h:8
 # calendar/gui/e-itip-control.c:748 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: 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:10
 # calendar/gui/dialogs/alarm-page.glade.h:10
-#: 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 filter/libfilter-i18n.h:34
 # calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
 # calendar/gui/dialogs/alarm-page.glade.h:11
-#: 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 filter/libfilter-i18n.h:35
 # calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
 # calendar/gui/dialogs/alarm-page.glade.h:12
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "之前"
 
@@ -7142,7 +7379,7 @@ msgstr "之前"
 # calendar/gui/dialogs/recurrence-page.glade.h:14
 # calendar/gui/dialogs/alarm-page.glade.h:13
 # calendar/gui/dialogs/recurrence-page.glade.h:14
-#: 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 "天"
@@ -7150,28 +7387,28 @@ msgstr "天"
 # calendar/gui/dialogs/alarm-page.glade.h:14
 # calendar/gui/dialogs/alarm-page.glade.h:14
 # calendar/gui/dialogs/alarm-page.glade.h:14
-#: 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:15
 # calendar/gui/dialogs/alarm-page.glade.h:15
-#: 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:120
 # calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 # calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:129
-#: 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:17
 # calendar/gui/dialogs/alarm-page.glade.h:17
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "约会开始"
 
@@ -7213,7 +7450,7 @@ msgstr "60 分钟"
 # addressbook/gui/contact-editor/fulladdr.glade.h:4
 # addressbook/gui/contact-editor/fulladdr.glade.h:4
 # my-evolution/Locations.h:45
-#: 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 "警告"
 
@@ -7256,7 +7493,8 @@ msgstr "天数"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 # calendar/gui/dialogs/recurrence-page.c:963
 #: 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 "星期五"
 
@@ -7281,7 +7519,8 @@ msgstr "分钟"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 # calendar/gui/dialogs/recurrence-page.c:959
 #: 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 "星期一"
 
@@ -7299,7 +7538,8 @@ msgstr "星期日(_U)"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 # calendar/gui/dialogs/recurrence-page.c:964
 #: 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 "星期六"
 
@@ -7321,7 +7561,8 @@ msgstr "在日期浏览器中显示周数(_N)"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 # calendar/gui/dialogs/recurrence-page.c:965
 #: 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 "星期日"
 
@@ -7353,7 +7594,8 @@ msgstr "任务列表"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 # calendar/gui/dialogs/recurrence-page.c:962
 #: 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 "星期四"
 
@@ -7385,7 +7627,8 @@ msgstr "时间格式："
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 # calendar/gui/dialogs/recurrence-page.c:960
 #: 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 "星期二"
 
@@ -7400,7 +7643,8 @@ msgstr ""
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 # calendar/gui/dialogs/recurrence-page.c:961
 #: 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 "星期三"
 
@@ -7472,7 +7716,7 @@ msgstr "星期五(_F)"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: 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)"
 
@@ -7539,7 +7783,7 @@ msgstr "星期三(_W)"
 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?"
@@ -7548,11 +7792,11 @@ msgstr "被删除的事件是一个会议，您是否发送一条取消通告？
 # calendar/gui/dialogs/cancel-comp.c:57
 # calendar/gui/dialogs/cancel-comp.c:57
 # calendar/gui/dialogs/cancel-comp.c:57
-#: 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?"
@@ -7561,11 +7805,11 @@ msgstr "被删除的任务已被指派，您是否要发送一条取消通告？
 # calendar/gui/dialogs/cancel-comp.c:62
 # calendar/gui/dialogs/cancel-comp.c:62
 # calendar/gui/dialogs/cancel-comp.c:62
-#: 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?"
@@ -7574,35 +7818,35 @@ msgstr ""
 # calendar/gui/dialogs/cancel-comp.c:67
 # calendar/gui/dialogs/cancel-comp.c:67
 # calendar/gui/dialogs/cancel-comp.c:67
-#: 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:59
 # calendar/gui/dialogs/changed-comp.c:59
-#: 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:63
 # calendar/gui/dialogs/changed-comp.c:63
-#: 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:67
 # calendar/gui/dialogs/changed-comp.c:67
-#: 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:76
 # calendar/gui/dialogs/changed-comp.c:76
-#: 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  您已经做了修改。忘记这些修改并关闭编辑器？"
@@ -7610,7 +7854,7 @@ msgstr "%s  您已经做了修改。忘记这些修改并关闭编辑器？"
 # calendar/gui/dialogs/changed-comp.c:78
 # calendar/gui/dialogs/changed-comp.c:78
 # calendar/gui/dialogs/changed-comp.c:78
-#: 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  您还没有进行修改，关闭编辑器？"
@@ -7618,28 +7862,28 @@ msgstr "%s  您还没有进行修改，关闭编辑器？"
 # calendar/gui/dialogs/changed-comp.c:83
 # calendar/gui/dialogs/changed-comp.c:83
 # calendar/gui/dialogs/changed-comp.c:83
-#: 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:87
 # calendar/gui/dialogs/changed-comp.c:87
-#: 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:91
 # calendar/gui/dialogs/changed-comp.c:91
-#: 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:100
 # calendar/gui/dialogs/changed-comp.c:100
-#: 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  您已经做出了修改。忘记这些修改并更新编辑器？"
@@ -7647,79 +7891,93 @@ msgstr "%s  您已经做出了修改。忘记这些修改并更新编辑器？"
 # calendar/gui/dialogs/changed-comp.c:102
 # calendar/gui/dialogs/changed-comp.c:102
 # calendar/gui/dialogs/changed-comp.c:102
-#: 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  您还没有进行修改，更新编辑器？"
 
+# camel/providers/local/camel-mbox-summary.c:873
+# camel/providers/local/camel-spool-summary.c:544
+# camel/providers/local/camel-spool-summary.c:1110
+# camel/providers/local/camel-mbox-summary.c:873
+# camel/providers/local/camel-spool-summary.c:544
+# camel/providers/local/camel-spool-summary.c:1110
+# camel/providers/local/camel-mbox-summary.c:873
+# camel/providers/local/camel-spool-summary.c:544
+# camel/providers/local/camel-spool-summary.c:1110
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "未知的错误： %s"
+
 # calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 # calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 # calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
+#: 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:2168
 # calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 # calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
-#: 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:2170
 # calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 # calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
-#: 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:2175
 # calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 # calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
-#: 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:2177
 # calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 # calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
-#: 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:303
 # calendar/gui/dialogs/comp-editor.c:303
 # calendar/gui/dialogs/comp-editor.c:321
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:328
 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:303
 # calendar/gui/dialogs/comp-editor.c:303
 # calendar/gui/dialogs/comp-editor.c:321
-#: calendar/gui/dialogs/comp-editor.c:352
+#: calendar/gui/dialogs/comp-editor.c:337
 msgid "Could not update object"
 msgstr "无法更新对象"
 
 # calendar/gui/dialogs/comp-editor.c:678
 # calendar/gui/dialogs/comp-editor.c:678
 # calendar/gui/dialogs/comp-editor.c:692
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "编辑约会"
 
 # calendar/gui/dialogs/comp-editor.c:683
 # calendar/gui/dialogs/comp-editor.c:683
 # calendar/gui/dialogs/comp-editor.c:697
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "约会 - %s"
@@ -7727,7 +7985,7 @@ msgstr "约会 - %s"
 # calendar/gui/dialogs/comp-editor.c:686
 # calendar/gui/dialogs/comp-editor.c:686
 # calendar/gui/dialogs/comp-editor.c:700
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "任务 - %s"
@@ -7735,7 +7993,7 @@ msgstr "任务 - %s"
 # calendar/gui/dialogs/comp-editor.c:689
 # calendar/gui/dialogs/comp-editor.c:689
 # calendar/gui/dialogs/comp-editor.c:703
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "日志条目 - %s"
@@ -7743,30 +8001,29 @@ msgstr "日志条目 - %s"
 # calendar/gui/dialogs/comp-editor.c:703
 # calendar/gui/dialogs/comp-editor.c:703
 # calendar/gui/dialogs/comp-editor.c:717
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "没有概要"
 
 # composer/e-msg-composer.c:943
 # composer/e-msg-composer.c:947
 # composer/e-msg-composer.c:912
-#: 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:1272
 # calendar/gui/dialogs/comp-editor.c:1272
 # calendar/gui/dialogs/comp-editor.c:1277
-#: calendar/gui/dialogs/comp-editor.c:1397
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr "无法获取当前版本！"
 
@@ -7863,21 +8120,21 @@ msgstr "输入代表"
 # calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 # calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 # calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-#: 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:190
 # calendar/gui/dialogs/event-editor.c:190
 # calendar/gui/dialogs/event-editor.c:190
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "提醒"
 
 # calendar/gui/dialogs/event-editor.c:195
 # calendar/gui/dialogs/event-editor.c:195
 # calendar/gui/dialogs/event-editor.c:195
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "再次发生"
 
@@ -7890,9 +8147,9 @@ msgstr "再次发生"
 # calendar/gui/dialogs/event-editor.c:202
 # calendar/gui/dialogs/event-editor.c:260
 # calendar/gui/dialogs/event-editor.c:363
-#: 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 "正在调度"
 
@@ -7905,23 +8162,47 @@ msgstr "正在调度"
 # calendar/gui/dialogs/event-editor.c:207
 # calendar/gui/dialogs/event-editor.c:263
 # calendar/gui/dialogs/event-editor.c:366
-#: 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/e-calendar-table.etspec.h:14
+# calendar/gui/e-calendar-table.etspec.h:14
+# calendar/gui/e-calendar-table.etspec.h:14
+#: 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.glade.h:15
+# calendar/gui/dialogs/event-page.glade.h:15
+# calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.c:633
+#, fuzzy
+msgid "Start time is wrong"
+msgstr "开始时间(_S)："
+
+#: 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:1
 # calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
 msgstr "全天事务(_L)"
 
 # calendar/gui/dialogs/event-page.glade.h:2
 # calendar/gui/dialogs/event-page.glade.h:2
 # calendar/gui/dialogs/event-page.glade.h:2
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "忙(_U)"
 
@@ -7934,7 +8215,7 @@ msgstr "忙(_U)"
 # calendar/gui/dialogs/event-page.glade.h:4
 # calendar/gui/dialogs/task-page.glade.h:2
 # calendar/gui/e-calendar-table.etspec.h:5
-#: 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"
@@ -7946,7 +8227,7 @@ msgstr "分类"
 # calendar/gui/dialogs/task-page.glade.h:3
 # calendar/gui/dialogs/event-page.glade.h:5
 # calendar/gui/dialogs/task-page.glade.h:3
-#: 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 "机密的(_F)"
@@ -7957,7 +8238,7 @@ msgstr "机密的(_F)"
 # calendar/gui/dialogs/task-page.glade.h:4
 # calendar/gui/dialogs/event-page.glade.h:6
 # calendar/gui/dialogs/task-page.glade.h:4
-#: 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 "日期及时间"
@@ -7965,14 +8246,14 @@ msgstr "日期及时间"
 # calendar/gui/dialogs/event-page.glade.h:7
 # calendar/gui/dialogs/event-page.glade.h:7
 # calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "闲(_R)"
 
 # calendar/gui/dialogs/event-page.glade.h:8
 # calendar/gui/dialogs/event-page.glade.h:8
 # calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr "地理位置(_O)："
 
@@ -7982,7 +8263,7 @@ msgstr "地理位置(_O)："
 # calendar/gui/dialogs/task-page.glade.h:6
 # calendar/gui/dialogs/event-page.glade.h:9
 # calendar/gui/dialogs/task-page.glade.h:6
-#: 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 "保密的(_V)"
@@ -7993,7 +8274,7 @@ msgstr "保密的(_V)"
 # calendar/gui/dialogs/task-page.glade.h:7
 # calendar/gui/dialogs/event-page.glade.h:10
 # calendar/gui/dialogs/task-page.glade.h:7
-#: 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 "公开的(_B)"
@@ -8004,7 +8285,7 @@ msgstr "公开的(_B)"
 # calendar/gui/e-calendar-table.etspec.h:13
 # calendar/gui/dialogs/event-page.glade.h:11
 # calendar/gui/e-calendar-table.etspec.h:13
-#: 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 "按其显示时间"
@@ -8015,22 +8296,11 @@ msgstr "按其显示时间"
 # calendar/gui/dialogs/task-page.glade.h:9
 # calendar/gui/dialogs/event-page.glade.h:12
 # calendar/gui/dialogs/task-page.glade.h:9
-#: 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 "概要(_U)："
 
-# calendar/gui/dialogs/event-page.glade.h:13
-# calendar/gui/dialogs/task-page.glade.h:10
-# calendar/gui/dialogs/event-page.glade.h:13
-# calendar/gui/dialogs/task-page.glade.h:10
-# calendar/gui/dialogs/event-page.glade.h:13
-# calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "联系人(_C)..."
-
 # calendar/gui/dialogs/event-page.glade.h:14
 # calendar/gui/dialogs/event-page.glade.h:14
 # calendar/gui/dialogs/event-page.glade.h:14
@@ -8045,31 +8315,35 @@ msgstr "结束时间(_E)："
 msgid "_Start time:"
 msgstr "开始时间(_S)："
 
+#: calendar/gui/dialogs/meeting-page.c:425
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
 # calendar/gui/dialogs/meeting-page.c:425
 # calendar/gui/dialogs/meeting-page.c:425
 # calendar/gui/dialogs/meeting-page.c:425
-#: calendar/gui/dialogs/meeting-page.c:414
+#: calendar/gui/dialogs/meeting-page.c:431
 msgid "An organizer is required."
 msgstr "需要一名组织者。"
 
 # calendar/gui/dialogs/meeting-page.c:446
 # calendar/gui/dialogs/meeting-page.c:446
 # calendar/gui/dialogs/meeting-page.c:446
-#: 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:626
 # calendar/gui/dialogs/meeting-page.c:626
 # calendar/gui/dialogs/meeting-page.c:626
-#: 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:701
 # calendar/gui/dialogs/meeting-page.c:701
 # calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr "授权于(_D)..."
 
@@ -8160,22 +8434,11 @@ msgstr "成员"
 # calendar/gui/e-itip-control.c:809
 # calendar/gui/e-meeting-time-sel.etspec.h:8
 #: 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
-# calendar/gui/dialogs/meeting-page.etspec.h:9
-# calendar/gui/e-meeting-time-sel.etspec.h:9
-# calendar/gui/dialogs/meeting-page.etspec.h:9
-# calendar/gui/e-meeting-time-sel.etspec.h:9
-#: 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:31
@@ -8195,25 +8458,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 mail/mail-config.glade.h:85
-# shell/glade/e-active-connection-dialog.glade.h:5
-# 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 mail/mail-config.glade.h:85
-# shell/glade/e-active-connection-dialog.glade.h:5
-# 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 mail/mail-config.glade.h:94
-# shell/glade/e-active-connection-dialog.glade.h:5
-#: 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
 # calendar/gui/dialogs/meeting-page.glade.h:2
@@ -8239,91 +8483,69 @@ msgstr "改变组织者(_C)"
 # calendar/gui/dialogs/meeting-page.glade.h:4
 # calendar/gui/e-meeting-time-sel.c:450
 #: 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 "邀请其他人(_I)..."
 
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-#: calendar/gui/dialogs/recurrence-page.c:126
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:156
-msgid "st"
+#: calendar/gui/dialogs/recur-comp.c:50
+msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-#: calendar/gui/dialogs/recurrence-page.c:127
-#: calendar/gui/dialogs/recurrence-page.c:147
-msgid "nd"
+#: calendar/gui/dialogs/recur-comp.c:54
+msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-#: calendar/gui/dialogs/recurrence-page.c:128
-#: calendar/gui/dialogs/recurrence-page.c:148
-msgid "rd"
-msgstr ""
-
-# calendar/gui/dialogs/recurrence-page.c:1096
-# calendar/gui/dialogs/recurrence-page.c:1096
-# calendar/gui/dialogs/recurrence-page.c:1096
-#: 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"
+#: 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 ""
 
+# addressbook/gui/contact-editor/fulladdr.glade.h:231
+# addressbook/gui/contact-editor/fulladdr.glade.h:231
+# addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: calendar/gui/dialogs/recur-comp.c:75
+#, fuzzy
+msgid "This and Future Instances"
+msgstr "瓦利斯和富图纳群岛"
+
+# my-evolution/my-evolution.glade.h:3
+# my-evolution/my-evolution.glade.h:3
+# my-evolution/my-evolution.glade.h:3
+#: calendar/gui/dialogs/recur-comp.c:77
+#, fuzzy
+msgid "All Instances"
+msgstr "所有站点(_L)："
+
 # calendar/gui/dialogs/recurrence-page.c:571
 # calendar/gui/dialogs/recurrence-page.c:571
 # calendar/gui/dialogs/recurrence-page.c:571
-#: 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:932
 # calendar/gui/dialogs/recurrence-page.c:932
 # calendar/gui/dialogs/recurrence-page.c:932
-#: calendar/gui/dialogs/recurrence-page.c:1007
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr "在"
 
 # my-evolution/metar.c:262
 # my-evolution/metar.c:262
 # my-evolution/metar.c:262
-#: 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 "第二"
 
@@ -8338,21 +8560,21 @@ msgstr "第二"
 # addressbook/gui/contact-editor/e-contact-editor.c:1714
 # mail/mail-config.glade.h:49
 # my-evolution/Locations.h:1614
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "third"
 msgstr "第三"
 
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "fourth"
 msgstr "第四"
 
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "last"
 msgstr "最后"
 
@@ -8365,28 +8587,28 @@ msgstr "最后"
 # addressbook/backend/ebook/e-card-simple.c:80
 # addressbook/gui/contact-editor/e-contact-editor.c:1657
 # addressbook/gui/widgets/e-addressbook-view.c:980
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1004
 msgid "Other Date"
 msgstr "其它日期"
 
 # calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 # calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 # calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
-#: 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:1088
 # calendar/gui/dialogs/recurrence-page.c:1088
 # calendar/gui/dialogs/recurrence-page.c:1088
-#: calendar/gui/dialogs/recurrence-page.c:1270
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr "在"
 
 # calendar/gui/dialogs/recurrence-page.c:1269
 # calendar/gui/dialogs/recurrence-page.c:1269
 # calendar/gui/dialogs/recurrence-page.c:1269
-#: calendar/gui/dialogs/recurrence-page.c:1455
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr "循环"
 
@@ -8498,31 +8720,39 @@ msgstr "年"
 # calendar/gui/dialogs/send-comp.c:55
 # calendar/gui/dialogs/send-comp.c:55
 # calendar/gui/dialogs/send-comp.c:56
-#: 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:55
 # calendar/gui/dialogs/send-comp.c:55
 # calendar/gui/dialogs/send-comp.c:59
-#: 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:60
 # calendar/gui/dialogs/send-comp.c:60
 # calendar/gui/dialogs/send-comp.c:66
-#: 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:60
 # calendar/gui/dialogs/send-comp.c:60
 # calendar/gui/dialogs/send-comp.c:70
-#: 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/comp-editor-util.c:194 calendar/gui/print.c:2170
+# calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
+# calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
+#: 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
 # calendar/gui/dialogs/task-details-page.glade.h:2
@@ -8542,22 +8772,10 @@ msgstr "% 完成"
 msgid "Date Completed:"
 msgstr "完成日期："
 
-# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
-# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
-# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
-# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
-# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
-# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
-#: 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:11
 # calendar/gui/dialogs/task-details-page.glade.h:11
 # calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "进度"
 
@@ -8567,22 +8785,22 @@ msgstr "进度"
 # my-evolution/e-summary-preferences.c:964
 # calendar/gui/dialogs/task-details-page.glade.h:12
 # my-evolution/e-summary-preferences.c:966
-#: 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:14
 # calendar/gui/dialogs/task-details-page.glade.h:14
 # calendar/gui/dialogs/task-details-page.glade.h:14
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "优先级(_P)："
 
 # calendar/gui/dialogs/task-details-page.glade.h:15
 # calendar/gui/dialogs/task-details-page.glade.h:15
 # calendar/gui/dialogs/task-details-page.glade.h:15
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "状态(_S)："
 
@@ -8592,7 +8810,7 @@ msgstr "状态(_S)："
 # calendar/gui/dialogs/task-editor.c:178
 # addressbook/gui/component/addressbook-config.glade.h:9
 # calendar/gui/dialogs/task-editor.c:178
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "基本"
 
@@ -8605,12 +8823,16 @@ msgstr "基本"
 # calendar/gui/dialogs/task-editor.c:190
 # calendar/gui/dialogs/task-editor.c:227
 # calendar/gui/dialogs/task-editor.c:322
-#: 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.c:527
+msgid "Due date is wrong"
+msgstr ""
+
 # calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:754
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
@@ -8620,9 +8842,9 @@ msgstr "分派"
 # calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:757
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:31
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
+#: 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 "描述："
 
@@ -8633,6 +8855,16 @@ msgstr "描述："
 msgid "Sta_rt Date:"
 msgstr "开始日期(_R)："
 
+# calendar/gui/dialogs/event-page.glade.h:13
+# calendar/gui/dialogs/task-page.glade.h:10
+# calendar/gui/dialogs/event-page.glade.h:13
+# calendar/gui/dialogs/task-page.glade.h:10
+# calendar/gui/dialogs/event-page.glade.h:13
+# calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "联系人(_C)..."
+
 # calendar/gui/dialogs/task-page.glade.h:11
 # calendar/gui/dialogs/task-page.glade.h:11
 # calendar/gui/dialogs/task-page.glade.h:11
@@ -8640,10 +8872,163 @@ msgstr "开始日期(_R)："
 msgid "_Due Date:"
 msgstr "到期日期(_D)："
 
+# calendar/gui/dialogs/alarm-page.c:309
+# calendar/gui/dialogs/alarm-page.c:309
+# calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d 天"
+
+# calendar/gui/dialogs/alarm-page.c:312
+# calendar/gui/dialogs/alarm-page.c:312
+# calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "1 天"
+
+# calendar/gui/dialogs/alarm-page.c:317
+# calendar/gui/dialogs/alarm-page.c:317
+# calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d 周"
+
+# calendar/gui/dialogs/alarm-page.c:320
+# calendar/gui/dialogs/alarm-page.c:320
+# calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 周"
+
+# calendar/gui/dialogs/alarm-page.c:325
+# calendar/gui/dialogs/alarm-page.c:325
+# calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d 小时"
+
+# calendar/gui/dialogs/alarm-page.c:328
+# calendar/gui/dialogs/alarm-page.c:328
+# calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 小时"
+
+# calendar/gui/dialogs/alarm-page.c:333
+# calendar/gui/dialogs/alarm-page.c:333
+# calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d 分钟"
+
+# calendar/gui/dialogs/alarm-page.c:336
+# calendar/gui/dialogs/alarm-page.c:336
+# calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 分钟"
+
+# calendar/gui/dialogs/alarm-page.c:341
+# calendar/gui/dialogs/alarm-page.c:341
+# calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d 秒"
+
+# calendar/gui/dialogs/alarm-page.c:344
+# calendar/gui/dialogs/alarm-page.c:344
+# calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "1 秒"
+
+# calendar/gui/dialogs/alarm-page.c:381
+# calendar/gui/dialogs/alarm-page.c:381
+# calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "发送电子邮件"
+
+# calendar/gui/dialogs/alarm-page.c:391
+# calendar/gui/dialogs/alarm-page.c:391
+# calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr "执行未知的动作"
+
+# calendar/gui/dialogs/alarm-page.c:403
+# calendar/gui/dialogs/alarm-page.c:403
+# calendar/gui/dialogs/alarm-page.c:403
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "在约会开始之前 %s %s"
+
+# calendar/gui/dialogs/alarm-page.c:406
+# calendar/gui/dialogs/alarm-page.c:406
+# calendar/gui/dialogs/alarm-page.c:406
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "在约会开始之后 %s %s"
+
+# calendar/gui/dialogs/alarm-page.c:411
+# calendar/gui/dialogs/alarm-page.c:411
+# calendar/gui/dialogs/alarm-page.c:411
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "在约会开始时 %s"
+
+# calendar/gui/dialogs/alarm-page.c:420
+# calendar/gui/dialogs/alarm-page.c:420
+# calendar/gui/dialogs/alarm-page.c:420
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "在约会结束之前 %s %s"
+
+# calendar/gui/dialogs/alarm-page.c:423
+# calendar/gui/dialogs/alarm-page.c:423
+# calendar/gui/dialogs/alarm-page.c:423
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "在约会结束之后 %s %s"
+
+# calendar/gui/dialogs/alarm-page.c:428
+# calendar/gui/dialogs/alarm-page.c:428
+# calendar/gui/dialogs/alarm-page.c:428
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "在约会结束时 %s"
+
+# calendar/gui/dialogs/alarm-page.c:453
+# calendar/gui/dialogs/alarm-page.c:453
+# calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr "在 %2$s 时 %1$s"
+
+# calendar/gui/dialogs/alarm-page.c:459
+# calendar/gui/dialogs/alarm-page.c:459
+# calendar/gui/dialogs/alarm-page.c:458
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s 为未知触发类型"
+
 # calendar/gui/e-calendar-table.c:427
 # calendar/gui/e-calendar-table.c:427
 # calendar/gui/e-calendar-table.c:428
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "0%"
 msgstr "0%"
@@ -8651,7 +9036,7 @@ msgstr "0%"
 # calendar/gui/e-calendar-table.c:428
 # calendar/gui/e-calendar-table.c:428
 # calendar/gui/e-calendar-table.c:429
-#: calendar/gui/e-calendar-table.c:441
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "10%"
 msgstr "10%"
@@ -8659,7 +9044,7 @@ msgstr "10%"
 # calendar/gui/e-calendar-table.c:429
 # calendar/gui/e-calendar-table.c:429
 # calendar/gui/e-calendar-table.c:430
-#: calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "20%"
 msgstr "20%"
@@ -8667,7 +9052,7 @@ msgstr "20%"
 # calendar/gui/e-calendar-table.c:430
 # calendar/gui/e-calendar-table.c:430
 # calendar/gui/e-calendar-table.c:431
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:418
 #, c-format
 msgid "30%"
 msgstr "30%"
@@ -8675,7 +9060,7 @@ msgstr "30%"
 # calendar/gui/e-calendar-table.c:431
 # calendar/gui/e-calendar-table.c:431
 # calendar/gui/e-calendar-table.c:432
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:419
 #, c-format
 msgid "40%"
 msgstr "40%"
@@ -8683,7 +9068,7 @@ msgstr "40%"
 # calendar/gui/e-calendar-table.c:432
 # calendar/gui/e-calendar-table.c:432
 # calendar/gui/e-calendar-table.c:433
-#: calendar/gui/e-calendar-table.c:445
+#: calendar/gui/e-calendar-table.c:420
 #, c-format
 msgid "50%"
 msgstr "50%"
@@ -8691,7 +9076,7 @@ msgstr "50%"
 # calendar/gui/e-calendar-table.c:433
 # calendar/gui/e-calendar-table.c:433
 # calendar/gui/e-calendar-table.c:434
-#: calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-calendar-table.c:421
 #, c-format
 msgid "60%"
 msgstr "60%"
@@ -8699,7 +9084,7 @@ msgstr "60%"
 # calendar/gui/e-calendar-table.c:434
 # calendar/gui/e-calendar-table.c:434
 # calendar/gui/e-calendar-table.c:435
-#: calendar/gui/e-calendar-table.c:447
+#: calendar/gui/e-calendar-table.c:422
 #, c-format
 msgid "70%"
 msgstr "70%"
@@ -8707,7 +9092,7 @@ msgstr "70%"
 # calendar/gui/e-calendar-table.c:435
 # calendar/gui/e-calendar-table.c:435
 # calendar/gui/e-calendar-table.c:436
-#: calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-calendar-table.c:423
 #, c-format
 msgid "80%"
 msgstr "80%"
@@ -8715,7 +9100,7 @@ msgstr "80%"
 # calendar/gui/e-calendar-table.c:436
 # calendar/gui/e-calendar-table.c:436
 # calendar/gui/e-calendar-table.c:437
-#: calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-calendar-table.c:424
 #, c-format
 msgid "90%"
 msgstr "90%"
@@ -8723,7 +9108,7 @@ msgstr "90%"
 # calendar/gui/e-calendar-table.c:437
 # calendar/gui/e-calendar-table.c:437
 # calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-calendar-table.c:450
+#: calendar/gui/e-calendar-table.c:425
 #, c-format
 msgid "100%"
 msgstr "100%"
@@ -8734,8 +9119,8 @@ msgstr "100%"
 # calendar/gui/e-week-view.c:1824
 # calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
 # calendar/gui/e-week-view.c:1828
-#: 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 "删除选中的对象"
 
@@ -8748,16 +9133,16 @@ msgstr "删除选中的对象"
 # calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3546
 # calendar/gui/e-week-view.c:3432 mail/folder-browser.c:1455
 # shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:37
-#: 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 "打开(_O)"
 
 # composer/e-msg-composer.c:943
 # composer/e-msg-composer.c:947
 # composer/e-msg-composer.c:912
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:951
 msgid "_Save as..."
 msgstr "另存为(_S)..."
 
@@ -8770,8 +9155,8 @@ msgstr "另存为(_S)..."
 # ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:41
 # ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:105
 # ui/my-evolution.xml.h:7
-#: 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
@@ -8787,8 +9172,8 @@ msgstr "打印(_P)..."
 # calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3555
 # calendar/gui/e-week-view.c:3441 ui/evolution-addressbook.xml.h:1
 # ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
-#: 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 "剪切(_U)"
@@ -8805,8 +9190,8 @@ msgstr "剪切(_U)"
 # calendar/gui/e-week-view.c:3443 ui/evolution-addressbook.xml.h:34
 # ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 # ui/evolution-tasks.xml.h:17
-#: 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"
@@ -8827,9 +9212,9 @@ msgstr "复制(_C)"
 # calendar/gui/e-week-view.c:3445 ui/evolution-addressbook.xml.h:38
 # ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 # ui/evolution-tasks.xml.h:21
-#: 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"
@@ -8838,35 +9223,35 @@ msgstr "粘贴(_P)"
 # ui/evolution-task-editor.xml.h:1
 # ui/evolution-task-editor.xml.h:1
 # ui/evolution-task-editor.xml.h:1
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:962
 msgid "_Assign Task"
 msgstr "委派任务(_A)"
 
 # ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 # ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 # ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-#: calendar/gui/e-calendar-table.c:1000
+#: calendar/gui/e-calendar-table.c:963
 msgid "_Forward as iCalendar"
 msgstr "作为 iCalendar 转发(_F)"
 
 # calendar/gui/e-calendar-table.c:954
 # calendar/gui/e-calendar-table.c:954
 # calendar/gui/e-calendar-table.c:973
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "标记为完成(_M)"
 
 # calendar/gui/e-calendar-table.c:959
 # calendar/gui/e-calendar-table.c:959
 # calendar/gui/e-calendar-table.c:978
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:965
 msgid "_Mark Selected Tasks as Complete"
 msgstr "把任务标记为完成(_M)"
 
 # calendar/gui/e-calendar-table.c:961
 # calendar/gui/e-calendar-table.c:961
 # calendar/gui/e-calendar-table.c:980
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "删除选定的任务(_D)"
 
@@ -8876,8 +9261,8 @@ msgstr "删除选定的任务(_D)"
 # calendar/gui/e-week-view.c:3924
 # calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7137
 # calendar/gui/e-week-view.c:3928
-#: 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 "更新对象"
 
@@ -8887,7 +9272,7 @@ msgstr "更新对象"
 # calendar/gui/e-calendar-table.etspec.h:6
 # calendar/gui/e-calendar-table.c:1247
 # calendar/gui/e-calendar-table.etspec.h:6
-#: 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 "点击以添加任务"
@@ -8905,8 +9290,8 @@ msgstr "提醒"
 # camel/camel-filter-driver.c:886
 # calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:924
 # camel/camel-filter-driver.c:1026
-#: 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 "完成"
 
@@ -8962,8 +9347,8 @@ msgstr "开始日期"
 # my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
 # shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
 #: 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 "概要"
 
@@ -8974,13 +9359,6 @@ msgstr "概要"
 msgid "Task sort"
 msgstr "任务排序"
 
-# calendar/gui/e-calendar-table.etspec.h:19
-# calendar/gui/e-calendar-table.etspec.h:19
-# calendar/gui/e-calendar-table.etspec.h:19
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL"
-
 # calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
 # e-util/e-time-utils.c:357
 # calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
@@ -8988,8 +9366,8 @@ msgstr "URL"
 # calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
 # e-util/e-time-utils.c:357
 #. 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 "%Y年%m月%d日 %a %H:%M:%S"
 
@@ -9000,8 +9378,8 @@ msgstr "%Y年%m月%d日 %a %H:%M:%S"
 # calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
 # e-util/e-time-utils.c:366
 #. 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 "%Y年%m月%d日 %a %I:%M%S %p"
 
@@ -9022,7 +9400,7 @@ msgstr ""
 # calendar/gui/e-day-view-time-item.c:518
 # calendar/gui/e-day-view-time-item.c:518
 # calendar/gui/e-day-view-time-item.c:518
-#: 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 分钟分割"
@@ -9035,8 +9413,8 @@ msgstr "%02i 分钟分割"
 # calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 #. 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 "%B %d %A"
 
@@ -9048,8 +9426,8 @@ msgstr "%B %d %A"
 # calendar/gui/e-week-view-main-item.c:347
 #. 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"
 
@@ -9060,8 +9438,8 @@ msgstr "%b %d"
 # calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:350
 # calendar/gui/print.c:768
 #. 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 "上午"
 
@@ -9072,22 +9450,22 @@ msgstr "上午"
 # calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
 # calendar/gui/print.c:770
 #. 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/component-factory.c:643 calendar/gui/e-day-view.c:3523
 # calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
 # calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-#: calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "新建约会(_A)"
 
 # calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
 # calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3410
 # calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3414
-#: 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 "新建全天事件(_E)"
 
@@ -9100,21 +9478,21 @@ msgstr "新建全天事件(_E)"
 # calendar/gui/dialogs/event-editor.c:207
 # calendar/gui/dialogs/event-editor.c:263
 # calendar/gui/dialogs/event-editor.c:366
-#: 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 "新会议"
 
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-#: 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 "新建任务"
 
 # ui/evolution-comp-editor.xml.h:11
 # ui/evolution-comp-editor.xml.h:11
 # ui/evolution-comp-editor.xml.h:11
-#: 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 "打印..."
 
@@ -9124,7 +9502,7 @@ msgstr "打印..."
 # ui/evolution-calendar.xml.h:17
 # calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3424
 # ui/evolution-calendar.xml.h:17
-#: 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 "转到今天(_T)"
@@ -9132,14 +9510,14 @@ msgstr "转到今天(_T)"
 # calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
 # calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3422
 # calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3426
-#: 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 "转到日期(_G)..."
 
 # ui/evolution-calendar.xml.h:42
 # ui/evolution-calendar.xml.h:42
 # ui/evolution-calendar.xml.h:42
-#: 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 "发布忙闲信息(_P)"
@@ -9147,80 +9525,185 @@ msgstr "发布忙闲信息(_P)"
 # ui/evolution-mail-global.xml.h:21
 # ui/evolution-mail-global.xml.h:21
 # ui/evolution-mail-global.xml.h:21
-#: 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 "设置(_S)..."
 
 # mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:105
 # mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:105
 # mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:107
-#: 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)..."
 
 # ui/evolution-event-editor.xml.h:7
 # ui/evolution-event-editor.xml.h:7
 # ui/evolution-event-editor.xml.h:7
-#: 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 "调度会议(_S)..."
 
 # ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 # ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 # ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-#: 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 "作为 iCalendar 转发(_F)..."
 
 # calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
 # calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3455
 # calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3459
-#: 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)"
 
 # calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
 # calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3457
 # calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3461
-#: 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 "删除该时间(_O)"
 
 # calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
 # calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3459
 # calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3463
-#: 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 "删除所有事件(_A)"
 
-#: calendar/gui/e-itip-control.c:615
+# calendar/gui/dialogs/recurrence-page.glade.h:13
+# calendar/gui/dialogs/recurrence-page.glade.h:13
+# calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Yes. (Complex Recurrence)"
+msgstr "简单循环(_S)"
+
+# calendar/gui/dialogs/recurrence-page.glade.h:4
+# calendar/gui/dialogs/recurrence-page.glade.h:4
+# calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/e-itip-control.c:716
+#, fuzzy
+msgid "Every day"
+msgstr "每"
+
+# calendar/gui/dialogs/alarm-page.c:309
+# calendar/gui/dialogs/alarm-page.c:309
+# calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "Every %d days"
+msgstr "%d 天"
+
+# calendar/gui/dialogs/recurrence-page.glade.h:4
+# calendar/gui/dialogs/recurrence-page.glade.h:4
+# calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Every week"
+msgstr "每"
+
+# calendar/gui/dialogs/alarm-page.c:317
+# calendar/gui/dialogs/alarm-page.c:317
+# calendar/gui/dialogs/alarm-page.c:317
+#: 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/dialogs/alarm-page.c:317
+# calendar/gui/dialogs/alarm-page.c:317
+# calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/e-itip-control.c:731
+#, fuzzy, c-format
+msgid "Every %d weeks on "
+msgstr "%d 周"
+
+# my-evolution/metar.c:322
+# my-evolution/metar.c:322
+# my-evolution/metar.c:322
+#: 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 ""
+
+# my-evolution/my-evolution.glade.h:11
+# my-evolution/my-evolution.glade.h:11
+# my-evolution/my-evolution.glade.h:11
+#: calendar/gui/e-itip-control.c:764
+#, fuzzy
+msgid "every month"
+msgstr "一个月(_H)"
+
+#: calendar/gui/e-itip-control.c:769
+#, c-format
+msgid "every %d months"
+msgstr ""
+
+# calendar/gui/dialogs/recurrence-page.glade.h:4
+# calendar/gui/dialogs/recurrence-page.glade.h:4
+# calendar/gui/dialogs/recurrence-page.glade.h:4
+#: 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:565
 # calendar/gui/e-itip-control.c:565
 # calendar/gui/e-itip-control.c:568
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:831
 msgid "<b>Ends:</b> "
 msgstr "<b>结束：</b>"
 
 # calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 # calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 # calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:851
 msgid "<b>Completed:</b> "
 msgstr "<b>已完成：</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:626 calendar/gui/e-itip-control.c:675
 # calendar/gui/e-itip-control.c:626 calendar/gui/e-itip-control.c:675
 # calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:678
-#: 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 信息"
 
@@ -9228,15 +9711,15 @@ msgstr "iCalendar 信息"
 # calendar/gui/e-itip-control.c:641
 # calendar/gui/e-itip-control.c:644
 #. Title
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr "iCalendar 错误"
 
 # calendar/gui/e-itip-control.c:706 calendar/gui/e-itip-control.c:722
 # calendar/gui/e-itip-control.c:706 calendar/gui/e-itip-control.c:722
 # calendar/gui/e-itip-control.c:709 calendar/gui/e-itip-control.c:725
-#: 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 "未知的人"
 
@@ -9244,7 +9727,7 @@ msgstr "未知的人"
 # calendar/gui/e-itip-control.c:729
 # calendar/gui/e-itip-control.c:732
 #. 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."
@@ -9253,21 +9736,21 @@ msgstr "<br> 请查看下列信息，并从下面的菜单中选择一个动作�
 # calendar/gui/e-itip-control.c:745
 # calendar/gui/e-itip-control.c:745
 # calendar/gui/e-itip-control.c:748
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>无</i>"
 
 # calendar/gui/dialogs/event-page.glade.h:8
 # calendar/gui/dialogs/event-page.glade.h:8
 # calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "位置："
 
 # calendar/gui/dialogs/task-details-page.glade.h:15
 # calendar/gui/dialogs/task-details-page.glade.h:15
 # calendar/gui/dialogs/task-details-page.glade.h:15
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr "状态："
 
@@ -9277,16 +9760,16 @@ msgstr "状态："
 # calendar/gui/e-meeting-model.c:824
 # calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
 # calendar/gui/e-meeting-model.c:824
-#: 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:804
 # calendar/gui/e-itip-control.c:804
 # calendar/gui/e-itip-control.c:807
-#: 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 "暂时接受"
 
@@ -9296,9 +9779,9 @@ msgstr "暂时接受"
 # calendar/gui/e-meeting-model.c:825
 # calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
 # calendar/gui/e-meeting-model.c:825
-#: 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 "否决"
 
@@ -9321,14 +9804,15 @@ msgstr "否决"
 # camel/providers/smtp/camel-smtp-transport.c:171
 # camel/providers/smtp/camel-smtp-transport.c:226
 # widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:442
-#: 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 "未知"
 
@@ -9341,16 +9825,16 @@ msgstr "未知"
 # calendar/gui/e-itip-control.c:789 calendar/gui/e-itip-control.c:805
 # calendar/gui/e-itip-control.c:821 calendar/gui/e-itip-control.c:834
 # calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:860
-#: 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:787
 # calendar/gui/e-itip-control.c:787
 # calendar/gui/e-itip-control.c:790
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "更新"
 
@@ -9366,67 +9850,67 @@ msgstr "更新"
 # calendar/gui/e-itip-control.c:823 calendar/gui/e-itip-control.c:836
 # calendar/gui/e-itip-control.c:849 calendar/gui/e-itip-control.c:862
 # shell/e-shell.c:1885 widgets/misc/e-cell-date-edit.c:258
-#: 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:803
 # calendar/gui/e-itip-control.c:803
 # calendar/gui/e-itip-control.c:806
-#: calendar/gui/e-itip-control.c:955
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr "接受"
 
 # calendar/gui/e-itip-control.c:804
 # calendar/gui/e-itip-control.c:804
 # calendar/gui/e-itip-control.c:807
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "暂时接受"
 
 # calendar/gui/e-itip-control.c:805
 # calendar/gui/e-itip-control.c:805
 # calendar/gui/e-itip-control.c:808
-#: calendar/gui/e-itip-control.c:957
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "否决"
 
 # calendar/gui/e-itip-control.c:819
 # calendar/gui/e-itip-control.c:819
 # calendar/gui/e-itip-control.c:822
-#: 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:832
 # calendar/gui/e-itip-control.c:832
 # calendar/gui/e-itip-control.c:835
-#: 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:846
 # calendar/gui/e-itip-control.c:846
 # calendar/gui/e-itip-control.c:848
-#: 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:860 ui/evolution-mail-global.xml.h:1
 # calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
 # calendar/gui/e-itip-control.c:861 ui/evolution-mail-global.xml.h:1
-#: 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:875
 # calendar/gui/e-itip-control.c:875
 # calendar/gui/e-itip-control.c:909
-#: 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> 发布了会议信息。"
@@ -9434,14 +9918,14 @@ msgstr "<b>%s</b> 发布了会议信息。"
 # calendar/gui/e-itip-control.c:876
 # calendar/gui/e-itip-control.c:876
 # calendar/gui/e-itip-control.c:910
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "会议信息"
 
 # calendar/gui/e-itip-control.c:880
 # calendar/gui/e-itip-control.c:880
 # calendar/gui/e-itip-control.c:914
-#: 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 "<b>%s</b> 请求 %s 参加一个会议。"
@@ -9449,7 +9933,7 @@ msgstr "<b>%s</b> 请求 %s 参加一个会议。"
 # calendar/gui/e-itip-control.c:880
 # calendar/gui/e-itip-control.c:880
 # calendar/gui/e-itip-control.c:914
-#: 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> 请求您参加一个会议。"
@@ -9457,14 +9941,14 @@ msgstr "<b>%s</b> 请求您参加一个会议。"
 # calendar/gui/e-itip-control.c:881
 # calendar/gui/e-itip-control.c:881
 # calendar/gui/e-itip-control.c:915
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "会议建议"
 
 # calendar/gui/e-itip-control.c:885
 # calendar/gui/e-itip-control.c:885
 # calendar/gui/e-itip-control.c:919
-#: 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> 希望加入到已存的会议。"
@@ -9472,14 +9956,14 @@ msgstr "<b>%s</b> 希望加入到已存的会议。"
 # calendar/gui/e-itip-control.c:886
 # calendar/gui/e-itip-control.c:886
 # calendar/gui/e-itip-control.c:920
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "会议更新"
 
 # calendar/gui/e-itip-control.c:890
 # calendar/gui/e-itip-control.c:890
 # calendar/gui/e-itip-control.c:924
-#: 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> 想收到最新的会议信息。"
@@ -9487,14 +9971,14 @@ msgstr "<b>%s</b> 想收到最新的会议信息。"
 # calendar/gui/e-itip-control.c:891
 # calendar/gui/e-itip-control.c:891
 # calendar/gui/e-itip-control.c:925
-#: 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:895
 # calendar/gui/e-itip-control.c:895
 # calendar/gui/e-itip-control.c:948
-#: 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> 已回复一个会议请求。"
@@ -9502,14 +9986,14 @@ msgstr "<b>%s</b> 已回复一个会议请求。"
 # calendar/gui/e-itip-control.c:896
 # calendar/gui/e-itip-control.c:896
 # calendar/gui/e-itip-control.c:949
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "会议答复"
 
 # calendar/gui/e-itip-control.c:900
 # calendar/gui/e-itip-control.c:900
 # calendar/gui/e-itip-control.c:953
-#: 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> 取消了一个会议。"
@@ -9517,7 +10001,7 @@ msgstr "<b>%s</b> 取消了一个会议。"
 # calendar/gui/e-itip-control.c:901
 # calendar/gui/e-itip-control.c:901
 # calendar/gui/e-itip-control.c:954
-#: calendar/gui/e-itip-control.c:1136
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "会议取消"
 
@@ -9527,8 +10011,8 @@ msgstr "会议取消"
 # calendar/gui/e-itip-control.c:990
 # calendar/gui/e-itip-control.c:958 calendar/gui/e-itip-control.c:1029
 # calendar/gui/e-itip-control.c:1064
-#: 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> 发送了一个无法理解的信息。"
@@ -9536,14 +10020,14 @@ msgstr "<b>%s</b> 发送了一个无法理解的信息。"
 # calendar/gui/e-itip-control.c:906
 # calendar/gui/e-itip-control.c:906
 # calendar/gui/e-itip-control.c:959
-#: 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:925
 # calendar/gui/e-itip-control.c:925
 # calendar/gui/e-itip-control.c:979
-#: 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> 发布了任务信息。"
@@ -9551,14 +10035,14 @@ msgstr "<b>%s</b> 发布了任务信息。"
 # calendar/gui/e-itip-control.c:926
 # calendar/gui/e-itip-control.c:926
 # calendar/gui/e-itip-control.c:980
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "任务信息"
 
 # calendar/gui/e-itip-control.c:930
 # calendar/gui/e-itip-control.c:930
 # calendar/gui/e-itip-control.c:984
-#: 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 "<b>%s</b> 请求 %s 完成一个任务。"
@@ -9566,7 +10050,7 @@ msgstr "<b>%s</b> 请求 %s 完成一个任务。"
 # calendar/gui/e-itip-control.c:930
 # calendar/gui/e-itip-control.c:930
 # calendar/gui/e-itip-control.c:984
-#: 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> 请求您完成一个任务。"
@@ -9574,14 +10058,14 @@ msgstr "<b>%s</b> 请求您完成一个任务。"
 # calendar/gui/e-itip-control.c:931
 # calendar/gui/e-itip-control.c:931
 # calendar/gui/e-itip-control.c:985
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "任务建议"
 
 # calendar/gui/e-itip-control.c:935
 # calendar/gui/e-itip-control.c:935
 # calendar/gui/e-itip-control.c:989
-#: 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> 希望加入到已存在的任务。"
@@ -9589,14 +10073,14 @@ msgstr "<b>%s<b> 希望加入到已存在的任务。"
 # calendar/gui/e-itip-control.c:936
 # calendar/gui/e-itip-control.c:936
 # calendar/gui/e-itip-control.c:990
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "任务更新"
 
 # calendar/gui/e-itip-control.c:940
 # calendar/gui/e-itip-control.c:940
 # calendar/gui/e-itip-control.c:994
-#: 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> 希望获取最新的任务信息。"
@@ -9604,14 +10088,14 @@ msgstr "<b>%s</b> 希望获取最新的任务信息。"
 # calendar/gui/e-itip-control.c:941
 # calendar/gui/e-itip-control.c:941
 # calendar/gui/e-itip-control.c:995
-#: 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:945
 # calendar/gui/e-itip-control.c:945
 # calendar/gui/e-itip-control.c:1019
-#: 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> 已经回复了任务委派。"
@@ -9619,14 +10103,14 @@ msgstr "<b>%s</b> 已经回复了任务委派。"
 # calendar/gui/e-itip-control.c:946
 # calendar/gui/e-itip-control.c:946
 # calendar/gui/e-itip-control.c:1020
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "任务回复"
 
 # calendar/gui/e-itip-control.c:950
 # calendar/gui/e-itip-control.c:950
 # calendar/gui/e-itip-control.c:1024
-#: 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> 取消了任务。"
@@ -9634,21 +10118,21 @@ msgstr "<b>%s</b> 取消了任务。"
 # calendar/gui/e-itip-control.c:951
 # calendar/gui/e-itip-control.c:951
 # calendar/gui/e-itip-control.c:1025
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "任务取消"
 
 # calendar/gui/e-itip-control.c:956
 # calendar/gui/e-itip-control.c:956
 # calendar/gui/e-itip-control.c:1030
-#: 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:975
 # calendar/gui/e-itip-control.c:975
 # calendar/gui/e-itip-control.c:1049
-#: 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> 发布了忙闲信息。"
@@ -9656,14 +10140,14 @@ msgstr "<b>%s</b> 发布了忙闲信息。"
 # calendar/gui/e-itip-control.c:976
 # calendar/gui/e-itip-control.c:976
 # calendar/gui/e-itip-control.c:1050
-#: 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:980
 # calendar/gui/e-itip-control.c:980
 # calendar/gui/e-itip-control.c:1054
-#: 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> 请求您的忙闲信息。"
@@ -9671,14 +10155,14 @@ msgstr "<b>%s</b> 请求您的忙闲信息。"
 # calendar/gui/e-itip-control.c:981
 # calendar/gui/e-itip-control.c:981
 # calendar/gui/e-itip-control.c:1055
-#: 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:985
 # calendar/gui/e-itip-control.c:985
 # calendar/gui/e-itip-control.c:1059
-#: 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> 应答了忙闲请求。"
@@ -9686,152 +10170,152 @@ msgstr "<b>%s</b> 应答了忙闲请求。"
 # calendar/gui/e-itip-control.c:986
 # calendar/gui/e-itip-control.c:986
 # calendar/gui/e-itip-control.c:1060
-#: 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:991
 # calendar/gui/e-itip-control.c:991
 # calendar/gui/e-itip-control.c:1065
-#: 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:1064
 # calendar/gui/e-itip-control.c:1064
 # calendar/gui/e-itip-control.c:1138
-#: 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:1083
 # calendar/gui/e-itip-control.c:1083
 # calendar/gui/e-itip-control.c:1157
-#: 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:1111 calendar/gui/e-itip-control.c:1117
 # calendar/gui/e-itip-control.c:1111 calendar/gui/e-itip-control.c:1117
 # calendar/gui/e-itip-control.c:1185 calendar/gui/e-itip-control.c:1191
-#: 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:1142
 # calendar/gui/e-itip-control.c:1142
 # calendar/gui/e-itip-control.c:1216
-#: 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:1363 calendar/gui/e-itip-control.c:1415
 # calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
 # calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
-#: 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 "找不到对象\n"
 
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1493
-#: calendar/gui/e-itip-control.c:1671
+#: 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:1243
 # calendar/gui/e-itip-control.c:1243
 # calendar/gui/e-itip-control.c:1317
-#: 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:1241
 # calendar/gui/e-itip-control.c:1241
 # calendar/gui/e-itip-control.c:1315
-#: 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:1300
 # calendar/gui/e-itip-control.c:1300
 # calendar/gui/e-itip-control.c:1374
-#: 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:1288
 # calendar/gui/e-itip-control.c:1288
 # calendar/gui/e-itip-control.c:1362
-#: 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 "因为无效状态而无法更新参与者状态！\n"
 
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1493
-#: calendar/gui/e-itip-control.c:1763
+#: 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:1298
 # calendar/gui/e-itip-control.c:1298
 # calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1766
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "更新参与者状态\n"
 
 # calendar/gui/e-itip-control.c:1296
 # calendar/gui/e-itip-control.c:1296
 # calendar/gui/e-itip-control.c:1370
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "无法更新参与者状态！\n"
 
 # calendar/gui/e-itip-control.c:1328
 # calendar/gui/e-itip-control.c:1328
 # calendar/gui/e-itip-control.c:1402
-#: calendar/gui/e-itip-control.c:1804
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "删除完成"
 
 # calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1411
 # calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1411
 # calendar/gui/e-itip-control.c:1421 calendar/gui/e-itip-control.c:1471
-#: 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:1363 calendar/gui/e-itip-control.c:1415
 # calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
 # calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
-#: 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"
 
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:834
-#: calendar/gui/e-itip-control.c:1961
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr "选择日历文件夹"
 
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:834
-#: calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr "选择任务文件夹"
 
@@ -9902,21 +10386,21 @@ msgstr "日期-开始"
 # calendar/gui/e-meeting-model.c:95
 # calendar/gui/e-meeting-model.c:95
 # calendar/gui/e-meeting-model.c:95
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr "主席人员"
 
 # calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1550
 # calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
 # calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
-#: 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:97
 # calendar/gui/e-meeting-model.c:97
 # calendar/gui/e-meeting-model.c:97
-#: calendar/gui/e-meeting-model.c:86
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr "可选的参与者"
 
@@ -9926,7 +10410,7 @@ msgstr "可选的参与者"
 # calendar/gui/e-meeting-model.c:780
 # calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
 # calendar/gui/e-meeting-model.c:780
-#: calendar/gui/e-meeting-model.c:87
+#: calendar/gui/e-meeting-model.c:83
 msgid "Resources"
 msgstr "资源"
 
@@ -9936,8 +10420,8 @@ msgstr "资源"
 # calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
 # calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
 # calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
-#: 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 "个人"
 
@@ -9947,8 +10431,8 @@ msgstr "个人"
 # calendar/gui/e-meeting-model.c:779
 # calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
 # calendar/gui/e-meeting-model.c:779
-#: 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 "组"
 
@@ -9958,8 +10442,8 @@ msgstr "组"
 # calendar/gui/e-meeting-model.c:780
 # calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
 # calendar/gui/e-meeting-model.c:780
-#: 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 "资源"
 
@@ -9969,8 +10453,8 @@ msgstr "资源"
 # calendar/gui/e-meeting-model.c:781
 # calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
 # calendar/gui/e-meeting-model.c:781
-#: 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 "房间"
 
@@ -9980,8 +10464,8 @@ msgstr "房间"
 # calendar/gui/e-meeting-model.c:794
 # calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
 # calendar/gui/e-meeting-model.c:794
-#: 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 "主席"
 
@@ -9991,8 +10475,8 @@ msgstr "主席"
 # calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
 # calendar/gui/e-meeting-model.c:269 calendar/gui/e-meeting-model.c:286
 # calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
-#: 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 "必需的参与者"
 
@@ -10002,8 +10486,8 @@ msgstr "必需的参与者"
 # calendar/gui/e-meeting-model.c:796
 # calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
 # calendar/gui/e-meeting-model.c:796
-#: 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 "可选的参与者"
 
@@ -10013,19 +10497,30 @@ msgstr "可选的参与者"
 # calendar/gui/e-meeting-model.c:797
 # calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
 # calendar/gui/e-meeting-model.c:797
-#: 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:319 calendar/gui/e-meeting-model.c:342
+# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
+# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
+# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
+# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
+# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
+#: 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:325 calendar/gui/e-meeting-model.c:348
 # calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:428
 # calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
 # calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
 # calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
 # calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
-#: 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: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 "暂时的"
 
@@ -10035,15 +10530,15 @@ msgstr "暂时的"
 # calendar/gui/e-meeting-model.c:827
 # calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
 # calendar/gui/e-meeting-model.c:827
-#: 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:331 calendar/gui/e-meeting-model.c:354
 # calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
 # calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
-#: 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 "正在处理"
 
@@ -10055,8 +10550,8 @@ msgstr "正在处理"
 # calendar/gui/e-meeting-time-sel.c:2102
 #. 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 "%Y年%B月%d日 %A"
 
@@ -10071,9 +10566,9 @@ msgstr "%Y年%B月%d日 %A"
 # e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 #. 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 "%Y年%m月%d日 %a"
 
@@ -10085,120 +10580,120 @@ msgstr "%Y年%m月%d日 %a"
 # e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1612
 #. 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:430
 # calendar/gui/e-meeting-time-sel.c:433
 # calendar/gui/e-meeting-time-sel.c:433
-#: 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:431
 # calendar/gui/e-meeting-time-sel.c:434
 # calendar/gui/e-meeting-time-sel.c:434
-#: 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:467
 # calendar/gui/e-meeting-time-sel.c:470
 # calendar/gui/e-meeting-time-sel.c:470
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "选项(_O)"
 
 # calendar/gui/e-meeting-time-sel.c:484
 # calendar/gui/e-meeting-time-sel.c:487
 # calendar/gui/e-meeting-time-sel.c:487
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "只显示工作小时(_O)"
 
 # calendar/gui/e-meeting-time-sel.c:497
 # calendar/gui/e-meeting-time-sel.c:500
 # calendar/gui/e-meeting-time-sel.c:500
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "显示缩放的输出(_Z)"
 
 # calendar/gui/e-meeting-time-sel.c:515
 # calendar/gui/e-meeting-time-sel.c:518
 # calendar/gui/e-meeting-time-sel.c:518
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "更新忙闲(_U)"
 
 # calendar/gui/e-meeting-time-sel.c:533
 # calendar/gui/e-meeting-time-sel.c:536
 # calendar/gui/e-meeting-time-sel.c:536
-#: 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:550
 # calendar/gui/e-meeting-time-sel.c:553
 # calendar/gui/e-meeting-time-sel.c:553
-#: calendar/gui/e-meeting-time-sel.c:561
+#: calendar/gui/e-meeting-time-sel.c:534
 msgid "_Autopick"
 msgstr "自动获取(_A)"
 
 # calendar/gui/e-meeting-time-sel.c:564
 # calendar/gui/e-meeting-time-sel.c:567
 # calendar/gui/e-meeting-time-sel.c:567
-#: 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:581
 # calendar/gui/e-meeting-time-sel.c:584
 # calendar/gui/e-meeting-time-sel.c:584
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:567
 msgid "_All People and Resources"
 msgstr "所有人和资源(_A)"
 
 # calendar/gui/e-meeting-time-sel.c:594
 # calendar/gui/e-meeting-time-sel.c:597
 # calendar/gui/e-meeting-time-sel.c:597
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "所有人和一个资源(_P)"
 
 # calendar/gui/e-meeting-time-sel.c:607
 # calendar/gui/e-meeting-time-sel.c:610
 # calendar/gui/e-meeting-time-sel.c:610
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "必需的人(_R)"
 
 # calendar/gui/e-meeting-time-sel.c:620
 # calendar/gui/e-meeting-time-sel.c:623
 # calendar/gui/e-meeting-time-sel.c:623
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "必需的人和一个资源(_O)"
 
 # calendar/gui/e-meeting-time-sel.c:643
 # calendar/gui/e-meeting-time-sel.c:646
 # calendar/gui/e-meeting-time-sel.c:646
-#: calendar/gui/e-meeting-time-sel.c:654
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "会议开始时间(_S)："
 
 # calendar/gui/e-meeting-time-sel.c:662
 # calendar/gui/e-meeting-time-sel.c:665
 # calendar/gui/e-meeting-time-sel.c:665
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "会议结束时间(_E)："
 
 # calendar/gui/e-tasks.c:328
 # calendar/gui/e-tasks.c:328
 # calendar/gui/e-tasks.c:342
-#: 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"
@@ -10207,7 +10702,7 @@ msgstr "在 %s 打开任务"
 # calendar/gui/e-tasks.c:355
 # calendar/gui/e-tasks.c:355
 # calendar/gui/e-tasks.c:367
-#: 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”中装入任务"
@@ -10215,7 +10710,7 @@ msgstr "无法从“%s”中装入任务"
 # calendar/gui/e-tasks.c:367
 # calendar/gui/e-tasks.c:367
 # calendar/gui/e-tasks.c:379
-#: 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”必需的方法"
@@ -10223,7 +10718,7 @@ msgstr "不支持装入“%s”必需的方法"
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1493
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
+#: 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”中的文件夹"
@@ -10231,7 +10726,7 @@ msgstr "您没有适当的权限打开“%s”中的文件夹"
 # shell/e-shell-importer.c:455
 # shell/e-shell-importer.c:455
 # shell/e-shell-importer.c:466
-#: 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"
@@ -10243,7 +10738,7 @@ msgstr ""
 # calendar/gui/e-calendar-table.etspec.h:8
 # calendar/gui/e-calendar-table.etspec.h:8
 # calendar/gui/e-calendar-table.etspec.h:8
-#: calendar/gui/e-tasks.c:540
+#: calendar/gui/e-tasks.c:554
 msgid "Completing tasks..."
 msgstr "正在完成的日期..."
 
@@ -10253,28 +10748,28 @@ msgstr "正在完成的日期..."
 # calendar/gui/e-week-view.c:1824
 # calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
 # calendar/gui/e-week-view.c:1828
-#: calendar/gui/e-tasks.c:563
+#: calendar/gui/e-tasks.c:577
 msgid "Deleting selected objects..."
 msgstr "正在删除选中的对象..."
 
 # mail/mail-ops.c:1556
 # mail/mail-ops.c:1558
 # calendar/gui/e-tasks.c:629
-#: calendar/gui/e-tasks.c:656
+#: calendar/gui/e-tasks.c:672
 msgid "Expunging"
 msgstr "正在删除"
 
 # calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
 # calendar/gui/e-week-view.c:3408 calendar/gui/e-week-view.c:3446
 # calendar/gui/e-week-view.c:3412 calendar/gui/e-week-view.c:3450
-#: calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "新建约会(_A)..."
 
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1493
-#: calendar/gui/gnome-cal.c:1530
+#: calendar/gui/gnome-cal.c:1503
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "无法打开“%s”中的文件夹"
@@ -10282,7 +10777,7 @@ msgstr "无法打开“%s”中的文件夹"
 # calendar/gui/gnome-cal.c:1510
 # calendar/gui/gnome-cal.c:1510
 # calendar/gui/gnome-cal.c:1504
-#: 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”必需的方法"
@@ -10290,13 +10785,12 @@ msgstr "不支持打开“%s”必需的方法"
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:371
-#. 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 "添加关于 %s 的提醒"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -10304,7 +10798,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"
@@ -10315,7 +10809,7 @@ msgstr ""
 # calendar/gui/gnome-cal.c:1865
 # calendar/gui/gnome-cal.c:1865
 # calendar/gui/gnome-cal.c:1859
-#: calendar/gui/gnome-cal.c:1996
+#: calendar/gui/gnome-cal.c:1995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "从 %s 打开日历"
@@ -10428,74 +10922,75 @@ msgstr "九月"
 # calendar/gui/itip-utils.c:274
 # calendar/gui/itip-utils.c:274
 # calendar/gui/itip-utils.c:274
-#: 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:243
 # calendar/gui/itip-utils.c:243
 # calendar/gui/itip-utils.c:243
-#: 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:313 calendar/gui/itip-utils.c:355
 # calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
 # calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
-#: 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:315 calendar/gui/itip-utils.c:357
 # calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
 # calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
-#: 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:317 calendar/gui/itip-utils.c:359
 # calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
 # calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
-#: 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:319 calendar/gui/itip-utils.c:376
 # calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
 # calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
-#: 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:321
 # calendar/gui/itip-utils.c:321
 # calendar/gui/itip-utils.c:321
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "日历信息"
 
 # calendar/gui/e-itip-control.c:787
 # calendar/gui/e-itip-control.c:787
 # calendar/gui/e-itip-control.c:790
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr "更新"
 
 # ui/evolution-subscribe.xml.h:3
 # ui/evolution-subscribe.xml.h:3
 # ui/evolution-subscribe.xml.h:3
-#: 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:370
 # calendar/gui/itip-utils.c:370
 # calendar/gui/itip-utils.c:370
-#: calendar/gui/itip-utils.c:586
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "忙闲信息 (%s 到 %s)"
@@ -10503,325 +10998,63 @@ msgstr "忙闲信息 (%s 到 %s)"
 # calendar/gui/itip-utils.c:382
 # calendar/gui/itip-utils.c:382
 # calendar/gui/itip-utils.c:382
-#: calendar/gui/itip-utils.c:598
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "iCalendar 信息"
 
 # calendar/gui/itip-utils.c:573
 # calendar/gui/itip-utils.c:573
 # calendar/gui/itip-utils.c:581
-#: calendar/gui/itip-utils.c:756
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 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:33
-# addressbook/conduit/address-conduit.c:1533
-# addressbook/gui/component/addressbook-factory.c:50
-# calendar/conduits/calendar/calendar-conduit.c:1449
-# calendar/conduits/todo/todo-conduit.c:1130
-# calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
-# tools/evolution-addressbook-export.c:60
-# tools/evolution-addressbook-import.c:86
-# 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:33
-# addressbook/conduit/address-conduit.c:1538
-# addressbook/gui/component/addressbook-factory.c:50
-# calendar/conduits/calendar/calendar-conduit.c:1546
-# calendar/conduits/todo/todo-conduit.c:1130
-# calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
-# tools/evolution-addressbook-export.c:60
-# tools/evolution-addressbook-import.c:86
-# 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:33
-# addressbook/conduit/address-conduit.c:1721
-# addressbook/gui/component/addressbook-factory.c:50
-# calendar/conduits/calendar/calendar-conduit.c:1727
-# calendar/conduits/todo/todo-conduit.c:1316
-# calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
-# tools/evolution-addressbook-abuse.c:132
-# tools/evolution-addressbook-export.c:60
-# tools/evolution-addressbook-import.c:86
-#: calendar/gui/main.c:70
-msgid "Could not activate Bonobo"
-msgstr "无法激活 Bonobo"
-
-# calendar/gui/main.c:91
-# calendar/gui/main.c:91
-# calendar/gui/main.c:91
-#: calendar/gui/main.c:99
-msgid "Could not create the component editor factory"
-msgstr "无法创建组件编辑器车间"
-
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-#: calendar/gui/print.c:456
-msgid "1st"
-msgstr "一号"
-
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-#: calendar/gui/print.c:456
-msgid "2nd"
-msgstr "二号"
-
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-#: calendar/gui/print.c:456
-msgid "3rd"
-msgstr "三号"
-
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-#: calendar/gui/print.c:456
-msgid "4th"
-msgstr "四号"
-
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-#: calendar/gui/print.c:456
-msgid "5th"
-msgstr "五号"
-
-# calendar/gui/print.c:426
-# calendar/gui/print.c:426
-# calendar/gui/print.c:426
-#: calendar/gui/print.c:457
-msgid "6th"
-msgstr "六号"
-
-# calendar/gui/print.c:426
-# calendar/gui/print.c:426
-# calendar/gui/print.c:426
-#: calendar/gui/print.c:457
-msgid "7th"
-msgstr "七号"
-
-# calendar/gui/print.c:426
-# calendar/gui/print.c:426
-# calendar/gui/print.c:426
-#: calendar/gui/print.c:457
-msgid "8th"
-msgstr "八号"
-
-# calendar/gui/print.c:426
-# calendar/gui/print.c:426
-# calendar/gui/print.c:426
-#: calendar/gui/print.c:457
-msgid "9th"
-msgstr "九号"
-
-# calendar/gui/print.c:426
-# calendar/gui/print.c:426
-# calendar/gui/print.c:426
-#: calendar/gui/print.c:457
-msgid "10th"
-msgstr "十号"
-
-# calendar/gui/print.c:427
-# calendar/gui/print.c:427
-# calendar/gui/print.c:427
-#: calendar/gui/print.c:458
-msgid "11th"
-msgstr "十一号"
-
-# calendar/gui/print.c:427
-# calendar/gui/print.c:427
-# calendar/gui/print.c:427
-#: calendar/gui/print.c:458
-msgid "12th"
-msgstr "十二号"
-
-# calendar/gui/print.c:427
-# calendar/gui/print.c:427
-# calendar/gui/print.c:427
-#: calendar/gui/print.c:458
-msgid "13th"
-msgstr "十三号"
-
-# calendar/gui/print.c:427
-# calendar/gui/print.c:427
-# calendar/gui/print.c:427
-#: calendar/gui/print.c:458
-msgid "14th"
-msgstr "十四号"
-
-# calendar/gui/print.c:427
-# calendar/gui/print.c:427
-# calendar/gui/print.c:427
-#: calendar/gui/print.c:458
-msgid "15th"
-msgstr "十五号"
-
-# calendar/gui/print.c:428
-# calendar/gui/print.c:428
-# calendar/gui/print.c:428
-#: calendar/gui/print.c:459
-msgid "16th"
-msgstr "十六号"
-
-# calendar/gui/print.c:428
-# calendar/gui/print.c:428
-# calendar/gui/print.c:428
-#: calendar/gui/print.c:459
-msgid "17th"
-msgstr "十七号"
-
-# calendar/gui/print.c:428
-# calendar/gui/print.c:428
-# calendar/gui/print.c:428
-#: calendar/gui/print.c:459
-msgid "18th"
-msgstr "十八号"
-
-# calendar/gui/print.c:428
-# calendar/gui/print.c:428
-# calendar/gui/print.c:428
-#: calendar/gui/print.c:459
-msgid "19th"
-msgstr "十九号"
-
-# calendar/gui/print.c:428
-# calendar/gui/print.c:428
-# calendar/gui/print.c:428
-#: calendar/gui/print.c:459
-msgid "20th"
-msgstr "二十号"
-
-# calendar/gui/print.c:429
-# calendar/gui/print.c:429
-# calendar/gui/print.c:429
-#: calendar/gui/print.c:460
-msgid "21st"
-msgstr "二十一号"
-
-# calendar/gui/print.c:429
-# calendar/gui/print.c:429
-# calendar/gui/print.c:429
-#: calendar/gui/print.c:460
-msgid "22nd"
-msgstr "二十二号"
-
-# calendar/gui/print.c:429
-# calendar/gui/print.c:429
-# calendar/gui/print.c:429
-#: calendar/gui/print.c:460
-msgid "23rd"
-msgstr "二十三号"
-
-# calendar/gui/print.c:429
-# calendar/gui/print.c:429
-# calendar/gui/print.c:429
-#: calendar/gui/print.c:460
-msgid "24th"
-msgstr "二十四号"
-
-# calendar/gui/print.c:429
-# calendar/gui/print.c:429
-# calendar/gui/print.c:429
-#: calendar/gui/print.c:460
-msgid "25th"
-msgstr "二十五号"
-
-# calendar/gui/print.c:430
-# calendar/gui/print.c:430
-# calendar/gui/print.c:430
-#: calendar/gui/print.c:461
-msgid "26th"
-msgstr "二十六号"
-
-# calendar/gui/print.c:430
-# calendar/gui/print.c:430
-# calendar/gui/print.c:430
-#: calendar/gui/print.c:461
-msgid "27th"
-msgstr "二十七号"
-
-# calendar/gui/print.c:430
-# calendar/gui/print.c:430
-# calendar/gui/print.c:430
-#: calendar/gui/print.c:461
-msgid "28th"
-msgstr "二十八号"
-
-# calendar/gui/print.c:430
-# calendar/gui/print.c:430
-# calendar/gui/print.c:430
-#: calendar/gui/print.c:461
-msgid "29th"
-msgstr "二十九号"
-
-# calendar/gui/print.c:430
-# calendar/gui/print.c:430
-# calendar/gui/print.c:430
-#: calendar/gui/print.c:461
-msgid "30th"
-msgstr "三十号"
-
-# calendar/gui/print.c:431
-# calendar/gui/print.c:431
-# calendar/gui/print.c:431
-#: calendar/gui/print.c:462
-msgid "31st"
-msgstr "三十一号"
-
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr "日"
 
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "一"
 
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "二"
 
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "三"
 
 # calendar/gui/print.c:499
 # calendar/gui/print.c:499
 # calendar/gui/print.c:499
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "四"
 
 # calendar/gui/print.c:499
 # calendar/gui/print.c:499
 # calendar/gui/print.c:499
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "五"
 
 # calendar/gui/print.c:499
 # calendar/gui/print.c:499
 # calendar/gui/print.c:499
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "六"
 
@@ -10829,21 +11062,21 @@ msgstr "六"
 # calendar/gui/print.c:1819
 # calendar/gui/print.c:1819
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr "选中的日期 (%Y年%b月%d日 %a)"
 
 # calendar/gui/print.c:1844 calendar/gui/print.c:1848
 # calendar/gui/print.c:1844 calendar/gui/print.c:1848
 # calendar/gui/print.c:1844 calendar/gui/print.c:1848
-#: 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 "%b月%d日 %a"
 
 # calendar/gui/print.c:1845
 # calendar/gui/print.c:1845
 # calendar/gui/print.c:1845
-#: calendar/gui/print.c:1889
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr "%Y年%d日 %a"
 
@@ -10853,15 +11086,15 @@ msgstr "%Y年%d日 %a"
 # calendar/gui/print.c:1852
 # calendar/gui/print.c:1849 calendar/gui/print.c:1851
 # calendar/gui/print.c:1852
-#: 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 "%Y年%b月%d日 %a"
 
 # calendar/gui/print.c:1856
 # calendar/gui/print.c:1856
 # calendar/gui/print.c:1856
-#: calendar/gui/print.c:1900
+#: calendar/gui/print.c:1922
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "选中的周 (%s - %s)"
@@ -10870,7 +11103,7 @@ msgstr "选中的周 (%s - %s)"
 # calendar/gui/print.c:1864
 # calendar/gui/print.c:1864
 #. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr "选中的月 (%Y年%b月)"
 
@@ -10878,21 +11111,21 @@ msgstr "选中的月 (%Y年%b月)"
 # calendar/gui/print.c:1871
 # calendar/gui/print.c:1871
 #. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr "选中的年 (%Y年)"
 
 # calendar/gui/print.c:2205
 # calendar/gui/print.c:2205
 # calendar/gui/print.c:2205
-#: calendar/gui/print.c:2249
+#: calendar/gui/print.c:2267
 msgid "Task"
 msgstr "任务"
 
 # calendar/gui/print.c:2262
 # calendar/gui/print.c:2262
 # calendar/gui/print.c:2262
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr "状态：%s"
@@ -10900,7 +11133,7 @@ msgstr "状态：%s"
 # calendar/gui/print.c:2280
 # calendar/gui/print.c:2280
 # calendar/gui/print.c:2280
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "优先级：%s"
@@ -10908,7 +11141,7 @@ msgstr "优先级：%s"
 # calendar/gui/print.c:2294
 # calendar/gui/print.c:2294
 # calendar/gui/print.c:2294
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2358
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成率：%i"
@@ -10916,7 +11149,7 @@ msgstr "完成率：%i"
 # calendar/gui/print.c:2306
 # calendar/gui/print.c:2306
 # calendar/gui/print.c:2306
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2370
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
@@ -10924,7 +11157,7 @@ msgstr "URL：%s"
 # calendar/gui/print.c:2320
 # calendar/gui/print.c:2320
 # calendar/gui/print.c:2320
-#: calendar/gui/print.c:2364
+#: calendar/gui/print.c:2384
 #, c-format
 msgid "Categories: %s"
 msgstr "类别：%s"
@@ -10932,17 +11165,10 @@ msgstr "类别：%s"
 # calendar/gui/print.c:2331
 # calendar/gui/print.c:2331
 # calendar/gui/print.c:2331
-#: calendar/gui/print.c:2375
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr "联系人："
 
-# calendar/gui/print.c:2386
-# calendar/gui/print.c:2386
-# calendar/gui/print.c:2386
-#: calendar/gui/print.c:2430
-msgid "Print Calendar"
-msgstr "打印日历"
-
 # calendar/gui/print.c:2477 calendar/gui/print.c:2569
 # mail/mail-callbacks.c:2364 my-evolution/e-summary.c:619
 # ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
@@ -10952,45 +11178,37 @@ msgstr "打印日历"
 # calendar/gui/print.c:2477 calendar/gui/print.c:2569
 # mail/mail-callbacks.c:2597 my-evolution/e-summary.c:605
 # ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
-#: 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:2506
 # calendar/gui/print.c:2506
 # calendar/gui/print.c:2506
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "打印项"
 
 # calendar/gui/print.c:2587
 # calendar/gui/print.c:2587
 # calendar/gui/print.c:2587
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "打印设置"
 
-# calendar/gui/tasks-control-factory.c:75
-# calendar/gui/tasks-control-factory.c:75
-# calendar/gui/tasks-control-factory.c:75
-#: 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:126
 # calendar/gui/tasks-control.c:126
 # calendar/gui/tasks-control.c:137
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr "要显示的任务文件夹的 URI"
 
 # mail/mail-callbacks.c:2135
 # mail/mail-callbacks.c:2254
 # calendar/gui/tasks-control.c:434
-#: 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"
@@ -11004,138 +11222,78 @@ msgstr ""
 # mail/mail-callbacks.c:2142
 # mail/mail-callbacks.c:2261
 # calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2297
-#: 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 "不要再次询问。"
 
 # addressbook/printing/e-contact-print.c:1111
 # addressbook/printing/e-contact-print.c:1111
 # addressbook/printing/e-contact-print.c:1115
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:615
 msgid "Print Tasks"
 msgstr "打印任务"
 
-# calendar/gui/tasks-migrate.c:105
-# calendar/gui/tasks-migrate.c:105
-# calendar/gui/tasks-migrate.c:105
-#: 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
-# calendar/gui/tasks-migrate.c:108
-# calendar/gui/tasks-migrate.c:108
-#: 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
-# calendar/gui/tasks-migrate.c:120
-# calendar/gui/tasks-migrate.c:120
-#: 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
-# calendar/gui/tasks-migrate.c:133
-# calendar/gui/tasks-migrate.c:133
-#: 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:314 calendar/gui/weekday-picker.c:409
 # calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
-#: 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"
 
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-# calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "将 iCalendar 文件导入 Evolution 的车间"
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Evolution 日历 iTip/iMip 查看器"
 
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-# calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "将 iCalendar 文件导入 Evolution"
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Evolution 日历 iTip/iMip 查看器"
 
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-# calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "将 vCalendar 文件导入 Evolution"
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Evolution 日历 iTip/iMip 查看器"
 
-# camel/providers/local/camel-mbox-folder.c:347
-# camel/providers/local/camel-mbox-folder.c:379
-# camel/providers/local/camel-mbox-folder.c:391
-# camel/providers/local/camel-spool-folder.c:595
-# camel/providers/local/camel-spool-folder.c:627
-# camel/providers/local/camel-spool-folder.c:639
-# camel/providers/local/camel-mbox-folder.c:347
-# camel/providers/local/camel-mbox-folder.c:379
-# camel/providers/local/camel-mbox-folder.c:391
-# camel/providers/local/camel-spool-folder.c:595
-# camel/providers/local/camel-spool-folder.c:627
-# camel/providers/local/camel-spool-folder.c:639
-# camel/providers/local/camel-mbox-folder.c:347
-# camel/providers/local/camel-mbox-folder.c:379
-# camel/providers/local/camel-mbox-folder.c:391
-# camel/providers/local/camel-spool-folder.c:595
-# camel/providers/local/camel-spool-folder.c:627
-# camel/providers/local/camel-spool-folder.c:639
-#: calendar/importers/icalendar-importer.c:168
-#, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr "无法从注册表获取存储列表：%s"
+# calendar/gui/e-itip-control.glade.h:4
+# calendar/gui/e-itip-control.glade.h:4
+# calendar/gui/e-itip-control.glade.h:4
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "日历消息"
 
-# mail/component-factory.c:129
-# mail/component-factory.c:129
-# mail/component-factory.c:129
-#: calendar/importers/icalendar-importer.c:180
-#, 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/gui/dialogs/event-editor.c:190
 # calendar/gui/dialogs/event-editor.c:190
 # calendar/gui/dialogs/event-editor.c:190
-#: calendar/importers/icalendar-importer.c:483
+#: calendar/importers/icalendar-importer.c:404
 msgid "Reminder!!"
 msgstr "提醒！！"
 
 # calendar/gui/e-itip-control.glade.h:4
 # calendar/gui/e-itip-control.glade.h:4
 # calendar/gui/e-itip-control.glade.h:4
-#: calendar/importers/icalendar-importer.c:697
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "日历事件"
 
 # importers/pine-importer.c:663
 # importers/pine-importer.c:663
 # importers/pine-importer.c:663
-#: 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?"
@@ -11149,10 +11307,14 @@ msgstr ""
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 # calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-#: calendar/importers/icalendar-importer.c:729
+#: 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:246
 # calendar/pcs/query.c:246
 # calendar/pcs/query.c:246
@@ -13745,42 +13907,58 @@ msgstr ""
 # camel/camel-cipher-context.c:171
 # camel/camel-cipher-context.c:169
 # camel/camel-cipher-context.c:169
-#: 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:251
 # camel/camel-cipher-context.c:249
 # camel/camel-cipher-context.c:249
-#: 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:294
 # camel/camel-cipher-context.c:292
 # camel/camel-cipher-context.c:292
-#: 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:336
 # camel/camel-cipher-context.c:334
 # camel/camel-cipher-context.c:334
-#: camel/camel-cipher-context.c:296
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr "该密码不支持解密"
 
+# camel/camel-cipher-context.c:336
+# camel/camel-cipher-context.c:334
+# camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:342
+#, fuzzy
+msgid "You may not import keys with this cipher"
+msgstr "该密码不支持解密"
+
+# camel/camel-cipher-context.c:336
+# camel/camel-cipher-context.c:334
+# camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:374
+#, fuzzy
+msgid "You may not export keys with this cipher"
+msgstr "该密码不支持解密"
+
 # mail/mail-ops.c:1870
 # mail/mail-ops.c:1872
 # camel/camel-data-cache.c:159
-#: camel/camel-data-cache.c:169
+#: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
 msgstr "无法创建缓冲路径"
 
 # camel/providers/imap/camel-imap-message-cache.c:154
 # camel/providers/imap/camel-imap-message-cache.c:154
 # camel/camel-data-cache.c:426
-#: camel/camel-data-cache.c:443
+#: camel/camel-data-cache.c:370
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "无法删除缓冲条目：%s：%s"
@@ -13835,17 +14013,61 @@ msgstr "正在存储文件夹“%s”"
 msgid "You must be working online to complete this operation"
 msgstr "您必需在线工作以便完成该操作"
 
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+#: 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/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+#: 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/providers/imap/camel-imap-folder.c:194
+# camel/providers/imap/camel-imap-folder.c:194
+# camel/providers/imap/camel-imap-folder.c:197
+#: 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:553 camel/camel-filter-driver.c:562
 # camel/camel-filter-driver.c:602 camel/camel-filter-driver.c:611
 # camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:698
-#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "同步文件夹"
 
 # camel/camel-filter-driver.c:921
 # camel/camel-filter-driver.c:970
 # camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
-#: 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"
@@ -13853,7 +14075,7 @@ msgstr "解析过滤规则错误： %s： %s"
 # camel/camel-filter-driver.c:927
 # camel/camel-filter-driver.c:976
 # camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
-#: 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"
@@ -13861,21 +14083,21 @@ msgstr "执行过滤规则错误： %s： %s"
 # camel/camel-filter-driver.c:664
 # camel/camel-filter-driver.c:713
 # camel/camel-filter-driver.c:865
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "无法打开脱机文件夹"
 
 # camel/camel-filter-driver.c:673
 # camel/camel-filter-driver.c:722
 # camel/camel-filter-driver.c:874
-#: camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "无法处理脱机文件夹"
 
 # camel/camel-filter-driver.c:688
 # camel/camel-filter-driver.c:737
 # camel/camel-filter-driver.c:889
-#: camel/camel-filter-driver.c:966
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "获取邮件 %d (%d%%)"
@@ -13883,14 +14105,14 @@ msgstr "获取邮件 %d (%d%%)"
 # camel/camel-filter-driver.c:692
 # camel/camel-filter-driver.c:741
 # camel/camel-filter-driver.c:893
-#: camel/camel-filter-driver.c:970
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "无法打开消息"
 
 # camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
 # camel/camel-filter-driver.c:742 camel/camel-filter-driver.c:754
 # camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
-#: 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 失败"
@@ -13898,14 +14120,14 @@ msgstr "在消息 %d 失败"
 # camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
 # camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:881
 # camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
-#: 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:789
 # camel/camel-filter-driver.c:838
 # camel/camel-filter-driver.c:988
-#: camel/camel-filter-driver.c:1058
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "正在获取第 %d 个消息，共 %d 个"
@@ -13913,7 +14135,7 @@ msgstr "正在获取第 %d 个消息，共 %d 个"
 # camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
 # camel/camel-filter-driver.c:843 camel/camel-filter-driver.c:861
 # camel/camel-filter-driver.c:1003
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "在第 %d 个消息失败，共 %d 个"
@@ -13921,14 +14143,14 @@ msgstr "在第 %d 个消息失败，共 %d 个"
 # camel/camel-smime-context.c:810
 # camel/camel-smime-context.c:810
 # camel/camel-filter-search.c:126
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 msgid "Failed to retrieve message"
 msgstr "检索消息失败。"
 
 # shell/e-shell.c:1886
 # shell/e-shell.c:1886
 # shell/e-shell.c:1887
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "无效参数"
@@ -13936,49 +14158,15 @@ msgstr "无效参数"
 # shell/e-shell.c:1886
 # shell/e-shell.c:1886
 # shell/e-shell.c:1887
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "无效参数"
 
-# camel/providers/imap/camel-imap-message-cache.c:256
-# camel/providers/imap/camel-imap-message-cache.c:313
-# camel/providers/imap/camel-imap-message-cache.c:344
-# camel/providers/imap/camel-imap-message-cache.c:376
-# camel/providers/imap/camel-imap-message-cache.c:256
-# camel/providers/imap/camel-imap-message-cache.c:313
-# camel/providers/imap/camel-imap-message-cache.c:344
-# camel/providers/imap/camel-imap-message-cache.c:376
-# camel/providers/imap/camel-imap-message-cache.c:256
-# camel/providers/imap/camel-imap-message-cache.c:313
-# camel/providers/imap/camel-imap-message-cache.c:344
-# camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/camel-filter-search.c:514
-#, fuzzy, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "缓冲邮件 %s 失败： %s"
-
-# camel/providers/imap/camel-imap-message-cache.c:256
-# camel/providers/imap/camel-imap-message-cache.c:313
-# camel/providers/imap/camel-imap-message-cache.c:344
-# camel/providers/imap/camel-imap-message-cache.c:376
-# camel/providers/imap/camel-imap-message-cache.c:256
-# camel/providers/imap/camel-imap-message-cache.c:313
-# camel/providers/imap/camel-imap-message-cache.c:344
-# camel/providers/imap/camel-imap-message-cache.c:376
-# camel/providers/imap/camel-imap-message-cache.c:256
-# camel/providers/imap/camel-imap-message-cache.c:313
-# camel/providers/imap/camel-imap-message-cache.c:344
-# camel/providers/imap/camel-imap-message-cache.c:376
-#: 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:502 camel/camel-filter-search.c:509
 # camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
 # camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
-#: 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"
@@ -13986,7 +14174,7 @@ msgstr "执行过滤规则搜索错误： %s： %s"
 # camel/camel-folder-search.c:332
 # camel/camel-folder-search.c:332
 # camel/camel-folder-search.c:332
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -13998,7 +14186,7 @@ msgstr ""
 # camel/camel-folder-search.c:342
 # camel/camel-folder-search.c:342
 # camel/camel-folder-search.c:342
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -14010,14 +14198,14 @@ msgstr ""
 # camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 # camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 # camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
-#: 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) 需要一个布尔结果"
 
 # camel/camel-folder-search.c:638
 # camel/camel-folder-search.c:638
 # camel/camel-folder-search.c:638
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "正在对未知的头进行查询： %s"
@@ -14060,7 +14248,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"
@@ -14068,15 +14256,15 @@ 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"
@@ -14086,20 +14274,20 @@ msgstr ""
 # mail/mail-send-recv.c:533
 # mail/mail-send-recv.c:541
 # mail/mail-send-recv.c:541
-#: 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/providers/pop3/camel-pop3-store.c:563
 # camel/providers/pop3/camel-pop3-store.c:563
 # camel/providers/pop3/camel-pop3-store.c:563
-#: camel/camel-gpg-context.c:777
+#: camel/camel-gpg-context.c:804
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "来自 POP 服务器的意外应答： %s"
@@ -14107,14 +14295,14 @@ msgstr "来自 POP 服务器的意外应答： %s"
 # tools/evolution-addressbook-import.c:80
 # tools/evolution-addressbook-import.c:80
 # tools/evolution-addressbook-import.c:80
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:814
 msgid "No data provided"
 msgstr "未提供数据"
 
 # camel/camel-pgp-context.c:1169
 # camel/camel-pgp-context.c:1169
 # camel/camel-pgp-context.c:1169
-#: camel/camel-gpg-context.c:830
+#: camel/camel-gpg-context.c:857
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "无法加密该邮件： 没有指明收件人"
@@ -14131,10 +14319,10 @@ msgstr "无法加密该邮件： 没有指明收件人"
 # camel/providers/imap/camel-imap-message-cache.c:313
 # camel/providers/imap/camel-imap-message-cache.c:344
 # camel/providers/imap/camel-imap-message-cache.c:376
-#: 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"
@@ -14151,15 +14339,16 @@ msgstr "缓冲邮件 %s 失败： %s"
 # camel/providers/imap/camel-imap-message-cache.c:313
 # camel/providers/imap/camel-imap-message-cache.c:344
 # camel/providers/imap/camel-imap-message-cache.c:376
-#: 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-smime-context.c:810
 # camel/camel-smime-context.c:810
 # camel/camel-smime-context.c:810
-#: camel/camel-gpg-context.c:1197
+#: 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"
@@ -14167,16 +14356,16 @@ msgstr "执行 gpg 失败：%s"
 # camel/camel-smime-context.c:810
 # camel/camel-smime-context.c:810
 # camel/camel-smime-context.c:810
-#: 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 "执行 gpg 失败。"
 
 # camel/camel-pgp-context.c:970
 # camel/camel-pgp-context.c:970
 # camel/camel-pgp-context.c:970
-#: 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"
@@ -14216,8 +14405,7 @@ msgstr "无法锁定“%s”"
 # camel/camel-lock.c:91 camel/camel-lock.c:110
 # camel/camel-lock.c:91 camel/camel-lock.c:110
 # camel/camel-lock.c:91 camel/camel-lock.c:110
-#. 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"
@@ -14225,7 +14413,7 @@ msgstr "无法为 %s 创建锁定文件： %s"
 # camel/camel-lock.c:150
 # camel/camel-lock.c:150
 # camel/camel-lock.c:150
-#: 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 获取锁文件的尝试超时。请稍后再试。"
@@ -14233,7 +14421,7 @@ msgstr "对 %s 获取锁文件的尝试超时。请稍后再试。"
 # camel/camel-lock.c:204
 # camel/camel-lock.c:204
 # camel/camel-lock.c:204
-#: camel/camel-lock.c:206
+#: camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "用 fcntl(2) 获取锁失败： %s"
@@ -14241,7 +14429,7 @@ msgstr "用 fcntl(2) 获取锁失败： %s"
 # camel/camel-lock.c:266
 # camel/camel-lock.c:266
 # camel/camel-lock.c:266
-#: camel/camel-lock.c:268
+#: camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "用 flock(2) 获取锁失败： %s"
@@ -14257,7 +14445,7 @@ msgstr "无法检查邮件文件 %s： %s"
 # camel/camel-movemail.c:121
 # camel/camel-movemail.c:121
 # camel/camel-movemail.c:121
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "无法打开邮件文件 %s： %s"
@@ -14265,7 +14453,7 @@ msgstr "无法打开邮件文件 %s： %s"
 # camel/camel-movemail.c:129
 # camel/camel-movemail.c:129
 # camel/camel-movemail.c:129
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "无法打开临时邮件文件 %s： %s"
@@ -14273,7 +14461,7 @@ msgstr "无法打开临时邮件文件 %s： %s"
 # camel/camel-movemail.c:158
 # camel/camel-movemail.c:158
 # camel/camel-movemail.c:158
-#: 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"
@@ -14281,7 +14469,7 @@ msgstr "将邮件存储到临时文件 %s 失败： %s"
 # camel/camel-movemail.c:188
 # camel/camel-movemail.c:188
 # camel/camel-movemail.c:188
-#: camel/camel-movemail.c:188
+#: camel/camel-movemail.c:187
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "无法创建管道： %s"
@@ -14289,7 +14477,7 @@ msgstr "无法创建管道： %s"
 # camel/camel-movemail.c:200
 # camel/camel-movemail.c:200
 # camel/camel-movemail.c:200
-#: camel/camel-movemail.c:200
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not fork: %s"
 msgstr "无法创建进程：%s"
@@ -14297,7 +14485,7 @@ msgstr "无法创建进程：%s"
 # camel/camel-movemail.c:238
 # camel/camel-movemail.c:238
 # camel/camel-movemail.c:238
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:237
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "移动邮件程序失败： %s"
@@ -14305,14 +14493,14 @@ msgstr "移动邮件程序失败： %s"
 # camel/camel-movemail.c:239
 # camel/camel-movemail.c:239
 # camel/camel-movemail.c:239
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 msgid "(Unknown error)"
 msgstr "(未知的错误)"
 
 # camel/camel-movemail.c:262
 # camel/camel-movemail.c:262
 # camel/camel-movemail.c:262
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "阅读邮件文件错误： %s"
@@ -14320,7 +14508,7 @@ msgstr "阅读邮件文件错误： %s"
 # camel/camel-movemail.c:273
 # camel/camel-movemail.c:273
 # camel/camel-movemail.c:273
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "写入邮件临时文件错误： %s"
@@ -14328,7 +14516,7 @@ msgstr "写入邮件临时文件错误： %s"
 # camel/camel-movemail.c:466 camel/camel-movemail.c:533
 # camel/camel-movemail.c:466 camel/camel-movemail.c:533
 # camel/camel-movemail.c:466 camel/camel-movemail.c:533
-#: 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"
@@ -14349,21 +14537,21 @@ msgstr "解密 MIME 部分失败：解析错误"
 
 # camel/camel-pgp-mime.c:310
 # camel/camel-pgp-mime.c:310
-#: camel/camel-multipart-signed.c:624
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr "这是消息的数字签名部分"
 
 # addressbook/gui/widgets/e-addressbook-util.c:41
 # addressbook/gui/widgets/e-addressbook-util.c:41
 # addressbook/gui/widgets/e-addressbook-util.c:41
-#: camel/camel-multipart-signed.c:678
+#: camel/camel-multipart-signed.c:682
 msgid "parse error"
 msgstr "解析错误"
 
 # camel/camel-provider.c:130
 # camel/camel-provider.c:130
 # camel/camel-provider.c:130
-#: 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： 本系统不支持模块装入。"
@@ -14371,7 +14559,7 @@ msgstr "无法装入 %s： 本系统不支持模块装入。"
 # camel/camel-provider.c:139
 # camel/camel-provider.c:139
 # camel/camel-provider.c:139
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:141
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "无法装入 %s： %s"
@@ -14379,7 +14567,7 @@ msgstr "无法装入 %s： %s"
 # camel/camel-provider.c:147
 # camel/camel-provider.c:147
 # camel/camel-provider.c:147
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:149
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "无法装入 %s： 模块中没有初始化代码。"
@@ -14460,14 +14648,14 @@ msgstr "如果服务器支持的话，该选项将用安全 CRAM-MD5 密码连�
 # camel/camel-sasl-digest-md5.c:43
 # camel/camel-sasl-digest-md5.c:43
 # camel/camel-sasl-digest-md5.c:43
-#: 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:45
 # camel/camel-sasl-digest-md5.c:45
-#: 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."
@@ -14476,63 +14664,163 @@ msgstr "如果服务器支持的话，该选项将用安全 DIGEST-MD5 密码连
 # camel/camel-sasl-digest-md5.c:810
 # camel/camel-sasl-digest-md5.c:810
 # camel/camel-sasl-digest-md5.c:810
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "服务器质询过长 (>2048张八开纸)\n"
 
 # camel/camel-sasl-digest-md5.c:819
 # camel/camel-sasl-digest-md5.c:819
 # camel/camel-sasl-digest-md5.c:819
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr "服务器质询无效\n"
 
 # camel/camel-sasl-digest-md5.c:825
 # camel/camel-sasl-digest-md5.c:825
 # camel/camel-sasl-digest-md5.c:825
-#: 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 "服务器质询含有无效的“品质保护”标志\n"
 
 # camel/camel-sasl-digest-md5.c:847
 # camel/camel-sasl-digest-md5.c:847
 # camel/camel-sasl-digest-md5.c:847
-#: 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:865
 # camel/camel-sasl-digest-md5.c:865
-#: 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:875
 # camel/camel-sasl-digest-md5.c:875
-#: 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-gssapi.c:48
+msgid "GSSAPI"
+msgstr ""
+
+# camel/camel-sasl-kerberos4.c:42
+# camel/camel-sasl-kerberos4.c:42
+# camel/camel-sasl-kerberos4.c:42
+#: 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-kerberos4.c:218
+# camel/providers/imap/camel-imap-store.c:495
+# camel/camel-sasl-kerberos4.c:218
+# camel/providers/imap/camel-imap-store.c:495
+# camel/camel-sasl-kerberos4.c:218
+# camel/providers/imap/camel-imap-store.c:495
+#: 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/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "缓冲邮件 %s 失败： %s"
+
+# shell/evolution-shell-component.c:1021
+# shell/evolution-shell-component.c:1021
+# shell/evolution-shell-component.c:1034
+#: camel/camel-sasl-gssapi.c:299
+#, fuzzy
+msgid "Unsupported security layer."
+msgstr "不支持的类型"
+
 # camel/camel-sasl-kerberos4.c:40
 # camel/camel-sasl-kerberos4.c:40
 # camel/camel-sasl-kerberos4.c:40
-#: 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:42
 # camel/camel-sasl-kerberos4.c:42
-#: 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:161
 # camel/camel-sasl-kerberos4.c:161
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -14541,17 +14829,6 @@ msgstr ""
 "无法获取 Kerberos 标签：\n"
 "%s"
 
-# camel/camel-sasl-kerberos4.c:218
-# camel/providers/imap/camel-imap-store.c:495
-# camel/camel-sasl-kerberos4.c:218
-# camel/providers/imap/camel-imap-store.c:495
-# camel/camel-sasl-kerberos4.c:218
-# camel/providers/imap/camel-imap-store.c:495
-#: 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
 # camel/camel-sasl-login.c:32
 # my-evolution/Locations.h:1241
@@ -14628,7 +14905,7 @@ msgstr "以非 pop 源进行 SMTP 之前的 POP 授权"
 # camel/camel-search-private.c:113
 # camel/camel-search-private.c:113
 # camel/camel-search-private.c:113
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "常规表达式编译失败： %s： %s"
@@ -14660,7 +14937,7 @@ msgstr "URL “%s” 需要路径组件"
 # camel/camel-service.c:611
 # camel/camel-service.c:614
 # camel/camel-service.c:614
-#: camel/camel-service.c:743
+#: camel/camel-service.c:741
 #, c-format
 msgid "Resolving: %s"
 msgstr "正在解析： %s"
@@ -14668,7 +14945,7 @@ msgstr "正在解析： %s"
 # camel/camel-service.c:638
 # camel/camel-service.c:641
 # camel/camel-service.c:641
-#: 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"
@@ -14676,7 +14953,7 @@ msgstr "域名寻找失败： %s"
 # camel/camel-service.c:663
 # camel/camel-service.c:666
 # camel/camel-service.c:666
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "主机寻找失败： %s： 没有找到主机"
@@ -14684,7 +14961,7 @@ msgstr "主机寻找失败： %s： 没有找到主机"
 # camel/camel-service.c:665
 # camel/camel-service.c:668
 # camel/camel-service.c:668
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "主机寻找失败： %s： 未知的原因"
@@ -14692,21 +14969,21 @@ msgstr "主机寻找失败： %s： 未知的原因"
 # camel/camel-service.c:611
 # camel/camel-service.c:614
 # camel/camel-service.c:614
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 msgid "Resolving address"
 msgstr "正在解析地址"
 
 # camel/camel-service.c:663
 # camel/camel-service.c:666
 # camel/camel-service.c:666
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 msgid "Host lookup failed: host not found"
 msgstr "主机寻找失败：没有找到主机"
 
 # camel/camel-service.c:665
 # camel/camel-service.c:668
 # camel/camel-service.c:668
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 msgid "Host lookup failed: unknown reason"
 msgstr "主机寻找失败：未知的原因"
 
@@ -14727,7 +15004,7 @@ msgstr "关于将读入邮件作为对另一组文件夹的查询"
 # camel/camel-session.c:346 camel/camel-session.c:415
 # camel/camel-session.c:346 camel/camel-session.c:415
 # camel/camel-session.c:346 camel/camel-session.c:415
-#: 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”没有可用的提供者"
@@ -14735,7 +15012,7 @@ msgstr "协议“%s”没有可用的提供者"
 # camel/camel-session.c:532
 # camel/camel-session.c:532
 # camel/camel-session.c:532
-#: camel/camel-session.c:545
+#: camel/camel-session.c:548
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -14747,7 +15024,7 @@ msgstr ""
 # camel/camel-smime-context.c:173
 # camel/camel-smime-context.c:173
 # camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#: camel/camel-smime-context.c:173
+#: camel/camel-smime-context.c:171
 #, c-format
 msgid "Please enter your password for %s"
 msgstr "情您为 %s 输入密码"
@@ -14755,14 +15032,14 @@ msgstr "情您为 %s 输入密码"
 # camel/camel-smime-context.c:203
 # camel/camel-smime-context.c:203
 # camel/camel-smime-context.c:203
-#: 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:209
 # camel/camel-smime-context.c:209
-#: 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”提供的签名证书不存在。"
@@ -14770,7 +15047,7 @@ msgstr "为“%s”提供的签名证书不存在。"
 # camel/camel-smime-context.c:249
 # camel/camel-smime-context.c:249
 # camel/camel-smime-context.c:249
-#: 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”提供的加密证书不存在。"
@@ -14781,8 +15058,8 @@ msgstr "为“%s”提供的加密证书不存在。"
 # camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
 # 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: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”寻找证书失败。"
@@ -14790,190 +15067,190 @@ msgstr "为“%s”寻找证书失败。"
 # camel/camel-smime-context.c:556
 # camel/camel-smime-context.c:556
 # camel/camel-smime-context.c:556
-#: 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:810
 # camel/camel-smime-context.c:810
-#: 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:855
 # camel/camel-smime-context.c:855
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
 msgid "Failed to verify certificates."
 msgstr "验证证书失败。"
 
 # camel/camel-store.c:220
 # camel/camel-store.c:220
 # camel/camel-store.c:220
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "无法获取文件夹： 对该存储的无效操作"
 
 # camel/camel-store.c:282
 # camel/camel-store.c:282
 # camel/camel-store.c:282
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "无法创建文件夹： 对该存储的无效操作"
 
 # camel/camel-smime-context.c:855
 # camel/camel-smime-context.c:855
 # camel/camel-smime-context.c:855
-#: 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-smime-context.c:855
 # camel/camel-smime-context.c:855
 # camel/camel-smime-context.c:855
-#: 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 "无法对发行者的公钥进行解码"
 
 # mail/mail-account-gui.c:962
 # mail/mail-account-gui.c:962
 # mail/mail-account-gui.c:959
-#: 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 "证书尚且无效"
 
 # mail/mail-config.glade.h:95
 # mail/mail-config.glade.h:95
 # mail/mail-config.glade.h:104
-#: 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 已过期"
 
 # shell/e-shell-importer.c:474
 # shell/e-shell-importer.c:474
 # shell/e-shell-importer.c:485
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 msgid "Error in CRL"
 msgstr "CRL 错误"
 
 # calendar/gui/e-meeting-time-sel.c:430
 # calendar/gui/e-meeting-time-sel.c:433
 # calendar/gui/e-meeting-time-sel.c:433
-#: 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-smime-context.c:855
 # camel/camel-smime-context.c:855
 # camel/camel-smime-context.c:855
-#: 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 "证书链过长"
 
 # mail/mail-config.glade.h:95
 # mail/mail-config.glade.h:95
 # mail/mail-config.glade.h:104
-#: 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 "超长的路径长度"
 
 # shell/evolution-shell-component.c:1013
 # shell/evolution-shell-component.c:1013
 # shell/evolution-shell-component.c:1026
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
 msgid "Invalid purpose"
 msgstr "无效目的"
 
 # mail/mail-config.glade.h:95
 # mail/mail-config.glade.h:95
 # mail/mail-config.glade.h:104
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr "不信任的证书"
 
 # mail/mail-config.glade.h:95
 # mail/mail-config.glade.h:95
 # mail/mail-config.glade.h:104
-#: 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-ssl.c:438
-#: 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"
@@ -14987,19 +15264,19 @@ msgstr ""
 "签名：           %s"
 
 # camel/camel-tcp-stream-ssl.c:444
-#: 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-ssl.c:444
-#: 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:524 camel/camel-tcp-stream-ssl.c:438
 # camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
 # camel/camel-tcp-stream-openssl.c:524
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -15022,7 +15299,7 @@ msgstr ""
 # camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
 # camel/camel-tcp-stream-ssl.c:447
 #. 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"
@@ -15037,14 +15314,14 @@ 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"
@@ -15054,7 +15331,7 @@ msgstr ""
 # mail/mail-config.glade.h:95
 # mail/mail-config.glade.h:95
 # mail/mail-config.glade.h:104
-#: camel/camel-tcp-stream-ssl.c:804
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -15066,7 +15343,7 @@ msgstr ""
 # mail/mail-config.glade.h:95
 # mail/mail-config.glade.h:95
 # mail/mail-config.glade.h:104
-#: camel/camel-tcp-stream-ssl.c:821
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -15078,7 +15355,7 @@ msgstr ""
 # camel/camel-url.c:288
 # camel/camel-url.c:288
 # camel/camel-url.c:288
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "无法解析 URL “%s”"
@@ -15102,14 +15379,14 @@ msgstr "在 %2$s 中没有消息 %1$s"
 # camel/providers/imap/camel-imap-provider.c:45
 # camel/providers/imap/camel-imap-provider.c:45
 # camel/providers/imap/camel-imap-provider.c:45
-#: 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:258
 # camel/camel-vee-store.c:258
 # camel/camel-vee-store.c:258
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "无法删除文件夹： %s： 无效操作"
@@ -15117,7 +15394,7 @@ msgstr "无法删除文件夹： %s： 无效操作"
 # camel/camel-vee-store.c:293
 # camel/camel-vee-store.c:293
 # camel/camel-vee-store.c:293
-#: camel/camel-vee-store.c:319
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "无法删除文件夹： %s： 没有该文件夹"
@@ -15125,7 +15402,7 @@ msgstr "无法删除文件夹： %s： 没有该文件夹"
 # camel/camel-vee-store.c:306
 # camel/camel-vee-store.c:306
 # camel/camel-vee-store.c:306
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "无法重命名文件夹： %s： 无效操作"
@@ -15133,7 +15410,7 @@ msgstr "无法重命名文件夹： %s： 无效操作"
 # camel/camel-vee-store.c:314
 # camel/camel-vee-store.c:314
 # camel/camel-vee-store.c:314
-#: camel/camel-vee-store.c:340
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "无法重命名文件夹： %s： 没有该文件夹"
@@ -15152,8 +15429,8 @@ msgstr "无法重命名文件夹： %s： 没有该文件夹"
 # camel/providers/imap/camel-imap-command.c:409
 #: 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 "操作已取消"
 
@@ -15164,7 +15441,7 @@ msgstr "操作已取消"
 # camel/camel-remote-store.c:484
 # camel/providers/imap/camel-imap-command.c:274
 #: 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"
@@ -15201,14 +15478,14 @@ msgstr "IMAP 命令失败： %s"
 # camel/providers/imap/camel-imap-command.c:417
 # camel/providers/imap/camel-imap-command.c:417
 # camel/providers/imap/camel-imap-command.c:417
-#: 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:608
 # camel/providers/imap/camel-imap-command.c:608
 # camel/providers/imap/camel-imap-command.c:610
-#: 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 信息"
@@ -15216,7 +15493,7 @@ msgstr "IMAP 服务器应答不含有 %s 信息"
 # camel/providers/imap/camel-imap-command.c:644
 # camel/providers/imap/camel-imap-command.c:644
 # camel/providers/imap/camel-imap-command.c:646
-#: 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 服务器意外的 OK 应答： %s"
@@ -15224,7 +15501,7 @@ msgstr "来自 IMAP 服务器意外的 OK 应答： %s"
 # camel/providers/imap/camel-imap-folder.c:194
 # camel/providers/imap/camel-imap-folder.c:194
 # camel/providers/imap/camel-imap-folder.c:197
-#: 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"
@@ -15232,7 +15509,7 @@ msgstr "无法创建目录 %s： %s"
 # camel/providers/imap/camel-imap-folder.c:213
 # camel/providers/imap/camel-imap-folder.c:213
 # camel/providers/imap/camel-imap-folder.c:216
-#: 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 装入概要"
@@ -15240,7 +15517,7 @@ msgstr "无法为 %s 装入概要"
 # camel/providers/imap/camel-imap-folder.c:277
 # camel/providers/imap/camel-imap-folder.c:277
 # camel/providers/imap/camel-imap-folder.c:282
-#: 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 "文件夹已被删除并在服务器上重建了。"
 
@@ -15248,14 +15525,14 @@ msgstr "文件夹已被删除并在服务器上重建了。"
 # camel/providers/imap/camel-imap-folder.c:461
 # camel/providers/imap/camel-imap-folder.c:466
 #. 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/camel-smime-context.c:810
 # camel/camel-smime-context.c:810
 # camel/camel-filter-search.c:126
-#: 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 "无法检索邮件：%s"
@@ -15284,14 +15561,14 @@ msgstr "无法检索邮件：%s"
 # camel/providers/local/camel-mh-folder.c:207
 # camel/providers/local/camel-mh-folder.c:215
 # camel/providers/local/camel-spool-folder.c:579
-#: 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"
@@ -15312,9 +15589,9 @@ msgstr ""
 # camel/providers/local/camel-mbox-folder.c:331
 # camel/providers/local/camel-mh-folder.c:198
 # camel/providers/local/camel-spool-folder.c:579
-#: 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 "没有该邮件"
@@ -15325,8 +15602,8 @@ msgstr "没有该邮件"
 # camel/providers/imap/camel-imap-folder.c:2001
 # camel/providers/imap/camel-imap-folder.c:1632
 # camel/providers/imap/camel-imap-folder.c:2108
-#: 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 "该邮件目前不可用"
 
@@ -15336,15 +15613,15 @@ msgstr "该邮件目前不可用"
 # camel/providers/imap/camel-imap-folder.c:1821
 # camel/providers/imap/camel-imap-folder.c:1787
 # camel/providers/imap/camel-imap-folder.c:1861
-#: 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:2038
 # camel/providers/imap/camel-imap-folder.c:2038
 # camel/providers/imap/camel-imap-folder.c:2145
-#: 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 应答中找到邮件体。"
 
@@ -15410,7 +15687,7 @@ msgstr "在所有文件夹中检查新邮件"
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:832
-#: 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 "文件夹"
 
@@ -15467,7 +15744,7 @@ msgstr "IMAP 服务器上的邮件的读写。"
 # camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:60
 #: 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 "密码"
 
@@ -15497,10 +15774,10 @@ msgstr "%s 为 %s 服务，在 %s"
 # camel/camel-remote-store.c:264
 # camel/camel-remote-store.c:264
 # camel/camel-remote-store.c:264
-#: 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 "连接已取消"
 
@@ -15510,9 +15787,9 @@ msgstr "连接已取消"
 # camel/providers/smtp/camel-smtp-transport.c:273
 # camel/camel-remote-store.c:267
 # camel/providers/smtp/camel-smtp-transport.c:276
-#: 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"
@@ -15520,8 +15797,8 @@ msgstr "无法连接到 %s (端口 %d)： %s"
 # camel/providers/pop3/camel-pop3-store.c:377
 # camel/providers/pop3/camel-pop3-store.c:377
 # camel/providers/pop3/camel-pop3-store.c:377
-#: 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 "以安全模式连接到 IMAP 服务器 %s 失败：%s"
@@ -15529,23 +15806,23 @@ msgstr "以安全模式连接到 IMAP 服务器 %s 失败：%s"
 # shell/e-storage.c:518
 # shell/e-storage.c:518
 # shell/e-storage.c:518
-#: 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/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 # camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 # camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
-#: 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:518
 # camel/providers/imap/camel-imap-store.c:518
 # camel/providers/imap/camel-imap-store.c:518
-#: 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"
@@ -15556,8 +15833,8 @@ msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
 # camel/providers/smtp/camel-smtp-transport.c:389
 # camel/providers/imap/camel-imap-store.c:528
 # camel/providers/smtp/camel-smtp-transport.c:393
-#: 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"
@@ -15565,7 +15842,7 @@ msgstr "不支持验证类型 %s"
 # camel/providers/imap/camel-imap-store.c:552
 # camel/providers/imap/camel-imap-store.c:552
 # camel/providers/imap/camel-imap-store.c:552
-#: 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请为 %s@%s 输入 IMAP 密码"
@@ -15576,15 +15853,14 @@ msgstr "%s请为 %s@%s 输入 IMAP 密码"
 # camel/providers/smtp/camel-smtp-transport.c:430
 # camel/providers/imap/camel-imap-store.c:567
 # camel/providers/smtp/camel-smtp-transport.c:434
-#: 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:596
 # camel/providers/imap/camel-imap-store.c:596
 # camel/providers/imap/camel-imap-store.c:596
-#: 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"
@@ -15598,8 +15874,8 @@ msgstr ""
 # camel/providers/imap/camel-imap-store.c:899
 # camel/providers/imap/camel-imap-store.c:899
 # camel/providers/imap/camel-imap-store.c:900
-#: 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"
@@ -15607,7 +15883,7 @@ msgstr "没有文件夹 %s"
 # shell/e-shell-utils.c:121
 # shell/e-shell-utils.c:121
 # shell/e-shell-utils.c:121
-#: 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\""
@@ -15622,7 +15898,7 @@ msgstr "文件夹名不能含有回车符。"
 # camel/providers/local/camel-mbox-summary.c:873
 # camel/providers/local/camel-spool-summary.c:544
 # camel/providers/local/camel-spool-summary.c:1110
-#: camel/providers/imap/camel-imap-store.c:1817
+#: camel/providers/imap/camel-imap-store.c:1851
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "未知的父文件夹：%s"
@@ -15630,7 +15906,7 @@ msgstr "未知的父文件夹：%s"
 # camel/providers/imap/camel-imap-store.c:1274
 # camel/providers/imap/camel-imap-store.c:1274
 # camel/providers/imap/camel-imap-store.c:1275
-#: 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 "父文件夹不允许含有子文件夹"
 
@@ -15754,8 +16030,8 @@ msgstr "在标准邮件箱文件中读取和存储本地邮件。"
 # camel/providers/local/camel-local-store.c:227
 # camel/providers/local/camel-spool-store.c:109
 #: 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 不是绝对路径"
@@ -15779,7 +16055,7 @@ msgstr "存储根目录 %s 不是普通目录"
 # camel/providers/local/camel-local-store.c:235
 #: 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"
@@ -15787,14 +16063,14 @@ msgstr "无法获取文件夹： %s： %s"
 # camel/providers/local/camel-local-store.c:184
 # camel/providers/local/camel-local-store.c:184
 # camel/providers/local/camel-local-store.c:184
-#: 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:196
 # camel/providers/local/camel-local-store.c:196
 # camel/providers/local/camel-local-store.c:196
-#: 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"
@@ -15802,7 +16078,7 @@ msgstr "本地邮件文件 %s"
 # camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 # camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 # camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
-#: 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"
@@ -15810,7 +16086,7 @@ msgstr "无法将文件夹 %s 改名为 %s： %s"
 # camel/providers/local/camel-mbox-summary.c:650
 # camel/providers/local/camel-mbox-summary.c:650
 # camel/providers/local/camel-mbox-summary.c:650
-#: camel/providers/local/camel-local-store.c:363
+#: camel/providers/local/camel-local-store.c:365
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "无法重命名“%s”：%s"
@@ -15818,7 +16094,7 @@ msgstr "无法重命名“%s”：%s"
 # camel/providers/local/camel-local-store.c:374
 # camel/providers/local/camel-local-store.c:374
 # camel/providers/local/camel-local-store.c:374
-#: 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"
@@ -15826,7 +16102,7 @@ msgstr "无法删除文件夹概要文件 “%s”： %s"
 # camel/providers/local/camel-local-store.c:384
 # camel/providers/local/camel-local-store.c:384
 # camel/providers/local/camel-local-store.c:384
-#: 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"
@@ -15845,7 +16121,7 @@ msgstr "无法保存概要： %s： %s"
 # camel/providers/local/camel-spool-summary.c:1157
 # camel/providers/local/camel-local-summary.c:423
 # camel/providers/local/camel-spool-summary.c:1157
-#: 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 "无法将邮件添加到概要中： 未知的原因"
 
@@ -15870,8 +16146,8 @@ msgstr "无法将邮件附加到邮件目录文件夹： %s： %s"
 # camel/providers/local/camel-mh-folder.c:216
 # camel/providers/local/camel-maildir-folder.c:231
 # camel/providers/local/camel-mh-folder.c:216
-#: 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 "无效的邮件内容"
 
@@ -15883,7 +16159,7 @@ msgstr "无效的邮件内容"
 # camel/providers/local/camel-mh-store.c:89
 #: 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"
@@ -15904,7 +16180,7 @@ 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”不存在。"
@@ -15917,7 +16193,7 @@ msgstr "文件夹“%s”不存在。"
 # camel/providers/local/camel-mh-store.c:102
 #: 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"
@@ -15944,7 +16220,7 @@ msgstr "“%s”不是邮件目录。"
 # camel/providers/local/camel-maildir-store.c:203
 # camel/providers/local/camel-mh-store.c:126
 #: 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"
@@ -15953,7 +16229,7 @@ msgstr "无法删除文件夹“%s”： %s"
 # camel/providers/local/camel-maildir-store.c:167
 # camel/providers/local/camel-maildir-store.c:167
 # camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:169
 msgid "not a maildir directory"
 msgstr "不是邮件目录"
 
@@ -15961,8 +16237,8 @@ msgstr "不是邮件目录"
 # camel/providers/local/camel-maildir-store.c:331
 # camel/providers/local/camel-maildir-store.c:331
 #: 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”： %s"
@@ -15973,8 +16249,8 @@ msgstr "无法扫描文件夹“%s”： %s"
 # camel/providers/local/camel-maildir-summary.c:526
 # camel/providers/local/camel-maildir-summary.c:405
 # camel/providers/local/camel-maildir-summary.c:526
-#: 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 "无法打开邮件目录路径： %s： %s"
@@ -15982,14 +16258,14 @@ msgstr "无法打开邮件目录路径： %s： %s"
 # camel/providers/imap/camel-imap-provider.c:43
 # camel/providers/imap/camel-imap-provider.c:43
 # camel/providers/imap/camel-imap-provider.c:43
-#: camel/providers/local/camel-maildir-summary.c:539
+#: camel/providers/local/camel-maildir-summary.c:541
 msgid "Checking folder consistency"
 msgstr "正在检查文件夹一致性"
 
 # camel/providers/imap/camel-imap-folder.c:1746
 # camel/providers/imap/camel-imap-folder.c:1746
 # camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/local/camel-maildir-summary.c:640
+#: camel/providers/local/camel-maildir-summary.c:644
 msgid "Checking for new messages"
 msgstr "正在检查新邮件"
 
@@ -16011,11 +16287,11 @@ msgstr "正在检查新邮件"
 # camel/providers/local/camel-spool-summary.c:378
 # camel/providers/local/camel-spool-summary.c:643
 # camel/providers/local/camel-spool-summary.c:935
-#: 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 "正在存储文件夹"
 
@@ -16025,8 +16301,8 @@ msgstr "正在存储文件夹"
 # camel/providers/local/camel-spool-folder.c:274
 # camel/providers/local/camel-mbox-folder.c:151
 # camel/providers/local/camel-spool-folder.c:274
-#: 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"
@@ -16037,7 +16313,7 @@ msgstr "无法在 %s 创建文件夹锁： %s"
 # camel/providers/local/camel-spool-folder.c:456
 # camel/providers/local/camel-mbox-folder.c:208
 # camel/providers/local/camel-spool-folder.c:456
-#: 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 "无法打开邮件箱： %s： %s\n"
@@ -16045,14 +16321,14 @@ msgstr "无法打开邮件箱： %s： %s\n"
 # camel/providers/local/camel-mbox-folder.c:265
 # camel/providers/local/camel-mbox-folder.c:265
 # camel/providers/local/camel-mbox-folder.c:265
-#: 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:268
 # camel/providers/local/camel-mbox-folder.c:268
 # camel/providers/local/camel-mbox-folder.c:268
-#: 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 "无法将邮件附加到邮件箱文件： %s： %s"
@@ -16075,9 +16351,9 @@ msgstr "无法将邮件附加到邮件箱文件： %s： %s"
 # camel/providers/local/camel-spool-folder.c:595
 # camel/providers/local/camel-spool-folder.c:627
 # camel/providers/local/camel-spool-folder.c:639
-#: 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"
@@ -16092,7 +16368,7 @@ msgstr ""
 # camel/providers/local/camel-spool-folder.c:628
 # camel/providers/local/camel-mbox-folder.c:380
 # camel/providers/local/camel-spool-folder.c:628
-#: 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 "文件夹好像已经被不可恢复地破坏了。"
 
@@ -16102,7 +16378,7 @@ msgstr "文件夹好像已经被不可恢复地破坏了。"
 # camel/providers/local/camel-spool-folder.c:640
 # camel/providers/local/camel-mbox-folder.c:392
 # camel/providers/local/camel-spool-folder.c:640
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "邮件构造失败：邮件箱已损坏？"
 
@@ -16172,7 +16448,7 @@ msgstr "文件夹“%s”非空。没有删除。"
 # camel/providers/local/camel-spool-summary.c:383
 # camel/providers/local/camel-mbox-summary.c:253
 # camel/providers/local/camel-spool-summary.c:383
-#: 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"
@@ -16183,7 +16459,7 @@ msgstr "无法打开文件夹： %s： %s"
 # camel/providers/local/camel-spool-summary.c:425
 # camel/providers/local/camel-mbox-summary.c:295
 # camel/providers/local/camel-spool-summary.c:425
-#: 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 "在文件夹 %2$s 中邻近 %1$ld 的位置出现致命的解析错误"
@@ -16194,7 +16470,7 @@ msgstr "在文件夹 %2$s 中邻近 %1$ld 的位置出现致命的解析错误"
 # camel/providers/local/camel-spool-summary.c:497
 # camel/providers/local/camel-mbox-summary.c:370
 # camel/providers/local/camel-spool-summary.c:497
-#: 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"
@@ -16208,9 +16484,9 @@ msgstr "无法检查文件夹： %s： %s"
 # camel/providers/local/camel-mbox-summary.c:502
 # camel/providers/local/camel-mbox-summary.c:703
 # camel/providers/local/camel-spool-summary.c:648
-#: 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"
@@ -16221,8 +16497,8 @@ msgstr "无法打开文件： %s： %s"
 # camel/providers/local/camel-spool-summary.c:672
 # camel/providers/local/camel-mbox-summary.c:519
 # camel/providers/local/camel-spool-summary.c:672
-#: 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 "无法打开临时邮件箱： %s"
@@ -16236,8 +16512,8 @@ msgstr "无法打开临时邮件箱： %s"
 # camel/providers/local/camel-mbox-summary.c:630
 # camel/providers/local/camel-mbox-summary.c:799
 # camel/providers/local/camel-spool-summary.c:1036
-#: 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"
@@ -16245,7 +16521,7 @@ msgstr "无法关闭来源文件夹 %s： %s"
 # camel/providers/local/camel-mbox-summary.c:639
 # camel/providers/local/camel-mbox-summary.c:639
 # camel/providers/local/camel-mbox-summary.c:639
-#: 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"
@@ -16253,7 +16529,7 @@ msgstr "无法关闭临时文件夹： %s"
 # camel/providers/local/camel-mbox-summary.c:650
 # camel/providers/local/camel-mbox-summary.c:650
 # camel/providers/local/camel-mbox-summary.c:650
-#: 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"
@@ -16282,10 +16558,10 @@ msgstr "无法重命名文件夹： %s"
 # camel/providers/local/camel-spool-summary.c:705
 # camel/providers/local/camel-spool-summary.c:978
 # camel/providers/local/camel-spool-summary.c:986
-#: 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 "即使同步后，概要和文件夹仍然不匹配"
 
@@ -16298,8 +16574,8 @@ msgstr "即使同步后，概要和文件夹仍然不匹配"
 # camel/providers/local/camel-mbox-summary.c:873
 # camel/providers/local/camel-spool-summary.c:544
 # camel/providers/local/camel-spool-summary.c:1110
-#: 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"
@@ -16307,7 +16583,7 @@ msgstr "未知的错误： %s"
 # camel/providers/local/camel-mbox-summary.c:650
 # camel/providers/local/camel-mbox-summary.c:650
 # camel/providers/local/camel-mbox-summary.c:650
-#: camel/providers/local/camel-mbox-summary.c:883
+#: camel/providers/local/camel-mbox-summary.c:812
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "无法存储文件夹：%s"
@@ -16318,8 +16594,8 @@ msgstr "无法存储文件夹：%s"
 # camel/providers/local/camel-spool-summary.c:749
 # camel/providers/local/camel-mbox-summary.c:595
 # camel/providers/local/camel-spool-summary.c:749
-#: 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 "写入临时文件夹错误： %s"
@@ -16330,7 +16606,7 @@ msgstr "写入临时文件夹错误： %s"
 # camel/providers/local/camel-spool-summary.c:771
 # camel/providers/local/camel-mbox-summary.c:612
 # camel/providers/local/camel-spool-summary.c:771
-#: 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 "写入临时文件夹失败： %s： %s"
@@ -16361,7 +16637,7 @@ msgstr "“%s”不是目录"
 # camel/providers/local/camel-mh-summary.c:218
 # camel/providers/local/camel-mh-summary.c:218
 # camel/providers/local/camel-mh-summary.c:218
-#: 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"
@@ -16369,7 +16645,7 @@ msgstr "无法打开 MH 目录： %s： %s"
 # camel/providers/local/camel-spool-store.c:209
 # camel/providers/local/camel-spool-store.c:209
 # camel/providers/local/camel-spool-store.c:209
-#: 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 "无法打开脱机文件“%s”：%s"
@@ -16377,7 +16653,7 @@ msgstr "无法打开脱机文件“%s”：%s"
 # camel/providers/local/camel-local-store.c:145
 # camel/providers/local/camel-local-store.c:145
 # camel/providers/local/camel-local-store.c:145
-#: 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 "脱机文件“%s”不是普通文件或目录"
@@ -16385,7 +16661,7 @@ msgstr "脱机文件“%s”不是普通文件或目录"
 # camel/providers/local/camel-spool-store.c:141
 # camel/providers/local/camel-spool-store.c:141
 # camel/providers/local/camel-spool-store.c:141
-#: 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”不存在。"
@@ -16396,19 +16672,19 @@ msgstr "文件夹“%s/%s”不存在。"
 # camel/providers/local/camel-mbox-store.c:145
 # camel/providers/local/camel-mbox-store.c:118
 # camel/providers/local/camel-mbox-store.c:145
-#: 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 "“%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:163
 # camel/providers/local/camel-spool-store.c:163
 # camel/providers/local/camel-spool-store.c:163
-#: 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"
@@ -16416,7 +16692,7 @@ msgstr "脱机邮件文件 %s"
 # camel/providers/local/camel-spool-store.c:209
 # camel/providers/local/camel-spool-store.c:209
 # camel/providers/local/camel-spool-store.c:209
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "脱机文件夹树 %s"
@@ -16424,14 +16700,14 @@ msgstr "脱机文件夹树 %s"
 # camel/providers/local/camel-spool-store.c:209
 # camel/providers/local/camel-spool-store.c:209
 # camel/providers/local/camel-spool-store.c:209
-#: 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:217
 # camel/providers/local/camel-spool-store.c:217
 # camel/providers/local/camel-spool-store.c:217
-#: camel/providers/local/camel-spool-store.c:221
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr "脱机文件夹无法删除"
 
@@ -16444,9 +16720,9 @@ msgstr "脱机文件夹无法删除"
 # camel/providers/local/camel-spool-summary.c:788
 # camel/providers/local/camel-spool-summary.c:797
 # camel/providers/local/camel-spool-summary.c:806
-#: 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"
@@ -16454,7 +16730,7 @@ msgstr "无法同步临时文件夹 %s： %s"
 # camel/providers/local/camel-spool-summary.c:821
 # camel/providers/local/camel-spool-summary.c:821
 # camel/providers/local/camel-spool-summary.c:821
-#: 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： %s"
@@ -16468,8 +16744,8 @@ msgstr "无法同步脱机文件夹 %s： %s"
 # camel/providers/local/camel-spool-summary.c:851
 # camel/providers/local/camel-spool-summary.c:869
 # camel/providers/local/camel-spool-summary.c:881
-#: 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 ""
@@ -16607,9 +16883,9 @@ msgstr "检索 POP 概要"
 # camel/providers/imap/camel-imap-command.c:409
 # camel/providers/nntp/camel-nntp-folder.c:157
 #: 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 "用户已取消"
 
@@ -16631,7 +16907,7 @@ msgstr "用户已取消"
 # camel/providers/local/camel-spool-folder.c:579
 # camel/providers/nntp/camel-nntp-folder.c:153
 # camel/providers/nntp/camel-nntp-folder.c:159
-#: 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 "无法获取消息 POP 摘要：%s"
@@ -16639,14 +16915,14 @@ msgstr "无法获取消息 POP 摘要：%s"
 # camel/providers/pop3/camel-pop3-folder.c:252
 # camel/providers/pop3/camel-pop3-folder.c:252
 # camel/providers/pop3/camel-pop3-folder.c:252
-#: 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:367
 # camel/providers/pop3/camel-pop3-folder.c:367
 # camel/providers/pop3/camel-pop3-folder.c:367
-#: 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 的邮件"
@@ -16656,7 +16932,7 @@ msgstr "没有 uid 为 %s 的邮件"
 # camel/providers/pop3/camel-pop3-folder.c:371
 #. 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"
@@ -16679,10 +16955,10 @@ msgstr "检索 POP 邮件 %d"
 # camel/providers/local/camel-spool-folder.c:579
 # camel/providers/nntp/camel-nntp-folder.c:153
 # camel/providers/nntp/camel-nntp-folder.c:159
-#: 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 "无法获取消息 %s：%s"
@@ -16690,7 +16966,7 @@ msgstr "无法获取消息 %s：%s"
 # my-evolution/metar.c:247
 # my-evolution/metar.c:247
 # my-evolution/metar.c:247
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
 msgid "Unknown reason"
 msgstr "未知原因"
 
@@ -16719,7 +16995,7 @@ msgstr "%s 天之后删除"
 # camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 # camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 # camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:59
-#: 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"
 
@@ -16759,7 +17035,7 @@ msgstr ""
 # camel/providers/smtp/camel-smtp-transport.c:273
 # camel/camel-remote-store.c:267
 # camel/providers/smtp/camel-smtp-transport.c:276
-#: 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"
@@ -16767,9 +17043,9 @@ msgstr "无法连接到 POP 服务器 %s (端口 %d)：%s"
 # camel/providers/pop3/camel-pop3-store.c:377
 # camel/providers/pop3/camel-pop3-store.c:377
 # camel/providers/pop3/camel-pop3-store.c:377
-#: 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"
@@ -16777,7 +17053,7 @@ msgstr "以安全模式连接到 POP 服务器 %s 失败：%s"
 # camel/providers/pop3/camel-pop3-store.c:321
 # camel/providers/pop3/camel-pop3-store.c:321
 # camel/providers/pop3/camel-pop3-store.c:321
-#: 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"
@@ -16785,8 +17061,8 @@ msgstr "无法连接到 POP 服务器 %s"
 # camel/providers/pop3/camel-pop3-store.c:407
 # camel/providers/pop3/camel-pop3-store.c:407
 # camel/providers/pop3/camel-pop3-store.c:407
-#: 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 "
@@ -16796,12 +17072,12 @@ msgstr "无法连接到 POP 服务器 %s：不支持请求认证机制。"
 # camel/providers/imap/camel-imap-command.c:362
 # camel/providers/imap/camel-imap-command.c:362
 # camel/providers/imap/camel-imap-command.c:362
-#: 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 协议错误"
@@ -16809,7 +17085,7 @@ msgstr "无法登录到 POP 服务器 %s：SASL 协议错误"
 # camel/providers/pop3/camel-pop3-store.c:198
 # camel/providers/pop3/camel-pop3-store.c:198
 # camel/providers/pop3/camel-pop3-store.c:198
-#: 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"
@@ -16817,7 +17093,7 @@ msgstr "认证到 POP 服务器 %s 失败： %s"
 # camel/providers/pop3/camel-pop3-store.c:360
 # camel/providers/pop3/camel-pop3-store.c:360
 # camel/providers/pop3/camel-pop3-store.c:360
-#: 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请为 %s@%s 输入 POP 密码"
@@ -16825,8 +17101,8 @@ msgstr "%s请为 %s@%s 输入 POP 密码"
 # camel/providers/pop3/camel-pop3-store.c:415
 # camel/providers/pop3/camel-pop3-store.c:415
 # camel/providers/pop3/camel-pop3-store.c:415
-#: 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
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -16838,7 +17114,7 @@ msgstr ""
 # camel/providers/pop3/camel-pop3-store.c:480
 # camel/providers/pop3/camel-pop3-store.c:480
 # camel/providers/pop3/camel-pop3-store.c:480
-#: 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”。"
@@ -16850,7 +17126,7 @@ msgstr "没有文件夹“%s”。"
 # camel/providers/sendmail/camel-sendmail-provider.c:36
 # mail/mail-config.glade.h:81
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -16866,14 +17142,14 @@ msgstr "将邮件传递到本地系统的“sendmail”来发送邮件。"
 # camel/camel-url.c:288
 # camel/camel-url.c:288
 # camel/providers/sendmail/camel-sendmail-transport.c:226
-#: 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:106
 # camel/providers/sendmail/camel-sendmail-transport.c:106
 # camel/providers/sendmail/camel-sendmail-transport.c:107
-#: 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： 邮件未发送"
@@ -16881,7 +17157,7 @@ msgstr "无法创建到 sendmail 的管道： %s： 邮件未发送"
 # camel/providers/sendmail/camel-sendmail-transport.c:123
 # camel/providers/sendmail/camel-sendmail-transport.c:123
 # camel/providers/sendmail/camel-sendmail-transport.c:124
-#: 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： 邮件未发送"
@@ -16889,7 +17165,7 @@ msgstr "无法创建 sendmail 进程： %s： 邮件未发送"
 # camel/providers/sendmail/camel-sendmail-transport.c:149
 # camel/providers/sendmail/camel-sendmail-transport.c:149
 # camel/providers/sendmail/camel-sendmail-transport.c:150
-#: 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"
@@ -16897,7 +17173,7 @@ msgstr "无法发送邮件： %s"
 # camel/providers/sendmail/camel-sendmail-transport.c:162
 # camel/providers/sendmail/camel-sendmail-transport.c:162
 # camel/providers/sendmail/camel-sendmail-transport.c:163
-#: 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 退出： 邮件未发送。"
@@ -16905,7 +17181,7 @@ msgstr "sendmail 以信号 %s 退出： 邮件未发送。"
 # camel/providers/sendmail/camel-sendmail-transport.c:169
 # camel/providers/sendmail/camel-sendmail-transport.c:169
 # camel/providers/sendmail/camel-sendmail-transport.c:170
-#: 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： 邮件未发送。"
@@ -16913,7 +17189,7 @@ msgstr "无法执行 %s： 邮件未发送。"
 # camel/providers/sendmail/camel-sendmail-transport.c:174
 # camel/providers/sendmail/camel-sendmail-transport.c:174
 # camel/providers/sendmail/camel-sendmail-transport.c:175
-#: 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 退出： 邮件未发送。"
@@ -16921,21 +17197,21 @@ msgstr "sendmail 以状态码 %d 退出： 邮件未发送。"
 # camel/providers/sendmail/camel-sendmail-transport.c:246
 # camel/providers/sendmail/camel-sendmail-transport.c:246
 # camel/providers/sendmail/camel-sendmail-transport.c:259
-#: 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:248
 # camel/providers/sendmail/camel-sendmail-transport.c:248
 # camel/providers/sendmail/camel-sendmail-transport.c:261
-#: 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:65
 # camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 # camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:74
-#: 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"
 
@@ -16949,190 +17225,190 @@ msgstr "通过SMTP连接到远程邮件服务器来发送邮件。\n"
 # camel/providers/smtp/camel-smtp-transport.c:172
 # camel/providers/smtp/camel-smtp-transport.c:172
 # camel/providers/smtp/camel-smtp-transport.c:173
-#: 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:174
 # camel/providers/smtp/camel-smtp-transport.c:174
 # camel/providers/smtp/camel-smtp-transport.c:175
-#: 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:176
 # camel/providers/smtp/camel-smtp-transport.c:176
 # camel/providers/smtp/camel-smtp-transport.c:177
-#: 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:178
 # camel/providers/smtp/camel-smtp-transport.c:178
 # camel/providers/smtp/camel-smtp-transport.c:179
-#: 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:180
 # camel/providers/smtp/camel-smtp-transport.c:180
 # camel/providers/smtp/camel-smtp-transport.c:181
-#: 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:182
 # camel/providers/smtp/camel-smtp-transport.c:182
 # camel/providers/smtp/camel-smtp-transport.c:183
-#: 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:184
 # camel/providers/smtp/camel-smtp-transport.c:184
 # camel/providers/smtp/camel-smtp-transport.c:185
-#: 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:186
 # camel/providers/smtp/camel-smtp-transport.c:186
 # camel/providers/smtp/camel-smtp-transport.c:187
-#: 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:188
 # camel/providers/smtp/camel-smtp-transport.c:188
 # camel/providers/smtp/camel-smtp-transport.c:189
-#: 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:190
 # camel/providers/smtp/camel-smtp-transport.c:190
 # camel/providers/smtp/camel-smtp-transport.c:191
-#: 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:192
 # camel/providers/smtp/camel-smtp-transport.c:192
 # camel/providers/smtp/camel-smtp-transport.c:193
-#: 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:194
 # camel/providers/smtp/camel-smtp-transport.c:194
 # camel/providers/smtp/camel-smtp-transport.c:195
-#: 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:196
 # camel/providers/smtp/camel-smtp-transport.c:196
 # camel/providers/smtp/camel-smtp-transport.c:197
-#: 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:198
 # camel/providers/smtp/camel-smtp-transport.c:198
 # camel/providers/smtp/camel-smtp-transport.c:199
-#: 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:200
 # camel/providers/smtp/camel-smtp-transport.c:200
 # camel/providers/smtp/camel-smtp-transport.c:201
-#: 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:202
 # camel/providers/smtp/camel-smtp-transport.c:202
 # camel/providers/smtp/camel-smtp-transport.c:203
-#: 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:204
 # camel/providers/smtp/camel-smtp-transport.c:204
 # camel/providers/smtp/camel-smtp-transport.c:205
-#: 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:206
 # camel/providers/smtp/camel-smtp-transport.c:206
 # camel/providers/smtp/camel-smtp-transport.c:207
-#: 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:208
 # camel/providers/smtp/camel-smtp-transport.c:208
 # camel/providers/smtp/camel-smtp-transport.c:209
-#: 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:210
 # camel/providers/smtp/camel-smtp-transport.c:210
 # camel/providers/smtp/camel-smtp-transport.c:211
-#: 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:214
 # camel/providers/smtp/camel-smtp-transport.c:214
 # camel/providers/smtp/camel-smtp-transport.c:215
-#: 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:216
 # camel/providers/smtp/camel-smtp-transport.c:216
 # camel/providers/smtp/camel-smtp-transport.c:217
-#: 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:218
 # camel/providers/smtp/camel-smtp-transport.c:218
 # camel/providers/smtp/camel-smtp-transport.c:219
-#: 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:220
 # camel/providers/smtp/camel-smtp-transport.c:220
 # camel/providers/smtp/camel-smtp-transport.c:221
-#: 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:222
 # camel/providers/smtp/camel-smtp-transport.c:222
 # camel/providers/smtp/camel-smtp-transport.c:223
-#: 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:1110
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1250
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
 msgid "Welcome response error"
 msgstr "欢迎应答错误"
 
 # camel/providers/pop3/camel-pop3-store.c:377
 # camel/providers/pop3/camel-pop3-store.c:377
 # camel/providers/pop3/camel-pop3-store.c:377
-#: 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"
@@ -17140,14 +17416,14 @@ msgstr "以安全模式连接 SMTP 服务器 %s 失败：%s"
 # calendar/gui/e-itip-control.c:1064
 # calendar/gui/e-itip-control.c:1064
 # calendar/gui/e-itip-control.c:1138
-#: 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:1091
 # camel/providers/smtp/camel-smtp-transport.c:1091
 # camel/providers/smtp/camel-smtp-transport.c:1199
-#: 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"
@@ -17155,14 +17431,14 @@ msgstr "STARTTLS 请求超时：%s"
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1104
-#: 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:379
 # camel/providers/smtp/camel-smtp-transport.c:379
 # camel/providers/smtp/camel-smtp-transport.c:383
-#: 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。"
@@ -17170,7 +17446,7 @@ msgstr "SMTP 服务器 %s 不支持请求的认证类型 %s。"
 # camel/providers/smtp/camel-smtp-transport.c:417
 # camel/providers/smtp/camel-smtp-transport.c:417
 # camel/providers/smtp/camel-smtp-transport.c:421
-#: 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请为 %s@%s 输入 SMTP 密码"
@@ -17215,14 +17491,14 @@ msgstr "无法发送邮件： 发件人地址不合法。"
 # camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:558
 # camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:560
 # camel/providers/smtp/camel-smtp-transport.c:603 mail/mail-ops.c:603
-#: 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:604
 # camel/providers/smtp/camel-smtp-transport.c:604
 # camel/providers/smtp/camel-smtp-transport.c:614
-#: camel/providers/smtp/camel-smtp-transport.c:703
+#: camel/providers/smtp/camel-smtp-transport.c:704
 msgid "Cannot send message: no recipients defined."
 msgstr "无法发送邮件： 没有定义收件人。"
 
@@ -17236,14 +17512,14 @@ msgstr "无法发送消息：一个或多个非法收件人"
 # camel/providers/smtp/camel-smtp-transport.c:684
 # camel/providers/smtp/camel-smtp-transport.c:684
 # camel/providers/smtp/camel-smtp-transport.c:798
-#: 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:1091
 # camel/providers/smtp/camel-smtp-transport.c:1091
 # camel/providers/smtp/camel-smtp-transport.c:1199
-#: 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 请求超时： %s"
@@ -17251,7 +17527,7 @@ msgstr "RSET 请求超时： %s"
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1213
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET 应答错误"
@@ -17259,14 +17535,14 @@ msgstr "RSET 应答错误"
 # camel/providers/smtp/camel-smtp-transport.c:758
 # camel/providers/smtp/camel-smtp-transport.c:758
 # camel/providers/smtp/camel-smtp-transport.c:883
-#: 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:764
 # camel/providers/smtp/camel-smtp-transport.c:764
 # camel/providers/smtp/camel-smtp-transport.c:889
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
 msgid "Error creating SASL authentication object."
 msgstr "创建 SASL 认证对象错误。"
 
@@ -17276,8 +17552,8 @@ msgstr "创建 SASL 认证对象错误。"
 # camel/providers/smtp/camel-smtp-transport.c:791
 # camel/providers/smtp/camel-smtp-transport.c:904
 # camel/providers/smtp/camel-smtp-transport.c:916
-#: 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"
@@ -17285,21 +17561,21 @@ msgstr "AUTH 请求超时： %s"
 # camel/providers/smtp/camel-smtp-transport.c:800
 # camel/providers/smtp/camel-smtp-transport.c:800
 # camel/providers/smtp/camel-smtp-transport.c:925
-#: 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:848
 # camel/providers/smtp/camel-smtp-transport.c:848
 # camel/providers/smtp/camel-smtp-transport.c:973
-#: 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:874
 # camel/providers/smtp/camel-smtp-transport.c:874
 # camel/providers/smtp/camel-smtp-transport.c:999
-#: 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： 邮件未发送"
@@ -17307,20 +17583,20 @@ msgstr "MAIL FROM 请求超时： %s： 邮件未发送"
 # camel/providers/smtp/camel-smtp-transport.c:893
 # camel/providers/smtp/camel-smtp-transport.c:893
 # camel/providers/smtp/camel-smtp-transport.c:1013
-#: 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:918
 # camel/providers/smtp/camel-smtp-transport.c:918
 # camel/providers/smtp/camel-smtp-transport.c:1038
-#: 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:1054
-#: 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> 失败"
@@ -17328,7 +17604,7 @@ msgstr "RCPT TO <%s> 失败"
 # camel/providers/smtp/camel-smtp-transport.c:971
 # camel/providers/smtp/camel-smtp-transport.c:971
 # camel/providers/smtp/camel-smtp-transport.c:1090
-#: 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： 邮件未发送"
@@ -17339,7 +17615,7 @@ 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 应答错误"
 
@@ -17349,8 +17625,8 @@ msgstr "DATA 应答错误"
 # camel/providers/smtp/camel-smtp-transport.c:1048
 # camel/providers/smtp/camel-smtp-transport.c:1144
 # camel/providers/smtp/camel-smtp-transport.c:1162
-#: 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： 邮件未发送"
@@ -17360,14 +17636,14 @@ msgstr "DATA 发送超时： 消息终止： %s： 邮件未发送"
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:495
 # camel/providers/smtp/camel-smtp-transport.c:1176
-#: 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:1091
 # camel/providers/smtp/camel-smtp-transport.c:1091
 # camel/providers/smtp/camel-smtp-transport.c:1199
-#: 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"
@@ -17375,7 +17651,7 @@ msgstr "RSET 请求超时： %s"
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1213
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
 msgid "RSET response error"
 msgstr "RSET 应答错误"
 
@@ -17385,7 +17661,7 @@ msgstr "RSET 应答错误"
 # camel/providers/smtp/camel-smtp-transport.c:791
 # camel/providers/smtp/camel-smtp-transport.c:904
 # camel/providers/smtp/camel-smtp-transport.c:916
-#: 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"
@@ -17393,14 +17669,14 @@ msgstr "AUTH 请求超时： %s"
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1250
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
 msgid "QUIT response error"
 msgstr "QUIT 应答错误"
 
 # composer/e-msg-composer-attachment-bar.c:110
 # composer/e-msg-composer-attachment-bar.c:110
 # composer/e-msg-composer-attachment-bar.c:110
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:102
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
@@ -17408,7 +17684,7 @@ msgstr "%.1fK"
 # composer/e-msg-composer-attachment-bar.c:114
 # composer/e-msg-composer-attachment-bar.c:114
 # composer/e-msg-composer-attachment-bar.c:114
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:105
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
@@ -17416,7 +17692,7 @@ msgstr "%.1fM"
 # composer/e-msg-composer-attachment-bar.c:118
 # composer/e-msg-composer-attachment-bar.c:118
 # composer/e-msg-composer-attachment-bar.c:118
-#: composer/e-msg-composer-attachment-bar.c:113
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
@@ -17425,28 +17701,28 @@ msgstr "%.0fG"
 # composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:136
 # composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:135
 #. 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:500
 # composer/e-msg-composer-attachment-bar.c:506
 # composer/e-msg-composer-attachment-bar.c:506
-#: 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:531
 # composer/e-msg-composer-attachment-bar.c:537
 # composer/e-msg-composer-attachment-bar.c:537
-#: 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:532
 # composer/e-msg-composer-attachment-bar.c:538
 # composer/e-msg-composer-attachment-bar.c:538
-#: composer/e-msg-composer-attachment-bar.c:552
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "把文件附件到邮件"
 
@@ -17456,8 +17732,8 @@ msgstr "把文件附件到邮件"
 # composer/e-msg-composer-attachment.c:184
 # composer/e-msg-composer-attachment.c:168
 # composer/e-msg-composer-attachment.c:184
-#: 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"
@@ -17465,7 +17741,7 @@ msgstr "无法附加文件 %s： %s"
 # composer/e-msg-composer-attachment.c:176
 # composer/e-msg-composer-attachment.c:176
 # composer/e-msg-composer-attachment.c:176
-#: 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：不是普通文件"
@@ -17498,14 +17774,18 @@ msgstr "MIME 类型："
 # composer/e-msg-composer-attachment.glade.h:5
 # composer/e-msg-composer-select-file.c:180
 #: 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:289
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
 # composer/e-msg-composer-hdrs.c:327
 # composer/e-msg-composer-hdrs.c:327
 # composer/e-msg-composer-hdrs.c:326
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:479
 msgid "Click here for the address book"
 msgstr "点击此处以使用地址簿"
 
@@ -17519,7 +17799,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 "回复到："
 
@@ -17529,7 +17809,7 @@ msgstr "回复到："
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:411
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "发件人："
 
@@ -17539,49 +17819,49 @@ 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:389
 # composer/e-msg-composer-hdrs.c:389
 # composer/e-msg-composer-hdrs.c:387
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "收信人："
 
 # composer/e-msg-composer-hdrs.c:390
 # composer/e-msg-composer-hdrs.c:390
 # composer/e-msg-composer-hdrs.c:388
-#: 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:393
 # composer/e-msg-composer-hdrs.c:393
 # composer/e-msg-composer-hdrs.c:391
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "抄送："
 
 # composer/e-msg-composer-hdrs.c:394
 # composer/e-msg-composer-hdrs.c:394
 # composer/e-msg-composer-hdrs.c:392
-#: 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:397
 # composer/e-msg-composer-hdrs.c:397
 # composer/e-msg-composer-hdrs.c:395
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "暗中抄送："
 
 # composer/e-msg-composer-hdrs.c:398
 # composer/e-msg-composer-hdrs.c:398
 # composer/e-msg-composer-hdrs.c:396
-#: 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."
@@ -17593,7 +17873,7 @@ msgstr "输入将接收该邮件副本，但不出现在收件人列表中的收
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:447
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "波尔图"
@@ -17601,7 +17881,7 @@ msgstr "波尔图"
 # mail/mail-config.glade.h:119
 # mail/mail-config.glade.h:119
 # my-evolution/e-summary-calendar.c:395
-#: composer/e-msg-composer-hdrs.c:449
+#: composer/e-msg-composer-hdrs.c:549
 #, fuzzy
 msgid "Posting destination"
 msgstr "无描述"
@@ -17612,15 +17892,16 @@ msgstr "无描述"
 # ui/evolution-message-composer.xml.h:2
 # composer/e-msg-composer-select-file.c:291
 # ui/evolution-message-composer.xml.h:2
-#: 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 "附件一个文件"
 
 # mail/mail-crypto.c:59
 # mail/mail-crypto.c:59
 # mail/mail-crypto.c:59
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:533
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "无法创建 PGP 签名上下文。"
@@ -17628,7 +17909,7 @@ msgstr "无法创建 PGP 签名上下文。"
 # composer/e-msg-composer.c:743
 # composer/e-msg-composer.c:747
 # composer/e-msg-composer.c:695
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -17637,24 +17918,17 @@ msgstr ""
 "读入文件 %s 时发声错误：\n"
 "%s"
 
-# composer/e-msg-composer.c:952
-# composer/e-msg-composer.c:956
-# composer/e-msg-composer.c:921
-#: composer/e-msg-composer.c:1160
-msgid "Warning!"
-msgstr "警告！"
-
 # composer/e-msg-composer.c:956
 # composer/e-msg-composer.c:960
 # composer/e-msg-composer.c:925
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "文件存在，覆盖它？"
 
 # composer/e-msg-composer.c:978
 # composer/e-msg-composer.c:982
 # composer/e-msg-composer.c:947
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "保存文件错误： %s"
@@ -17662,7 +17936,7 @@ msgstr "保存文件错误： %s"
 # composer/e-msg-composer.c:997
 # composer/e-msg-composer.c:1001
 # composer/e-msg-composer.c:966
-#: composer/e-msg-composer.c:1207
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "读入文件错误： %s"
@@ -17670,7 +17944,7 @@ msgstr "读入文件错误： %s"
 # composer/e-msg-composer.c:1118
 # composer/e-msg-composer.c:1032
 # composer/e-msg-composer.c:997
-#: composer/e-msg-composer.c:1240
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "访问文件错误： %s"
@@ -17678,14 +17952,14 @@ msgstr "访问文件错误： %s"
 # composer/e-msg-composer.c:1126
 # composer/e-msg-composer.c:1040
 # composer/e-msg-composer.c:1005
-#: 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:1133
 # composer/e-msg-composer.c:1047
 # composer/e-msg-composer.c:1012
-#: composer/e-msg-composer.c:1255
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -17697,7 +17971,7 @@ msgstr ""
 # composer/e-msg-composer.c:1140
 # composer/e-msg-composer.c:1054
 # composer/e-msg-composer.c:1019
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -17706,10 +17980,22 @@ msgstr ""
 "无法截断文件： %s\n"
 "%s"
 
+# composer/e-msg-composer.c:1133
+# composer/e-msg-composer.c:1047
+# composer/e-msg-composer.c:1012
+#: 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:1149
 # composer/e-msg-composer.c:1063
 # composer/e-msg-composer.c:1028
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -17721,7 +18007,7 @@ msgstr ""
 # composer/e-msg-composer.c:1251
 # composer/e-msg-composer.c:1165
 # composer/e-msg-composer.c:1130
-#: 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?"
@@ -17732,7 +18018,7 @@ msgstr ""
 # composer/e-msg-composer.c:1405
 # composer/e-msg-composer.c:1322
 # composer/e-msg-composer.c:1288
-#: composer/e-msg-composer.c:1525
+#: composer/e-msg-composer.c:1550
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -17743,42 +18029,47 @@ msgstr ""
 "\n"
 "您是否希望保存修改？"
 
+#: composer/e-msg-composer.c:1555
+msgid "_Discard Changes"
+msgstr ""
+
 # composer/e-msg-composer.c:1412
 # composer/e-msg-composer.c:1329
 # composer/e-msg-composer.c:1295
-#: composer/e-msg-composer.c:1536
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "警告： 已改动的邮件"
 
 # composer/e-msg-composer.c:1435
 # composer/e-msg-composer.c:1352
 # composer/e-msg-composer.c:1318
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "打开文件"
 
 # mail/mail-config.glade.h:79
 # mail/mail-config.glade.h:79
 # mail/mail-config.glade.h:88
-#: 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:1970 composer/e-msg-composer.c:2423
 # composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
 # composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2334
-#: 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:2440
 # composer/e-msg-composer.c:2380
 # composer/e-msg-composer.c:2351
-#: 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."
@@ -17789,7 +18080,7 @@ msgstr ""
 # composer/e-msg-composer.c:2463 composer/e-msg-composer.c:2518
 # composer/e-msg-composer.c:2403 composer/e-msg-composer.c:2458
 # composer/e-msg-composer.c:2374 composer/e-msg-composer.c:2429
-#: composer/e-msg-composer.c:2822
+#: composer/e-msg-composer.c:2931
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -17803,7 +18094,7 @@ msgstr ""
 # composer/e-msg-composer.c:2463 composer/e-msg-composer.c:2518
 # composer/e-msg-composer.c:2403 composer/e-msg-composer.c:2458
 # composer/e-msg-composer.c:2374 composer/e-msg-composer.c:2429
-#: 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."
@@ -17811,31 +18102,12 @@ msgstr ""
 "无法创见撰写窗口：\n"
 "无法激活 HTML 编辑器组件。"
 
-#: 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 "<b>(编写器含有不可编辑的非文本消息体。)<b>"
 
-# composer/evolution-composer.c:367
-# composer/evolution-composer.c:367
-# composer/evolution-composer.c:367
-#: 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 ""
-"无法创建撰写窗口，这是因为您尚未在\n"
-"邮件组件中配置任何标识。"
-
-# composer/evolution-composer.c:382
-# composer/evolution-composer.c:382
-# composer/evolution-composer.c:382
-#: composer/evolution-composer.c:408
-#, fuzzy
-msgid "Cannot initialize the Evolution composer."
-msgstr "无法初始化 Evolution 的撰写器。"
-
 # data/evolution.desktop.in.h:2
 # data/evolution.desktop.in.h:1
 # data/evolution.desktop.in.h:1
@@ -17920,14 +18192,144 @@ 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 ""
+
+# calendar/gui/e-meeting-time-sel.c:430
+# calendar/gui/e-meeting-time-sel.c:433
+# calendar/gui/e-meeting-time-sel.c:433
+#: designs/OOA/ooa.glade.h:4
+#, fuzzy
+msgid "<b>Out of Office Message:</b>"
+msgstr "办公室以外"
+
+# calendar/gui/dialogs/task-details-page.glade.h:15
+# calendar/gui/dialogs/task-details-page.glade.h:15
+# calendar/gui/dialogs/task-details-page.glade.h:15
+#: 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 ""
+
+# calendar/gui/e-meeting-time-sel.c:430
+# calendar/gui/e-meeting-time-sel.c:433
+# calendar/gui/e-meeting-time-sel.c:433
+#: designs/OOA/ooa.glade.h:12
+#, fuzzy
+msgid "Out of Office Assistant"
+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:31
+# mail/message-list.etspec.h:8
+# 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:31
+# mail/message-list.etspec.h:9
+# 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:47
+# mail/message-list.etspec.h:9
+#: designs/OOA/ooa.glade.h:13
+#, fuzzy
+msgid "Yes, Change Status"
+msgstr "标志状态"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr ""
+
+# mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+# mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+# mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:6
+#: designs/read_receipts/read.glade.h:2
+#, fuzzy
+msgid "<b>Receiving Email</b>"
+msgstr "正在接收电子邮件"
+
+# mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+# mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+# mail/mail-config.glade.h:79 shell/glade/evolution-startup-wizard.glade.h:7
+#: 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"
+msgstr ""
+
 # calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1915
 # mail/mail-display.c:106
 # calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:2034
 # mail/mail-display.c:106
 # calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2070
 # mail/mail-display.c:105
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
-#: mail/mail-display.c:192
+#: e-util/e-dialog-utils.c:247
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -17935,22 +18337,32 @@ msgstr ""
 "指定名称的文件已经存在。\n"
 "覆盖它？"
 
+# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1908
+# mail/mail-display.c:102
+# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:2027
+# mail/mail-display.c:102
+# calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2063
+# mail/mail-display.c:101
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "覆盖文件？"
+
 # e-util/e-passwords.c:360 mail/mail-session.c:267
 # e-util/e-passwords.c:360 mail/mail-session.c:267
 # e-util/e-passwords.c:360 mail/mail-session.c:269
-#: e-util/e-passwords.c:363
+#: e-util/e-passwords.c:357
 msgid "Remember this password"
 msgstr "记住该密码"
 
 # e-util/e-passwords.c:362 mail/mail-session.c:268
 # e-util/e-passwords.c:362 mail/mail-session.c:268
 # e-util/e-passwords.c:362 mail/mail-session.c:270
-#: 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:96
+#: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
 msgstr "同步私有记录："
 
@@ -17959,7 +18371,7 @@ msgstr "同步私有记录："
 # addressbook/backend/ebook/e-card-simple.c:104
 # calendar/gui/e-calendar-table.etspec.h:4
 # e-util/e-pilot-settings.c:105
-#: e-util/e-pilot-settings.c:105
+#: e-util/e-pilot-settings.c:102
 msgid "Sync Categories:"
 msgstr "同步类别："
 
@@ -17968,7 +18380,7 @@ msgstr "同步类别："
 # e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 #. 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 "%Y/%m/%d %a %I:%M %p"
 
@@ -17977,7 +18389,7 @@ msgstr "%Y/%m/%d %a %I:%M %p"
 # e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 #. 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 "%Y/%m/%d %a %H:%M"
 
@@ -17986,7 +18398,7 @@ msgstr "%Y/%m/%d %a %H:%M"
 # e-util/e-time-utils.c:178
 #. 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 "%Y/%m/%d %a %I %p"
 
@@ -17995,7 +18407,7 @@ msgstr "%Y/%m/%d %a %I %p"
 # e-util/e-time-utils.c:183
 #. 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 "%Y/%m/%d %a %H"
 
@@ -18003,7 +18415,7 @@ msgstr "%Y/%m/%d %a %H"
 # e-util/e-time-utils.c:194
 # e-util/e-time-utils.c:194
 #. 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"
 
@@ -18011,7 +18423,7 @@ msgstr "%Y/%m/%d %I:%M:%S %p"
 # e-util/e-time-utils.c:198
 # e-util/e-time-utils.c:198
 #. 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"
 
@@ -18020,7 +18432,7 @@ msgstr "%Y/%m/%d %H:%M:%S"
 # e-util/e-time-utils.c:203
 #. 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 %H:%M %p"
 
@@ -18029,7 +18441,7 @@ msgstr "%Y/%m/%d %H:%M %p"
 # e-util/e-time-utils.c:208
 #. 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"
 
@@ -18038,7 +18450,7 @@ msgstr "%Y/%m/%d %H:%M"
 # e-util/e-time-utils.c:213
 #. 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"
 
@@ -18047,7 +18459,7 @@ msgstr "%Y/%m/%d %I %p"
 # e-util/e-time-utils.c:218
 #. 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"
 
@@ -18055,7 +18467,7 @@ msgstr "%Y/%m/%d %H"
 # e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 # e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 #. 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"
 
@@ -18063,7 +18475,7 @@ msgstr "%I:%M:%S %p"
 # e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 # e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 #. 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"
 
@@ -18075,8 +18487,8 @@ msgstr "%H:%M:%S"
 # widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1647
 #. 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"
 
@@ -18087,8 +18499,8 @@ msgstr "%I:%M %p"
 # e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
 # widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1644
 #. 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"
 
@@ -18096,57 +18508,116 @@ msgstr "%H:%M"
 # e-util/e-time-utils.c:320
 # e-util/e-time-utils.c:320
 #. 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 "秒"
+# calendar/gui/dialogs/alarm-page.c:344
+# calendar/gui/dialogs/alarm-page.c:344
+# calendar/gui/dialogs/alarm-page.c:344
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr "1 秒"
 
-#: filter/filter-datespec.c:71
-msgid "minute"
-msgstr "分钟"
+# calendar/gui/dialogs/alarm-page.c:341
+# calendar/gui/dialogs/alarm-page.c:341
+# calendar/gui/dialogs/alarm-page.c:341
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr "%d 秒"
 
-#: filter/filter-datespec.c:72
-msgid "hour"
-msgstr "小时"
+# calendar/gui/dialogs/alarm-page.c:336
+# calendar/gui/dialogs/alarm-page.c:336
+# calendar/gui/dialogs/alarm-page.c:336
+#: filter/filter-datespec.c:66
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 分钟"
 
-#: filter/filter-datespec.c:74
-msgid "week"
-msgstr "周"
+# calendar/gui/dialogs/alarm-page.c:333
+# calendar/gui/dialogs/alarm-page.c:333
+# calendar/gui/dialogs/alarm-page.c:333
+#: 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 "周"
+# calendar/gui/dialogs/alarm-page.c:328
+# calendar/gui/dialogs/alarm-page.c:328
+# calendar/gui/dialogs/alarm-page.c:328
+#: filter/filter-datespec.c:67
+#, fuzzy
+msgid "1 hour ago"
+msgstr "1 小时"
 
-#: filter/filter-datespec.c:75
-msgid "month"
-msgstr "月"
+# calendar/gui/dialogs/alarm-page.c:325
+# calendar/gui/dialogs/alarm-page.c:325
+# calendar/gui/dialogs/alarm-page.c:325
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d 小时"
 
-#: filter/filter-datespec.c:75 filter/filter.glade.h:23
-msgid "months"
+# calendar/gui/dialogs/alarm-page.c:312
+# calendar/gui/dialogs/alarm-page.c:312
+# calendar/gui/dialogs/alarm-page.c:312
+#: 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 " 过去"
+
+# calendar/gui/dialogs/alarm-page.c:320
+# calendar/gui/dialogs/alarm-page.c:320
+# calendar/gui/dialogs/alarm-page.c:320
+#: filter/filter-datespec.c:69
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 周"
+
+# calendar/gui/dialogs/alarm-page.c:317
+# calendar/gui/dialogs/alarm-page.c:317
+# calendar/gui/dialogs/alarm-page.c:317
+#: 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:76
-msgid "year"
-msgstr "年"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr " 过去"
 
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
-msgid "years"
-msgstr "年"
+#: filter/filter-datespec.c:71
+msgid "1 year ago"
+msgstr ""
 
-#: filter/filter-datespec.c:174
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr " 过去"
+
+#: 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 "现在"
 
@@ -18157,37 +18628,31 @@ msgstr "现在"
 # calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
 # calendar/gui/calendar-commands.c:458
 #. 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 "%Y %b %d %a"
 
-#. 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 "过滤规则"
 
 # addressbook/printing/e-contact-print.glade.h:38
 # addressbook/printing/e-contact-print.glade.h:38
 # mail/mail-config.glade.h:92
-#: 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 "指定文件名："
 
 # camel/providers/local/camel-spool-store.c:115
 # camel/providers/local/camel-spool-store.c:115
 # camel/providers/local/camel-spool-store.c:115
-#: 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”不存在或不是普通文件"
@@ -18195,37 +18660,33 @@ msgstr "脱机文件“%s”不存在或不是普通文件"
 # ui/evolution-message-composer.xml.h:14
 # ui/evolution-message-composer.xml.h:14
 # ui/evolution-message-composer.xml.h:14
-#: 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 "添加动作"
-
 # addressbook/printing/e-contact-print.glade.h:38
 # addressbook/printing/e-contact-print.glade.h:38
 # mail/mail-config.glade.h:92
-#: 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 "指定文件名："
 
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:834
-#: 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"
@@ -18234,22 +18695,23 @@ 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 "重要"
 
 # my-evolution/Locations.h:508
 #. 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 "科克"
 
 # my-evolution/Locations.h:1795
 #. 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 "波纳尔"
@@ -18258,8 +18720,8 @@ msgstr "波纳尔"
 # addressbook/gui/contact-editor/fulladdr.glade.h:209
 # addressbook/gui/contact-editor/e-contact-editor-address.c:335
 #. 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 "多哥"
@@ -18268,52 +18730,49 @@ msgstr "多哥"
 # calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
 # calendar/gui/dialogs/alarm-page.glade.h:11
 #. 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
 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 "发送"
 
@@ -18365,7 +18824,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 "虚拟文件夹"
 
@@ -18377,6 +18836,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 "仅指定文件夹"
@@ -18394,6 +18861,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 "以全部活跃远程文件夹"
@@ -18406,6 +18877,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
 #, fuzzy
@@ -18548,7 +19023,7 @@ msgstr "已标志"
 # ui/evolution-mail-message.xml.h:98
 # ui/evolution-mail-message.xml.h:98
 # my-evolution/Locations.h:1192
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 #, fuzzy
 msgid "Label"
 msgstr "劳雷尔"
@@ -18582,7 +19057,7 @@ msgstr "执行 Shell 命令"
 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 "已读"
 
@@ -18621,12 +19096,12 @@ msgstr "小于"
 # mail/message-list.etspec.h:5
 # mail/message-list.etspec.h:6
 # mail/message-list.etspec.h:6
-#: 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 "发件人"
 
@@ -18666,8 +19141,9 @@ msgstr "停止处理"
 # mail/message-list.etspec.h:9
 # mail/message-list.etspec.h:10
 # mail/message-list.etspec.h:10
-#: 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 "主题"
 
@@ -18675,39 +19151,50 @@ msgstr "主题"
 msgid "Unset Status"
 msgstr "未设置状态"
 
-#: 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
+#, fuzzy, 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:239 filter/rule-editor.c:335
-#, c-format
-msgid "Rule name '%s' is not unique, choose another"
-msgstr "规则名“%s”不唯一，另选一个"
-
-#: 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
+#, 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 "您必须为该虚拟文件夹命名。"
 
-#: filter/vfolder-rule.c:215
+#: filter/vfolder-rule.c:222
 msgid "You need to to specify at least one folder as a source."
 msgstr "您至少需要把一个文件夹指定为源。"
 
+#: filter/vfolder-rule.c:499
+#, fuzzy
+msgid "VFolder source"
+msgstr "虚拟文件夹来源"
+
 # importers/elm-importer.c:95
 # importers/elm-importer.c:95
 # importers/elm-importer.c:95
-#: 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 正在导入您原来的电子邮件"
 
@@ -18718,7 +19205,8 @@ msgstr "Evolution 正在导入您原来的电子邮件"
 # importers/elm-importer.c:96 importers/netscape-importer.c:107
 # importers/pine-importer.c:101
 #: 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 "导入..."
 
@@ -18729,7 +19217,8 @@ msgstr "导入..."
 # importers/elm-importer.c:98 importers/netscape-importer.c:109
 # importers/pine-importer.c:103
 #: 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 "请等待"
 
@@ -18740,7 +19229,8 @@ msgstr "请等待"
 # importers/elm-importer.c:169 importers/netscape-importer.c:689
 # importers/pine-importer.c:365
 #: 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 "正在按 %2$s 导入 %1$s"
@@ -18752,7 +19242,8 @@ msgstr "正在按 %2$s 导入 %1$s"
 # importers/elm-importer.c:375 importers/netscape-importer.c:782
 # importers/pine-importer.c:471
 #: 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"
@@ -18764,15 +19255,16 @@ msgstr "正在扫描 %s"
 # importers/elm-importer.c:525 importers/netscape-importer.c:958
 # importers/pine-importer.c:637 mail/component-factory.c:100
 #: 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
 # importers/elm-importer.c:545
-#: 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?"
@@ -18783,7 +19275,7 @@ msgstr ""
 # importers/elm-importer.c:574
 # importers/elm-importer.c:574
 # importers/elm-importer.c:574
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
 msgstr "Elm"
 
@@ -18801,12 +19293,12 @@ msgstr ""
 # calendar/gui/print.c:2280
 # calendar/gui/print.c:2280
 # calendar/gui/print.c:2280
-#: 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"
@@ -18821,7 +19313,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"
@@ -18829,7 +19321,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"
@@ -18841,7 +19333,7 @@ msgstr ""
 # importers/netscape-importer.c:106
 # importers/netscape-importer.c:106
 # importers/netscape-importer.c:106
-#: 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 数据"
 
@@ -18849,15 +19341,15 @@ msgstr "Evolution 正在导入您原来的 Netscape 数据"
 # mail/mail-ops.c:1060 shell/e-local-storage.c:178
 # mail/mail-ops.c:1103 shell/e-local-storage.c:178
 #. 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 "已删除"
 
 # camel/providers/local/camel-local-store.c:196
 # camel/providers/local/camel-local-store.c:196
 # camel/providers/local/camel-local-store.c:196
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "本地邮件文件 %s"
@@ -18866,24 +19358,26 @@ msgstr "本地邮件文件 %s"
 # importers/netscape-importer.c:888 importers/pine-importer.c:570
 # importers/netscape-importer.c:888 importers/pine-importer.c:570
 #: 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:897
 # importers/netscape-importer.c:897
 # importers/netscape-importer.c:897
-#: 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:963
 # importers/netscape-importer.c:963
 # importers/netscape-importer.c:963
-#: 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 "编辑过滤规则"
@@ -18891,7 +19385,7 @@ msgstr "编辑过滤规则"
 # importers/netscape-importer.c:984
 # importers/netscape-importer.c:984
 # importers/netscape-importer.c:984
-#: 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?"
@@ -18902,14 +19396,14 @@ msgstr ""
 # importers/pine-importer.c:100
 # importers/pine-importer.c:100
 # importers/pine-importer.c:100
-#: 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
 # importers/pine-importer.c:663
-#: 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?"
@@ -18920,59 +19414,27 @@ msgstr ""
 # importers/pine-importer.c:691
 # importers/pine-importer.c:691
 # importers/pine-importer.c:691
-#: 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:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Evolution 撰写器车间。"
-
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#: 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:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: 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:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: 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:6
 # mail/GNOME_Evolution_Mail.oaf.in.h:6
 # mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: 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 撰写器车间。"
@@ -18980,63 +19442,86 @@ msgstr "Evolution 撰写器车间。"
 # ui/evolution-mail-global.xml.h:4
 # ui/evolution-mail-global.xml.h:4
 # ui/evolution-mail-global.xml.h:4
-#: 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:1
-# mail/GNOME_Evolution_Mail.oaf.in.h:1
-# mail/GNOME_Evolution_Mail.oaf.in.h:1 notes/GNOME_Evolution_Notes.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Evolution 处理邮件组件。"
+# data/evolution.desktop.in.h:1 shell/main.c:83
+# shell/main.c:83
+# shell/main.c:83
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: 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:2
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: 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:3
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Evolution 邮件实施概要组件。"
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolution 邮件撰写器。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: 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:8
+# mail/GNOME_Evolution_Mail.oaf.in.h:8
+# mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "邮件配置界面"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:4
 # mail/GNOME_Evolution_Mail.oaf.in.h:4
 # mail/GNOME_Evolution_Mail.oaf.in.h:4
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
-msgid "Evolution mail folder display component."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail folder viewer"
 msgstr "Evolution 邮件文件夹显示组件。"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:5
-# mail/GNOME_Evolution_Mail.oaf.in.h:5
-# mail/GNOME_Evolution_Mail.oaf.in.h:5
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
-msgstr "Evolution 邮件文件夹车间组件。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
-msgstr "Evolution 撰写器车间。"
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Evolution 任务控制车间"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:7
-# mail/GNOME_Evolution_Mail.oaf.in.h:7
-# mail/GNOME_Evolution_Mail.oaf.in.h:7
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
-msgstr "邮件概要组件车间。"
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution 邮件实施概要组件。"
 
 # calendar/gui/dialogs/recurrence-page.glade.h:11
 # calendar/gui/dialogs/recurrence-page.glade.h:11
 # calendar/gui/dialogs/recurrence-page.glade.h:11
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 #, fuzzy
 msgid "Font Preferences"
 msgstr "没有循环(_N)"
@@ -19044,81 +19529,74 @@ msgstr "没有循环(_N)"
 # mail/mail-config.glade.h:8
 # mail/mail-config.glade.h:8
 # mail/mail-config.glade.h:8
-#: 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:8
-# mail/GNOME_Evolution_Mail.oaf.in.h:8
-# mail/GNOME_Evolution_Mail.oaf.in.h:8
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-msgid "Mail configuration interface"
-msgstr "邮件配置界面"
-
 # mail/component-factory.c:100
 # mail/component-factory.c:100
 # mail/component-factory.c:100
-#: mail/component-factory.c:102
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "文件夹含有邮件"
 
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "公共邮件"
 
 # mail/component-factory.c:100
 # mail/component-factory.c:100
 # mail/component-factory.c:100
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "公共文件夹含有邮件"
 
 # mail/component-factory.c:102
 # mail/component-factory.c:102
 # mail/component-factory.c:102
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash"
 msgstr "虚拟已删除邮件箱"
 
 # mail/component-factory.c:102
 # mail/component-factory.c:102
 # mail/component-factory.c:102
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
 msgid "Virtual Trash folder"
 msgstr "虚拟已删除邮件文件夹"
 
 # mail/component-factory.c:147
 # mail/component-factory.c:147
 # mail/component-factory.c:147
-#: mail/component-factory.c:132
+#: mail/component-factory.c:146
 msgid "This folder cannot contain messages."
 msgstr "该文件夹不能含有邮件。"
 
 # mail/component-factory.c:432
 # mail/component-factory.c:432
 # mail/component-factory.c:432
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "属性..."
 
 # mail/component-factory.c:432
 # mail/component-factory.c:432
 # mail/component-factory.c:432
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "改变该文件夹的属性"
 
 # mail/component-factory.c:783
 # mail/component-factory.c:783
 # mail/component-factory.c:786
-#: 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."
@@ -19127,46 +19605,39 @@ msgstr "您的某些邮件设置好像已崩溃，请按顺序检查所有内容
 # mail/mail-callbacks.c:230
 # mail/mail-callbacks.c:230
 # mail/mail-callbacks.c:187
-#: 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 "您已取消邮件的发送，您仍希望退出吗？"
 
-# composer/e-msg-composer.c:1412
-# composer/e-msg-composer.c:1329
-# composer/e-msg-composer.c:1295
-#: mail/component-factory.c:998
-msgid "Warning: Unsent Messages"
-msgstr "警告： 未发送的邮件"
-
 # mail/component-factory.c:951
 # mail/component-factory.c:951
 # mail/component-factory.c:955
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "新建邮件"
 
 # ui/evolution-mail-global.xml.h:20
 # ui/evolution-mail-global.xml.h:20
 # ui/evolution-mail-global.xml.h:20
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "邮件(_M)"
 
 # composer/e-msg-composer.c:1970 composer/e-msg-composer.c:2423
 # composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
 # composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2334
-#: mail/component-factory.c:1041
+#: mail/component-factory.c:1061
 msgid "Compose a new mail message"
 msgstr "撰写一封新邮件"
 
 # ui/evolution-mail-global.xml.h:10
 # ui/evolution-mail-global.xml.h:10
 # ui/evolution-mail-global.xml.h:10
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 #, fuzzy
 msgid "New Message Post"
 msgstr "新建邮件"
@@ -19174,42 +19645,21 @@ msgstr "新建邮件"
 # ui/evolution-mail-message.xml.h:65
 # ui/evolution-mail-message.xml.h:65
 # ui/evolution-mail-message.xml.h:65
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
 msgid "_Post Message"
 msgstr "发送邮件(_P)"
 
 # mail/component-factory.c:951
 # mail/component-factory.c:951
 # mail/component-factory.c:955
-#: mail/component-factory.c:1050
+#: mail/component-factory.c:1070
 msgid "Post a new mail message"
 msgstr "发送一封新邮件"
 
-# mail/component-factory.c:975
-# mail/component-factory.c:975
-# mail/component-factory.c:980
-#: mail/component-factory.c:1078
-msgid "Cannot initialize the Evolution mail component."
-msgstr "无法初始化 Evolution 的邮件组件。"
-
-# mail/component-factory.c:984
-# mail/component-factory.c:984
-# mail/component-factory.c:989
-#: mail/component-factory.c:1087
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "无法初始化 Evolution 的邮件配置组件。"
-
-# mail/component-factory.c:990
-# mail/component-factory.c:990
-# mail/component-factory.c:995
-#: mail/component-factory.c:1093
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "无法初始化 Evolution 的文件夹信息组件。"
-
 # mail/mail-config.c:2184 mail/mail-config.c:2188
 # mail/mail-config.c:2233 mail/mail-config.c:2237
 # mail/mail-config.c:2326 mail/mail-config.c:2330
-#: mail/component-factory.c:1334 mail/component-factory.c:1364
+#: mail/component-factory.c:1353
 #, fuzzy
 msgid "Connecting..."
 msgstr "正在连接服务器..."
@@ -19217,14 +19667,14 @@ msgstr "正在连接服务器..."
 # mail/component-factory.c:1206
 # mail/component-factory.c:1206
 # mail/component-factory.c:1211
-#: mail/component-factory.c:1375
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "无法用 shell 注册存储"
 
 # mail/folder-browser-ui.c:272
 # mail/folder-browser-ui.c:272
 # mail/folder-browser-ui.c:273
-#: mail/folder-browser-ui.c:471
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "“%s”的属性"
@@ -19232,14 +19682,14 @@ msgstr "“%s”的属性"
 # mail/folder-browser-ui.c:274
 # mail/folder-browser-ui.c:274
 # mail/folder-browser-ui.c:275
-#: mail/folder-browser-ui.c:473
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "属性"
 
 # mail/folder-browser.c:297 mail/mail-display.c:298
 # mail/folder-browser.c:297 mail/mail-display.c:297
 # mail/folder-browser.c:298 mail/mail-display.c:298
-#: 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"
@@ -19247,7 +19697,7 @@ msgstr "无法创建临时目录： %s"
 # mail/folder-browser.c:731
 # mail/folder-browser.c:751
 # mail/folder-browser.c:752
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr "%d 新"
@@ -19258,21 +19708,21 @@ msgstr "%d 新"
 # mail/folder-browser.c:765
 # mail/folder-browser.c:755 mail/folder-browser.c:763
 # mail/folder-browser.c:766
-#: 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:735
 # mail/folder-browser.c:756
 # mail/folder-browser.c:757
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:787
 #, c-format
 msgid "%d hidden"
 msgstr "隐藏 %d 个"
 
 # mail/folder-browser.c:759
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:789
 #, c-format
 msgid "%d visible"
 msgstr "%d 个可见"
@@ -19280,7 +19730,7 @@ msgstr "%d 个可见"
 # mail/folder-browser.c:740
 # mail/folder-browser.c:763
 # mail/folder-browser.c:764
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:794
 #, c-format
 msgid "%d selected"
 msgstr "选择 %d 个"
@@ -19288,7 +19738,7 @@ msgstr "选择 %d 个"
 # mail/folder-browser.c:763
 # mail/folder-browser.c:768
 # mail/folder-browser.c:769
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr "%d 个未发送"
@@ -19296,7 +19746,7 @@ msgstr "%d 个未发送"
 # mail/folder-browser.c:765
 # mail/folder-browser.c:770
 # mail/folder-browser.c:771
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d sent"
 msgstr "%d 个已发送"
@@ -19304,7 +19754,7 @@ msgstr "%d 个已发送"
 # mail/folder-browser.c:767
 # mail/folder-browser.c:772
 # mail/folder-browser.c:773
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr "共 %d 个"
@@ -19312,7 +19762,7 @@ msgstr "共 %d 个"
 # ui/evolution-mail-message.xml.h:8
 # ui/evolution-mail-message.xml.h:8
 # ui/evolution-mail-message.xml.h:8
-#: mail/folder-browser.c:1118
+#: mail/folder-browser.c:1182
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "从邮件创建虚拟文件夹(_V)"
@@ -19320,102 +19770,102 @@ msgstr "从邮件创建虚拟文件夹(_V)"
 # mail/folder-browser.c:1430
 # mail/folder-browser.c:1437
 # mail/folder-browser.c:1438
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "关于主题的虚拟文件夹(_S)"
 
 # mail/folder-browser.c:1431
 # mail/folder-browser.c:1438
 # mail/folder-browser.c:1439
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "关于发件人的虚拟文件夹(_N)"
 
 # mail/folder-browser.c:1432
 # mail/folder-browser.c:1439
 # mail/folder-browser.c:1440
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "关于收件人的虚拟文件夹(_R)"
 
 # mail/folder-browser.c:1433
 # mail/folder-browser.c:1440
 # mail/folder-browser.c:1441
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "关于邮件列表的虚拟文件夹(_L)"
 
 # mail/folder-browser.c:1437
 # mail/folder-browser.c:1444
 # mail/folder-browser.c:1445
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "过滤标题(_J)"
 
 # mail/folder-browser.c:1438
 # mail/folder-browser.c:1445
 # mail/folder-browser.c:1446
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "过滤发件人(_D)"
 
 # mail/folder-browser.c:1439
 # mail/folder-browser.c:1446
 # mail/folder-browser.c:1447
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "过滤收件人(_C)"
 
 # mail/folder-browser.c:1440
 # mail/folder-browser.c:1447
 # mail/folder-browser.c:1448
-#: 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)"
 
 # mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:96
 # mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:96
 # mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:98
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "作为新邮件进行编辑(_E)..."
 
 # mail/folder-browser.c:1450
 # mail/folder-browser.c:1457
 # mail/folder-browser.c:1458
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "打印(_P)"
 
 # mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:104
 # mail/folder-browser.c:1461 ui/evolution-mail-message.xml.h:104
 # mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:106
-#: 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 "回复发件人(_R)"
 
 # mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:73
 # mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:73
 # mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:75
-#: 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 "回复邮件列表(_L)"
 
 # mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:72
 # mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:72
 # mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:74
-#: 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 "回复所有人(_A)"
 
 # mail/folder-browser.c:1457
 # mail/folder-browser.c:1464
 # mail/folder-browser.c:1465
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "转发(_F)"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1770
 msgid "Follo_w Up..."
 msgstr ""
 
@@ -19431,7 +19881,7 @@ msgstr ""
 # calendar/gui/dialogs/task-details-page.glade.h:4
 # calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:329
 # calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1771
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "已完成"
@@ -19440,7 +19890,7 @@ msgstr "已完成"
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 # widgets/misc/e-filter-bar.h:95
 # widgets/misc/e-filter-bar.h:95
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1772
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "清除"
@@ -19449,14 +19899,14 @@ msgstr "清除"
 # mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:43
 # mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:43
 #. 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 "标记为已读(_K)"
 
 # mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:45
 # mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:45
 # mail/folder-browser.c:1468 ui/evolution-mail-message.xml.h:45
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1777
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "标记为未读(_N)"
@@ -19464,14 +19914,14 @@ msgstr "标记为未读(_N)"
 # mail/folder-browser.c:1461
 # mail/folder-browser.c:1468
 # mail/folder-browser.c:1469
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "标记为重要(_I)"
 
 # ui/evolution-mail-message.xml.h:46
 # ui/evolution-mail-message.xml.h:46
 # ui/evolution-mail-message.xml.h:46
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1779
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "标记为不重要(_O)"
@@ -19479,7 +19929,7 @@ msgstr "标记为不重要(_O)"
 # mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:107
 # mail/folder-browser.c:1478 ui/evolution-mail-message.xml.h:107
 # mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:109
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1784
 #, fuzzy
 msgid "U_ndelete"
 msgstr "反删除(_U)"
@@ -19487,7 +19937,7 @@ msgstr "反删除(_U)"
 # mail/folder-browser.c:1466
 # mail/folder-browser.c:1475
 # mail/folder-browser.c:1476
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1788
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "移动到文件夹(_M)..."
@@ -19495,14 +19945,14 @@ msgstr "移动到文件夹(_M)..."
 # mail/folder-browser.c:1467
 # mail/folder-browser.c:1476
 # mail/folder-browser.c:1477
-#: 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:1473 ui/evolution-mail-message.xml.h:1
 # mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:1
 # mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1797
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "将发件人添加到地址簿"
@@ -19510,7 +19960,7 @@ msgstr "将发件人添加到地址簿"
 # mail/folder-browser.c:1476
 # mail/folder-browser.c:1485
 # mail/folder-browser.c:1486
-#: mail/folder-browser.c:1774
+#: mail/folder-browser.c:1801
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "应用过滤规则"
@@ -19518,7 +19968,7 @@ msgstr "应用过滤规则"
 # mail/folder-browser.c:1478
 # mail/folder-browser.c:1487
 # mail/folder-browser.c:1488
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1805
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "从消息创建规则(_L)"
@@ -19526,7 +19976,7 @@ msgstr "从消息创建规则(_L)"
 # mail/folder-browser.c:1629
 # mail/folder-browser.c:1657
 # mail/folder-browser.c:1658
-#: mail/folder-browser.c:2036
+#: mail/folder-browser.c:2064
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "关于邮件列表的虚拟文件夹"
@@ -19534,7 +19984,7 @@ msgstr "关于邮件列表的虚拟文件夹"
 # mail/folder-browser.c:1631
 # mail/folder-browser.c:1659
 # mail/folder-browser.c:1660
-#: mail/folder-browser.c:2038
+#: mail/folder-browser.c:2066
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "过滤邮件列表 (%s)"
@@ -19542,7 +19992,7 @@ msgstr "过滤邮件列表 (%s)"
 # mail/folder-browser.c:1632
 # mail/folder-browser.c:1660
 # mail/folder-browser.c:1661
-#: mail/folder-browser.c:2039
+#: mail/folder-browser.c:2067
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "关于邮件列表 (%s) 的虚拟文件夹"
@@ -19550,44 +20000,60 @@ msgstr "关于邮件列表 (%s) 的虚拟文件夹"
 # mail/mail-config.glade.h:23
 # mail/folder-browser.h:26
 # mail/folder-browser.h:26
-#: 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:64
 # mail/folder-info.c:64
 # mail/folder-info.c:64
-#: 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_Mbox_Importer.oaf.in.h:1
-# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "将邮件箱导入 Evolution 的车间"
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: 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
-# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "将邮件箱文件导入到 Evolution"
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolution 邮件撰写器。"
 
-# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
-# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
-# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
-#: 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_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr ""
 
-# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
-# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
-# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
-#: 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/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: 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.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: 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:2
 # mail/local-config.glade.h:2
@@ -19648,7 +20114,7 @@ msgstr "mh"
 # mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 # mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 # mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
-#: mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:102
 msgid "You have not filled in all of the required information."
 msgstr "您还没有填写所有必须的信息。"
 
@@ -19656,21 +20122,21 @@ msgstr "您还没有填写所有必须的信息。"
 # mail/mail-account-editor.c:160
 # mail/mail-account-editor.c:160
 #. 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-config.glade.h:104
 # mail/mail-config.glade.h:104
 # mail/mail-config.glade.h:113
-#: 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 "主机(_H)："
 
 # mail/mail-config.glade.h:117
 # mail/mail-config.glade.h:117
 # mail/mail-config.glade.h:126
-#: 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 "用户名(_U)："
@@ -19678,68 +20144,68 @@ msgstr "用户名(_U)："
 # mail/mail-config.glade.h:112
 # mail/mail-config.glade.h:112
 # mail/mail-config.glade.h:121
-#: 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 "路径(_P)："
 
 # mail/mail-account-gui.c:1654
 # mail/mail-account-gui.c:1654
 # mail/mail-account-gui.c:1665
-#: 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:293
 # mail/mail-accounts.c:293
 # mail/mail-accounts.c:293
-#: 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:297
 # mail/mail-accounts.c:297
 # mail/mail-accounts.c:297
-#: mail/mail-accounts.c:228
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "不要删除"
 
-# mail/mail-accounts.c:300
-# mail/mail-accounts.c:300
-# mail/mail-accounts.c:300
-#: mail/mail-accounts.c:231
-msgid "Really delete account?"
-msgstr "确实删除帐号？"
-
 # mail/mail-accounts.c:194
 # mail/mail-accounts.c:194
 # mail/mail-accounts.c:194
-#: 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:196
 # mail/mail-accounts.c:196
 # mail/mail-accounts.c:196
-#: 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-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/folder-browser.h:26
+#. translators: default account indicator
+#: mail/mail-accounts.c:433
+#, fuzzy
+msgid "[Default]"
+msgstr "默认"
+
 # mail/mail-config.glade.h:33
 # mail/mail-config.glade.h:33
 # mail/mail-config.glade.h:39
-#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:53
+#: 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 "已启用"
 
 # addressbook/gui/component/addressbook-config.glade.h:23
 # addressbook/gui/component/addressbook-config.glade.h:23
 # addressbook/gui/component/addressbook-config.glade.h:30
-#: 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 "帐号名(_A)："
@@ -19748,7 +20214,7 @@ msgstr "帐号名(_A)："
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # addressbook/gui/contact-editor/e-contact-editor-address.c:298
 # my-evolution/Locations.h:1824
-#: 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 "波多黎各"
@@ -19756,7 +20222,7 @@ msgstr "波多黎各"
 # mail/mail-autofilter.c:72
 # mail/mail-autofilter.c:72
 # mail/mail-autofilter.c:72
-#: mail/mail-autofilter.c:78
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "邮寄给 %s"
@@ -19764,7 +20230,7 @@ msgstr "邮寄给 %s"
 # mail/mail-autofilter.c:215
 # mail/mail-autofilter.c:217
 # mail/mail-autofilter.c:217
-#: mail/mail-autofilter.c:242
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "主题是 %s"
@@ -19772,7 +20238,7 @@ msgstr "主题是 %s"
 # mail/mail-autofilter.c:231
 # mail/mail-autofilter.c:233
 # mail/mail-autofilter.c:233
-#: mail/mail-autofilter.c:258
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "邮件来自 %s"
@@ -19780,7 +20246,7 @@ msgstr "邮件来自 %s"
 # mail/mail-autofilter.c:287
 # mail/mail-autofilter.c:289
 # mail/mail-autofilter.c:289
-#: mail/mail-autofilter.c:275
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 邮件列表"
@@ -19788,15 +20254,15 @@ msgstr "%s 邮件列表"
 # mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
 # mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 # mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
-#: 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 "下列过滤器规则：\n"
 
-#: mail/mail-autofilter.c:382
+#: mail/mail-autofilter.c:378
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -19804,10 +20270,18 @@ msgid ""
 "And have been updated."
 msgstr ""
 
+# widgets/misc/e-messagebox.c:224
+# widgets/misc/e-messagebox.c:224
+# widgets/misc/e-messagebox.c:224
+#. 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:137
 # mail/mail-callbacks.c:137
 # mail/mail-callbacks.c:94
-#: mail/mail-callbacks.c:154
+#: mail/mail-callbacks.c:189
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -19822,7 +20296,19 @@ msgstr ""
 # mail/mail-callbacks.c:186
 # mail/mail-callbacks.c:186
 # mail/mail-callbacks.c:143
-#: 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:186
+# mail/mail-callbacks.c:186
+# mail/mail-callbacks.c:143
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -19833,7 +20319,7 @@ msgstr ""
 # mail/mail-callbacks.c:200
 # mail/mail-callbacks.c:200
 # mail/mail-callbacks.c:157
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -19845,7 +20331,7 @@ msgstr ""
 # mail/mail-callbacks.c:265
 # mail/mail-callbacks.c:222
 #. 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"
@@ -19855,14 +20341,14 @@ msgstr "您正在发送 HTML 格式的消息，当以下收件人不希望接收
 # mail/mail-callbacks.c:280
 # mail/mail-callbacks.c:280
 # mail/mail-callbacks.c:237
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "仍然发送？"
 
 # mail/mail-callbacks.c:322
 # mail/mail-callbacks.c:322
 # mail/mail-callbacks.c:279
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -19873,7 +20359,7 @@ msgstr ""
 # mail/mail-callbacks.c:366
 # mail/mail-callbacks.c:366
 # mail/mail-callbacks.c:323
-#: 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."
@@ -19884,14 +20370,14 @@ msgstr ""
 # mail/mail-callbacks.c:370
 # mail/mail-callbacks.c:370
 # mail/mail-callbacks.c:327
-#: mail/mail-callbacks.c:360
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr "该邮件只含有密件抄送收件人。"
 
 # mail/mail-callbacks.c:374
 # mail/mail-callbacks.c:374
 # mail/mail-callbacks.c:331
-#: 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"
@@ -19903,14 +20389,14 @@ msgstr ""
 # mail/mail-callbacks.c:504
 # mail/mail-callbacks.c:504
 # mail/mail-callbacks.c:460
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr "您必须指定收件人以便发送该消息。"
 
 # composer/e-msg-composer.c:1068
 # mail/mail-callbacks.c:716
 # mail/mail-callbacks.c:668
-#: 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?"
@@ -19921,35 +20407,35 @@ msgstr ""
 # mail/mail-callbacks.c:838
 # mail/mail-callbacks.c:928
 # mail/mail-callbacks.c:878
-#: mail/mail-callbacks.c:1207
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "未知的发件人"
 
 # mail/mail-callbacks.c:843
 # mail/mail-callbacks.c:933
 # mail/mail-callbacks.c:883
-#: mail/mail-callbacks.c:1211
+#: mail/mail-callbacks.c:1191
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "在 %Y-%m-%d %a 的 %H:%M， %%s 写道："
 
 # mail/mail-callbacks.c:1281 mail/message-browser.c:130
 # mail/mail-callbacks.c:1376 mail/message-browser.c:130
 # mail/mail-callbacks.c:1411 mail/message-browser.c:130
-#: 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:1283 mail/message-browser.c:132
 # mail/mail-callbacks.c:1378 mail/message-browser.c:132
 # mail/mail-callbacks.c:1413 mail/message-browser.c:132
-#: 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:1759
 # mail/mail-callbacks.c:1878
 # mail/mail-callbacks.c:1914
-#: 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 个消息？"
@@ -19957,7 +20443,7 @@ msgstr "您确信您需要编辑所有的 %d 个消息？"
 # mail/mail-callbacks.c:1784
 # mail/mail-callbacks.c:1903
 # mail/mail-callbacks.c:1939
-#: mail/mail-callbacks.c:2406
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -19968,7 +20454,7 @@ msgstr ""
 # mail/mail-callbacks.c:1823
 # mail/mail-callbacks.c:1942
 # mail/mail-callbacks.c:1978
-#: mail/mail-callbacks.c:2445
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -19979,7 +20465,7 @@ msgstr ""
 # mail/mail-callbacks.c:1837
 # mail/mail-callbacks.c:1956
 # mail/mail-callbacks.c:1992
-#: 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 个消息？"
@@ -19987,56 +20473,77 @@ msgstr "您确信您希望重新发送所有的 %d 个消息？"
 # mail/mail-callbacks.c:1863
 # mail/mail-callbacks.c:1982
 # mail/mail-callbacks.c:2018
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "没有选择消息"
 
-# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1908
-# mail/mail-display.c:102
-# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:2027
-# mail/mail-display.c:102
-# calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2063
-# mail/mail-display.c:101
-#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
-msgid "Overwrite file?"
-msgstr "覆盖文件？"
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:221
+# camel/providers/local/camel-maildir-folder.c:230
+# camel/providers/local/camel-mbox-folder.c:331
+# camel/providers/local/camel-mh-folder.c:198
+# camel/providers/local/camel-mh-folder.c:207
+# camel/providers/local/camel-mh-folder.c:215
+# camel/providers/local/camel-spool-folder.c:579
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:221
+# camel/providers/local/camel-maildir-folder.c:230
+# camel/providers/local/camel-mbox-folder.c:331
+# camel/providers/local/camel-mh-folder.c:198
+# camel/providers/local/camel-mh-folder.c:207
+# camel/providers/local/camel-mh-folder.c:215
+# camel/providers/local/camel-spool-folder.c:579
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:221
+# camel/providers/local/camel-maildir-folder.c:230
+# camel/providers/local/camel-mbox-folder.c:331
+# camel/providers/local/camel-mh-folder.c:198
+# camel/providers/local/camel-mh-folder.c:207
+# camel/providers/local/camel-mh-folder.c:215
+# camel/providers/local/camel-spool-folder.c:579
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"无法获取邮件： %s\n"
+"  %s"
+
+# addressbook/gui/contact-editor/e-contact-save-as.c:201
+# addressbook/gui/contact-editor/e-contact-save-as.c:201
+# addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"%s 已经存在\n"
+"您打算覆盖它吗？"
 
 # mail/mail-callbacks.c:1962
 # mail/mail-callbacks.c:2081
 # mail/mail-callbacks.c:2117
-#: mail/mail-callbacks.c:2584
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "消息另存为..."
 
 # mail/mail-callbacks.c:1964
 # mail/mail-callbacks.c:2083
 # mail/mail-callbacks.c:2119
-#: mail/mail-callbacks.c:2586
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "消息另存为..."
 
-# ui/evolution-mail-message.xml.h:21
-# ui/evolution-mail-message.xml.h:21
-# ui/evolution-mail-message.xml.h:21
-#: mail/mail-callbacks.c:2655
-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 ""
-"本文件夹里没有更多新消息了。\n"
-"您愿意转入下一个文件夹？"
-
 # mail/mail-callbacks.c:2135
 # mail/mail-callbacks.c:2254
 # mail/mail-callbacks.c:2290
-#: 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 ""
@@ -20048,7 +20555,7 @@ msgstr ""
 # mail/mail-callbacks.c:2250
 # mail/mail-callbacks.c:2369
 # mail/mail-callbacks.c:2405
-#: mail/mail-callbacks.c:3018
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -20060,14 +20567,14 @@ msgstr ""
 # mail/mail-callbacks.c:2262
 # mail/mail-callbacks.c:2381
 # mail/mail-callbacks.c:2417
-#: mail/mail-callbacks.c:3030
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "过滤规则"
 
 # camel/camel-filter-driver.c:789
 # camel/camel-filter-driver.c:838
 # mail/mail-callbacks.c:2490
-#: mail/mail-callbacks.c:3074
+#: mail/mail-callbacks.c:2831
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d 页，共 %d 页"
@@ -20075,71 +20582,80 @@ msgstr "第 %d 页，共 %d 页"
 # mail/mail-callbacks.c:2325
 # mail/mail-callbacks.c:2465
 # mail/mail-callbacks.c:2542
-#: mail/mail-callbacks.c:3129
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "打印消息"
 
-# mail/mail-callbacks.c:2492
-# mail/mail-callbacks.c:2569
-#: mail/mail-callbacks.c:3156
-msgid "US-Letter"
-msgstr "美国信纸"
-
 # mail/mail-callbacks.c:2371
 # mail/mail-callbacks.c:2531
 # mail/mail-callbacks.c:2604
-#: mail/mail-callbacks.c:3197
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "打印消息失败"
 
 # mail/mail-callbacks.c:2473
 # mail/mail-callbacks.c:2697
 # mail/mail-callbacks.c:2770
-#: 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 ""
+# addressbook/gui/component/select-names/e-select-names-popup.c:506
+# addressbook/gui/component/select-names/e-select-names-popup.c:506
+# addressbook/gui/component/select-names/e-select-names-popup.c:506
+#: 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:335
+#, fuzzy
+msgid "You must specify a valid script name."
+msgstr "请给出有效的脚本名"
 
 # mail/mail-config.glade.h:119
 # mail/mail-config.glade.h:119
 # my-evolution/e-summary-calendar.c:395
-#: 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:393 mail/mail-composer-prefs.c:455
+#, fuzzy
+msgid "[script]"
 msgstr " [脚本]"
 
-#: mail/mail-composer-prefs.c:309
-msgid "Please specify a valid script name"
-msgstr "请给出有效的脚本名"
-
-# addressbook/gui/component/select-names/e-select-names-popup.c:506
-# addressbook/gui/component/select-names/e-select-names-popup.c:506
-# addressbook/gui/component/select-names/e-select-names-popup.c:506
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
-msgid "Unnamed"
-msgstr "未命名"
+# calendar/gui/dialogs/meeting-page.etspec.h:6
+# calendar/gui/e-meeting-time-sel.etspec.h:6
+# calendar/gui/dialogs/meeting-page.etspec.h:6
+# calendar/gui/e-meeting-time-sel.etspec.h:6
+# calendar/gui/dialogs/meeting-page.etspec.h:6
+# calendar/gui/e-meeting-time-sel.etspec.h:6
+#: mail/mail-composer-prefs.c:864
+#, fuzzy
+msgid "Language(s)"
+msgstr "语言"
 
-#: mail/mail-composer-prefs.c:875
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr "添加脚本签名"
 
-# mail/mail-account-gui.c:1039
-# mail/mail-account-gui.c:1039
-# mail/mail-account-gui.c:1036
-#: mail/mail-composer-prefs.c:876
-msgid "Add Signature"
-msgstr "添加签名"
+# mail/mail-config.glade.h:116
+# mail/mail-config.glade.h:116
+# mail/mail-config.glade.h:125
+#: mail/mail-composer-prefs.c:926
+#, fuzzy
+msgid "Signature(s)"
+msgstr "签名(_S)"
+
+# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+# mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
+#: 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:146
 # mail/mail-config-druid.c:146
-#: 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 "
@@ -20149,10 +20665,18 @@ msgstr ""
 "请在下面输入您的名字和电子邮件地址。“可选”域可以不填写，\n"
 "除非您希望在您发送的邮件中含有这些信息。"
 
+# mail/mail-config.glade.h:62
+# mail/mail-config.glade.h:62
+# mail/mail-config.glade.h:71
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "正在接收邮件(_R)"
+
 # mail/mail-config-druid.c:148
 # mail/mail-config-druid.c:148
 # mail/mail-config-druid.c:148
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:390
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -20164,14 +20688,22 @@ msgstr ""
 # mail/mail-config-druid.c:150
 # mail/mail-config-druid.c:150
 # mail/mail-config-druid.c:150
-#: mail/mail-config-druid.c:150
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "请从以下选项中选择"
 
+# mail/mail-config.glade.h:71
+# mail/mail-config.glade.h:71
+# mail/mail-config.glade.h:80
+#: mail/mail-config-druid.c:400
+#, fuzzy
+msgid "Sending Mail"
+msgstr "正在发送邮件(_S)"
+
 # mail/mail-config-druid.c:152
 # mail/mail-config-druid.c:152
 # mail/mail-config-druid.c:152
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:402
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -20180,10 +20712,17 @@ msgstr ""
 "请输入您发送邮件的方式的信息。如果您不能确定，\n"
 "请询问您的系统管理员或互联网服务提供商。"
 
+# mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+# mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+# mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "帐号管理"
+
 # mail/mail-config-druid.c:154
 # mail/mail-config-druid.c:154
 # mail/mail-config-druid.c:154
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:409
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -20197,104 +20736,77 @@ msgstr ""
 "请在下面输入该帐号的名称。\n"
 "该名称仅用于显示。"
 
-# mail/mail-config-druid.c:599
-# mail/mail-config-druid.c:599
-# mail/mail-config-druid.c:599
-#. set window title
-#: mail/mail-config-druid.c:637
-msgid "Evolution Account Assistant"
-msgstr "Evolution 帐号助手"
-
-# mail/mail-config.c:326
-# mail/mail-config.c:329
-# mail/mail-config.c:354
-#: mail/mail-config.c:622
-#, c-format
-msgid "Account %d"
-msgstr "帐号 %d"
-
 # mail/mail-config.c:2113
 # mail/mail-config.c:2155
 # mail/mail-config.c:2248
-#: mail/mail-config.c:2316
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "正在检查服务"
 
 # mail/mail-config.c:2184 mail/mail-config.c:2188
 # mail/mail-config.c:2233 mail/mail-config.c:2237
 # mail/mail-config.c:2326 mail/mail-config.c:2330
-#: 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:1
 # mail/mail-config.glade.h:1
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr "检查支持的类型(_C) "
 
 # mail/mail-config.glade.h:3
 # mail/mail-config.glade.h:3
 # mail/mail-config.glade.h:3
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(在该版本的 evolution 中不支持SSL)"
 
 # mail/mail-config.glade.h:3
 # mail/mail-config.glade.h:3
 # mail/mail-config.glade.h:3
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(在该版本的 evolution 中不支持SSL)"
 
 # mail/mail-config.glade.h:4
 # mail/mail-config.glade.h:4
 # mail/mail-config.glade.h:4
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "当发送加密邮件时总是对自身加密(_L)"
 
-#: mail/mail-config.glade.h:5
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-
 # mail/mail-config.c:326
 # mail/mail-config.c:329
 # mail/mail-config.c:354
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
 msgid "Account Editor"
 msgstr "帐号编辑器"
 
 # mail/mail-config.glade.h:6
 # mail/mail-config.glade.h:6
 # mail/mail-config.glade.h:6
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "帐号信息"
 
-# mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
-# mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
-# mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
-#: 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 "添加脚本(_R)"
 
 # mail/mail-account-gui.c:1039
 # mail/mail-account-gui.c:1039
 # mail/mail-account-gui.c:1036
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "Add new signature..."
 msgstr "添加新签名..."
 
 # mail/mail-config.glade.h:4
 # mail/mail-config.glade.h:4
 # mail/mail-config.glade.h:4
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "当发送加密邮件时总是对自身加密(_L)"
@@ -20302,63 +20814,63 @@ msgstr "当发送加密邮件时总是对自身加密(_L)"
 # mail/mail-config.glade.h:10
 # mail/mail-config.glade.h:10
 # mail/mail-config.glade.h:10
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "当使用该帐号的时候总是签名发送的邮件(_S)"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "总是暗送到(_B)："
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "总是抄送到(_C)："
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "加密时总是信任我的密钥环中的密钥(_T)"
 
 # composer/e-msg-composer-attachment-bar.c:532
 # composer/e-msg-composer-attachment-bar.c:538
 # composer/e-msg-composer-attachment-bar.c:538
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "附加原始消息"
 
 # mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 # mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 # mail/mail-config.glade.h:13 mail/message-list.etspec.h:1
-#: 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:12
 # mail/mail-config.glade.h:12
 # mail/mail-config.glade.h:14
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "身份验证"
 
 # mail/mail-config.glade.h:94
 # mail/mail-config.glade.h:94
 # mail/mail-config.glade.h:103
-#: 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 ""
 
 # widgets/misc/e-charset-picker.c:159
 # widgets/misc/e-charset-picker.c:159
 # widgets/misc/e-charset-picker.c:162
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "C_haracter set:"
 msgstr "字符集(_H)"
 
@@ -20368,53 +20880,54 @@ msgstr "字符集(_H)"
 # ui/evolution-comp-editor.xml.h:1
 # calendar/gui/alarm-notify/alarm-notify.glade.h:1
 # ui/evolution-comp-editor.xml.h:1
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "C_olors"
 msgstr "颜色(_O)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "在我输入时进行拼写检查(_T)"
 
 # mail/mail-config.glade.h:13
 # mail/mail-config.glade.h:13
 # mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "正在检查新邮件"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "给错误拼写的单词上色(_M)："
 
 # composer/e-msg-composer.c:1970 composer/e-msg-composer.c:2423
 # composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
 # mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "正在撰写邮件"
 
 # mail/mail-config.glade.h:15
 # mail/mail-config.glade.h:15
 # mail/mail-config.glade.h:19
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "配置"
 
 # mail/mail-config.glade.h:17
 # mail/mail-config.glade.h:17
 # mail/mail-config.glade.h:21
-#: 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"
@@ -20426,14 +20939,14 @@ msgstr ""
 # mail/mail-config.glade.h:23
 # mail/mail-config.glade.h:23
 # mail/mail-config.glade.h:27
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "默认(_F)"
 
 # mail/mail-config.glade.h:23
 # mail/folder-browser.h:26
 # mail/folder-browser.h:26
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default Behavior"
 msgstr "默认"
@@ -20441,7 +20954,7 @@ msgstr "默认"
 # mail/mail-config.glade.h:25
 # mail/mail-config.glade.h:25
 # mail/mail-config.glade.h:29
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "默认字符编码： "
@@ -20449,7 +20962,7 @@ msgstr "默认字符编码： "
 # mail/mail-ops.c:249
 # mail/mail-ops.c:250
 # mail/mail-ops.c:258
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "正在收取邮件"
@@ -20457,104 +20970,111 @@ msgstr "正在收取邮件"
 # mail/mail-config.glade.h:27
 # mail/mail-config.glade.h:27
 # mail/mail-config.glade.h:32
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digital IDs..."
 msgstr "数字标识..."
 
 # camel/camel-filter-driver.c:692
 # camel/camel-filter-driver.c:741
 # camel/camel-filter-driver.c:893
-#: 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 "不要签名会议请求(_M)(同 Outlook 兼容)"
 
 # mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 # mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 # mail/mail-config.glade.h:35 shell/glade/evolution-startup-wizard.glade.h:2
-#: 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:97
 # mail/mail-config.glade.h:97
 # mail/mail-config.glade.h:106
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "草稿文件夹(_F)："
 
 # mail/mail-config.glade.h:31
 # mail/mail-config.glade.h:31
 # mail/mail-config.glade.h:37
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "启用(_N)"
 
 # 	my-evolution/metar.c:65
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Emacs"
 msgstr "Emacs"
 
 # addressbook/gui/component/addressbook.c:805
 # addressbook/gui/component/addressbook.c:805
 # addressbook/gui/component/addressbook.c:838
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "电子邮件"
 
 # mail/mail-config.glade.h:99
 # mail/mail-config.glade.h:99
 # addressbook/gui/component/addressbook-config.glade.h:35
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "电子邮件地址(_A)："
 
 # mail/mail-config.glade.h:100
 # mail/mail-config.glade.h:100
 # mail/mail-config.glade.h:109
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "退出时清空已删除邮件(_T)"
 
+# mail/mail-config-druid.c:599
+# mail/mail-config-druid.c:599
+# mail/mail-config-druid.c:599
+#: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr "Evolution 帐号助手"
+
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:54
+#: 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 "固定宽度(_X)："
 
 # mail/folder-browser-ui.c:274
 # mail/folder-browser-ui.c:274
 # mail/folder-browser-ui.c:275
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Font Properties"
 msgstr "字体属性"
 
 # mail/mail-ops.c:1191
 # mail/mail-ops.c:1193
 # mail/mail-ops.c:1236
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Format messages in _HTML"
 msgstr "用 HTML 格式化邮件(_H)"
 
 # mail/mail-config.glade.h:34
 # mail/mail-config.glade.h:34
 # mail/mail-config.glade.h:41
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr "获取数字标识..."
 
 # mail/mail-config.glade.h:103
 # mail/mail-config.glade.h:103
 # mail/mail-config.glade.h:112
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "突出显示引文，使用(_H)"
@@ -20562,28 +21082,21 @@ msgstr "突出显示引文，使用(_H)"
 # mail/mail-config.glade.h:36
 # mail/mail-config.glade.h:36
 # mail/mail-config.glade.h:43
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
-# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
-# mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr "标识"
-
 # mail/mail-config.glade.h:39
 # mail/mail-config.glade.h:39
 # mail/mail-config.glade.h:46
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "嵌入"
 
 # mail/mail-config.glade.h:40
 # mail/mail-config.glade.h:40
 # mail/mail-config.glade.h:47
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos"
 
@@ -20596,7 +21109,7 @@ msgstr "Kerberos"
 # ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 # ui/evolution-contact-list-editor.xml.h:6
 # ui/evolution-signature-editor.xml.h:4
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "保存并关闭"
@@ -20604,7 +21117,7 @@ msgstr "保存并关闭"
 # ui/evolution-mail-message.xml.h:42
 # ui/evolution-mail-message.xml.h:42
 # ui/evolution-mail-message.xml.h:42
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "装入图像(_I)"
@@ -20612,21 +21125,21 @@ msgstr "装入图像(_I)"
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:48
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "邮件配置"
 
 # mail/mail-config.glade.h:43
 # mail/mail-config.glade.h:43
 # mail/mail-config.glade.h:50
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "邮件箱位置"
 
 # views/mail/galview.xml.h:4
 # views/mail/galview.xml.h:4
 # views/mail/galview.xml.h:4
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "邮件"
@@ -20634,15 +21147,23 @@ msgstr "邮件"
 # ui/evolution-mail-message.xml.h:99
 # ui/evolution-mail-message.xml.h:99
 # ui/evolution-mail-message.xml.h:101
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "邮件显示(_M)"
 
+# default_user/searches.xml.h:4
+# default_user/searches.xml.h:4
+# default_user/searches.xml.h:4
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "邮件含有"
+
 # addressbook/gui/contact-editor/fulladdr.glade.h:138
 # addressbook/gui/contact-editor/fulladdr.glade.h:138
 # addressbook/gui/contact-editor/e-contact-editor-address.c:264
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Microsoft"
 msgstr "密克罗尼西亚"
@@ -20650,52 +21171,48 @@ msgstr "密克罗尼西亚"
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:53
-#: 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:48
 # mail/mail-config.glade.h:48
 # mail/mail-config.glade.h:56
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "可选的信息"
 
 # addressbook/gui/contact-editor/contact-editor.glade.h:23
 # addressbook/gui/contact-editor/contact-editor.glade.h:23
 # addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Or_ganization:"
 msgstr "组织(_G)："
 
 # mail/mail-config.glade.h:50
 # mail/mail-config.glade.h:50
 # mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 键标识(_K)："
 
 # mail/mail-config.glade.h:53
 # mail/mail-config.glade.h:53
 # mail/mail-config.glade.h:61
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "选取一个颜色"
 
 # mail/mail-config.glade.h:57
 # mail/mail-config.glade.h:57
 # mail/mail-config.glade.h:66
-#: 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 "在发送只给出了暗送收件人时进行提示(_B)"
@@ -20703,14 +21220,14 @@ msgstr "在发送只给出了暗送收件人时进行提示(_B)"
 # mail/mail-config.glade.h:54
 # mail/mail-config.glade.h:54
 # mail/mail-config.glade.h:63
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
 # ui/evolution-addressbook.xml.h:18
 # ui/evolution-addressbook.xml.h:18
 # ui/evolution-addressbook.xml.h:18
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "打印选中的联系人"
@@ -20718,14 +21235,14 @@ msgstr "打印选中的联系人"
 # mail/mail-config.glade.h:58
 # mail/mail-config.glade.h:58
 # mail/mail-config.glade.h:67
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr "Qmail 邮件目录"
 
 # camel/camel-filter-driver.c:692
 # camel/camel-filter-driver.c:741
 # camel/camel-filter-driver.c:893
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Quote original message"
 msgstr "无法打开消息"
@@ -20733,21 +21250,21 @@ msgstr "无法打开消息"
 # mail/mail-config.glade.h:59
 # mail/mail-config.glade.h:59
 # mail/mail-config.glade.h:68
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr "已引用"
 
 # mail/mail-config.glade.h:60
 # mail/mail-config.glade.h:60
 # mail/mail-config.glade.h:69
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr "记住该密码(_M)"
 
 # composer/e-msg-composer-hdrs.c:364
 # composer/e-msg-composer-hdrs.c:364
 # composer/e-msg-composer-hdrs.c:362
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "回复到："
@@ -20755,14 +21272,14 @@ msgstr "回复到："
 # mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 # mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 # mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:6
-#: 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:63
 # mail/mail-config.glade.h:63
 # mail/mail-config.glade.h:72
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "接收中选项"
@@ -20770,7 +21287,7 @@ msgstr "接收中选项"
 # e-util/e-passwords.c:360 mail/mail-session.c:267
 # e-util/e-passwords.c:360 mail/mail-session.c:267
 # e-util/e-passwords.c:360 mail/mail-session.c:269
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Remember this _password"
 msgstr "记住该密码"
@@ -20778,14 +21295,14 @@ msgstr "记住该密码"
 # mail/mail-config.glade.h:64
 # mail/mail-config.glade.h:64
 # mail/mail-config.glade.h:73
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "必需的信息"
 
 # mail/mail-config.glade.h:23
 # mail/folder-browser.h:26
 # mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "默认"
@@ -20793,7 +21310,7 @@ msgstr "默认"
 # mail/mail-config.glade.h:67
 # mail/mail-config.glade.h:67
 # mail/mail-config.glade.h:76
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "S_ecurity"
 msgstr "安全"
@@ -20801,86 +21318,82 @@ msgstr "安全"
 # mail/mail-config.glade.h:66
 # mail/mail-config.glade.h:66
 # mail/mail-config.glade.h:75
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "安全 MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr "选择 HTML 固定宽度字体"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr "选择用于打印的 HTML 固定宽度字体"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr "选择 HTML 变宽度字体"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr "选择用于打印的 HTML 变宽度字体"
 
 # mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 # mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 # mail/mail-config.glade.h:79 shell/glade/evolution-startup-wizard.glade.h:7
-#: 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:74
 # mail/mail-config.glade.h:74
 # mail/mail-config.glade.h:83
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "发送邮件文件夹(_M)："
 
 # mail/mail-config.glade.h:75
 # mail/mail-config.glade.h:75
 # mail/mail-config.glade.h:84
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "已发送和草稿邮件"
 
 # mail/mail-config.glade.h:76
 # mail/mail-config.glade.h:76
 # mail/mail-config.glade.h:85
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr "服务器需要认证(_V)"
 
 # mail/mail-config.glade.h:77
 # mail/mail-config.glade.h:77
 # mail/mail-config.glade.h:86
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "服务器配置"
 
 # mail/mail-config.glade.h:78
 # mail/mail-config.glade.h:78
 # mail/mail-config.glade.h:87
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "服务器类型(_T)："
 
 # shell/e-shortcuts.c:1043
 # shell/e-shortcuts.c:1043
 # shell/e-shortcuts.c:1043
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "Shortcuts _type:"
 msgstr "快捷方式类型(_T)："
 
 # addressbook/printing/e-contact-print.glade.h:38
 # addressbook/printing/e-contact-print.glade.h:38
 # mail/mail-config.glade.h:92
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "Specify _filename:"
 msgstr "指定文件名(_F)："
 
-#: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
-msgstr "拼写检查语言"
-
 #: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr "拼写检查(_C)"
@@ -20923,10 +21436,11 @@ msgstr "变宽度(_A)："
 # mail/mail-config.glade.h:87
 # mail/mail-config.glade.h:96
 #: 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"
@@ -21033,56 +21547,52 @@ msgstr "新邮件到达时不要提醒我(_D)"
 msgid "_Enable"
 msgstr "启用(_E)"
 
-#: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr "固定宽度(_F)："
-
 # ui/evolution-mail-message.xml.h:32
 # ui/evolution-mail-message.xml.h:32
 # ui/evolution-mail-message.xml.h:32
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:152
 msgid "_Forward style:"
 msgstr "转发方式(_F)："
 
 # mail/mail-config.glade.h:101
 # mail/mail-config.glade.h:101
 # mail/mail-config.glade.h:110
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "全名(_F)："
 
 # mail/mail-config.glade.h:38
 # mail/mail-config.glade.h:38
 # mail/mail-config.glade.h:45
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr "HTML 邮件(_H)"
 
 # mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 # mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 # mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr "标识(_I)"
 
 # mail/mail-config.glade.h:105
 # mail/mail-config.glade.h:105
 # mail/mail-config.glade.h:114
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "如果发件人在地址簿中就装入图像(_L)"
 
 # mail/mail-config.glade.h:44
 # mail/mail-config.glade.h:44
 # mail/mail-config.glade.h:51
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "使它成为我的默认帐号(_M)"
 
 # mail/mail-config.glade.h:107
 # mail/mail-config.glade.h:107
 # mail/mail-config.glade.h:116
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "阅读时将邮件标记为已读，延时(_M)"
@@ -21090,26 +21600,26 @@ msgstr "阅读时将邮件标记为已读，延时(_M)"
 # mail/mail-config.glade.h:108
 # mail/mail-config.glade.h:108
 # mail/mail-config.glade.h:117
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "名称(_N)："
 
 # mail/mail-config.glade.h:109
 # mail/mail-config.glade.h:109
 # mail/mail-config.glade.h:118
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "从不离线装入图像(_N)"
 
 # mail/mail-config.glade.h:62
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr "新邮件到达时播放声音文件(_P)"
 
 # mail/mail-config.glade.h:55
 # mail/mail-config.glade.h:55
 # mail/mail-config.glade.h:64
-#: 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 消息的联系人发送 HTML 消息的时候进行提示"
@@ -21117,7 +21627,7 @@ msgstr "在往不希望接收 HTML 消息的联系人发送 HTML 消息的时候
 # mail/mail-config.glade.h:56
 # mail/mail-config.glade.h:56
 # mail/mail-config.glade.h:65
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "在发送空标题的消息时进行提示(_E)"
@@ -21125,32 +21635,32 @@ msgstr "在发送空标题的消息时进行提示(_E)"
 # mail/mail-config.glade.h:62
 # mail/mail-config.glade.h:62
 # mail/mail-config.glade.h:71
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr "正在接收邮件(_R)"
 
 # ui/evolution-mail-message.xml.h:71
 # ui/evolution-mail-message.xml.h:71
 # ui/evolution-mail-message.xml.h:73
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "回复风格(_R)："
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr "恢复默认值(_R)"
 
 # ui/evolution-message-composer.xml.h:54
 # ui/evolution-message-composer.xml.h:54
 # ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "脚本(_S)："
 
 # mail/mail-config.glade.h:71
 # mail/mail-config.glade.h:71
 # mail/mail-config.glade.h:80
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "正在发送邮件(_S)"
 
@@ -21160,49 +21670,62 @@ msgstr "正在发送邮件(_S)"
 # calendar/gui/e-calendar-table.etspec.h:13
 # calendar/gui/dialogs/event-page.glade.h:11
 # calendar/gui/e-calendar-table.etspec.h:13
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "显示动画图像(_S)"
 
 # mail/mail-config.glade.h:116
 # mail/mail-config.glade.h:116
 # mail/mail-config.glade.h:125
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "签名(_S)"
 
+# addressbook/gui/contact-editor/fulladdr.glade.h:183
+# addressbook/gui/contact-editor/fulladdr.glade.h:183
+# my-evolution/Locations.h:1987
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "圣马力诺"
+
+# addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+# addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+# addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "原联系人："
+
 # mail/mail-config.glade.h:86
 # mail/mail-config.glade.h:86
 # mail/mail-config.glade.h:95
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "使用安全连接 (SSL)(_U)："
 
-# my-evolution/metar.c:63
-# my-evolution/metar.c:63
-# my-evolution/metar.c:63
-#: mail/mail-config.glade.h:176
-msgid "_Variable-width:"
-msgstr "可变宽度(_V)："
+#: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
 
 # mail/mail-config.glade.h:118
 # mail/mail-config.glade.h:118
 # mail/mail-config.glade.h:127
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_every"
 msgstr "每(_E)"
 
 # mail/mail-config.glade.h:2
 # mail/mail-config.glade.h:2
 # mail/mail-config.glade.h:2
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr "颜色"
 
 # mail/mail-config.glade.h:119
 # mail/mail-config.glade.h:119
 # mail/mail-config.glade.h:128
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "描述"
 
@@ -21241,17 +21764,32 @@ msgstr "无法创建 S/MIME 信封上下文。"
 msgid "Could not create a S/MIME decode context."
 msgstr "无法创建 S/MIME 解码上下文。"
 
+# calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1915
+# mail/mail-display.c:106
+# calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:2034
+# mail/mail-display.c:106
+# calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2070
+# mail/mail-display.c:105
+#: mail/mail-display.c:193
+#, fuzzy, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"指定名称的文件已经存在。\n"
+"覆盖它？"
+
 # mail/mail-display.c:243
 # mail/mail-display.c:242
 # mail/mail-display.c:243
-#: mail/mail-display.c:321
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "保存附件"
 
 # mail/folder-browser.c:297 mail/mail-display.c:298
 # mail/folder-browser.c:297 mail/mail-display.c:297
 # mail/folder-browser.c:298 mail/mail-display.c:298
-#: mail/mail-display.c:386
+#: mail/mail-display.c:406
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "无法创建临时文件“%s”： %s"
@@ -21259,21 +21797,21 @@ msgstr "无法创建临时文件“%s”： %s"
 # mail/mail-display.c:243
 # mail/mail-display.c:242
 # mail/mail-display.c:243
-#: mail/mail-display.c:432
+#: mail/mail-display.c:454
 msgid "Save Attachment..."
 msgstr "保存附件..."
 
 # mail/mail-display.c:352
 # mail/mail-display.c:351
 # mail/mail-display.c:352
-#: mail/mail-display.c:433
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr "嵌入视图"
 
 # mail/mail-display.c:354
 # mail/mail-display.c:353
 # mail/mail-display.c:354
-#: mail/mail-display.c:434
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 中打开..."
@@ -21281,7 +21819,7 @@ msgstr "在 %s 中打开..."
 # mail/mail-display.c:415
 # mail/mail-display.c:414
 # mail/mail-display.c:415
-#: mail/mail-display.c:494
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "嵌入视图 (通过 %s)"
@@ -21289,40 +21827,40 @@ msgstr "嵌入视图 (通过 %s)"
 # mail/mail-display.c:419
 # mail/mail-display.c:418
 # mail/mail-display.c:419
-#: mail/mail-display.c:498
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "隐藏"
 
 # mail/mail-display.c:440
 # mail/mail-display.c:439
 # mail/mail-display.c:440
-#: mail/mail-display.c:519
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "外部视图"
 
 # ui/evolution-mail-message.xml.h:42
 # ui/evolution-mail-message.xml.h:42
 # ui/evolution-mail-message.xml.h:42
-#: mail/mail-display.c:1319
+#: mail/mail-display.c:1365
 msgid "Downloading images"
 msgstr "正在下载图像"
 
 # mail/mail-display.c:1133
 # mail/mail-display.c:1136
 # mail/mail-display.c:1162
-#: mail/mail-display.c:1496
+#: mail/mail-display.c:1542
 msgid "Loading message content"
 msgstr "装入邮件内容"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: mail/mail-display.c:1783
+#: mail/mail-display.c:1879
 #, fuzzy
 msgid "Overdue:"
 msgstr "被延误的任务(_V)："
 
-#: 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"
@@ -21330,28 +21868,28 @@ msgstr "%b %d %l:%M %p"
 # mail/mail-display.c:1602
 # mail/mail-display.c:1628
 # mail/mail-display.c:1657
-#: mail/mail-display.c:2114
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "在浏览器中打开连接"
 
 # mail/mail-display.c:1604
 # mail/mail-display.c:1630
 # mail/mail-display.c:1659
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "复制连接位置"
 
 # mail/mail-display.c:1607
 # mail/mail-display.c:1633
 # mail/mail-display.c:1662
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "连接保存为 (FIXME)"
 
 # mail/mail-display.c:1610
 # mail/mail-display.c:1636
 # mail/mail-display.c:1665
-#: mail/mail-display.c:2119
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "图像保存为..."
 
@@ -21361,7 +21899,7 @@ msgstr "图像保存为..."
 # importers/pine-importer.c:471
 # importers/elm-importer.c:375 importers/netscape-importer.c:782
 # importers/pine-importer.c:471
-#: mail/mail-folder-cache.c:743
+#: mail/mail-folder-cache.c:744
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "正在扫描 %s"
@@ -21369,7 +21907,7 @@ msgstr "正在扫描 %s"
 # mail/mail-format.c:635
 # mail/mail-format.c:640
 # mail/mail-format.c:646
-#: mail/mail-format.c:656
+#: mail/mail-format.c:640
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附件"
@@ -21377,76 +21915,65 @@ msgstr "%s 附件"
 # mail/mail-format.c:680
 # mail/mail-format.c:686
 # mail/mail-format.c:692
-#: 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:763
 # mail/mail-format.c:769
 # mail/mail-format.c:775
-#: 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:846
 # mail/mail-format.c:861
 # mail/mail-format.c:867
-#: mail/mail-format.c:870
+#: mail/mail-format.c:845
 msgid "Bad Address"
 msgstr "无效地址"
 
 # mail/mail-format.c:886 mail/message-list.etspec.h:3
 # mail/mail-format.c:904 mail/message-list.etspec.h:3
 # mail/mail-format.c:910 mail/message-list.etspec.h:3
-#: 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:889
 # mail/mail-format.c:908
 # mail/mail-format.c:914
-#: mail/mail-format.c:917
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "回复至"
 
 # mail/mail-format.c:893 mail/message-list.etspec.h:10
 # mail/mail-format.c:913 mail/message-list.etspec.h:11
 # mail/mail-format.c:919 mail/message-list.etspec.h:11
-#: 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:897
 # mail/mail-format.c:918
 # mail/mail-format.c:924
-#: mail/mail-format.c:927
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "抄送"
 
 # mail/mail-format.c:901
 # mail/mail-format.c:923
 # mail/mail-format.c:929
-#: mail/mail-format.c:932
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "密件抄送"
 
-# importers/elm-importer.c:525 importers/netscape-importer.c:958
-# importers/pine-importer.c:637 mail/component-factory.c:100
-# importers/elm-importer.c:525 importers/netscape-importer.c:958
-# importers/pine-importer.c:637 mail/component-factory.c:100
-# importers/elm-importer.c:525 importers/netscape-importer.c:958
-# importers/pine-importer.c:637 mail/component-factory.c:100
-#: mail/mail-format.c:963
-#, fuzzy
-msgid "Mailer"
-msgstr "邮件"
-
 # mail/mail-format.c:1813
 # mail/mail-format.c:1749
 # mail/mail-format.c:1768
-#: mail/mail-format.c:1848
+#: mail/mail-format.c:1451
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
@@ -21454,7 +21981,7 @@ msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
 # mail/mail-crypto.c:84
 # mail/mail-crypto.c:84
 # mail/mail-crypto.c:84
-#: mail/mail-format.c:1875
+#: mail/mail-format.c:1479
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "无法创建 PGP 验证上下文。"
@@ -21462,21 +21989,21 @@ msgstr "无法创建 PGP 验证上下文。"
 # mail/mail-format.c:1844
 # mail/mail-format.c:1780
 # mail/mail-format.c:1799
-#: 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:1852
 # mail/mail-format.c:1788
 # mail/mail-format.c:1807
-#: 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:2068
 # mail/mail-format.c:2003
 # mail/mail-format.c:2022
-#: mail/mail-format.c:2157
+#: mail/mail-format.c:1758
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "指向 FTP 站点 (%s)"
@@ -21484,7 +22011,7 @@ msgstr "指向 FTP 站点 (%s)"
 # mail/mail-format.c:2082
 # mail/mail-format.c:2017
 # mail/mail-format.c:2036
-#: mail/mail-format.c:2171
+#: mail/mail-format.c:1769
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
@@ -21492,7 +22019,7 @@ msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
 # mail/mail-format.c:2087
 # mail/mail-format.c:2022
 # mail/mail-format.c:2041
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:1772
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "指向本地文件 (%s)"
@@ -21500,7 +22027,7 @@ msgstr "指向本地文件 (%s)"
 # mail/mail-format.c:2116
 # mail/mail-format.c:2051
 # mail/mail-format.c:2070
-#: mail/mail-format.c:2205
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "指向远程数据 (%s)"
@@ -21508,7 +22035,7 @@ msgstr "指向远程数据 (%s)"
 # mail/mail-format.c:2124
 # mail/mail-format.c:2059
 # mail/mail-format.c:2078
-#: mail/mail-format.c:2213
+#: mail/mail-format.c:1805
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "指向未知的外部数据 (“%s”类型)"
@@ -21516,14 +22043,14 @@ msgstr "指向未知的外部数据 (“%s”类型)"
 # mail/mail-format.c:2129
 # mail/mail-format.c:2064
 # mail/mail-format.c:2083
-#: mail/mail-format.c:2218
+#: mail/mail-format.c:1807
 msgid "Malformed external-body part."
 msgstr "格式不正确的 external-body 部分。"
 
 # shell/e-local-storage.c:636
 # shell/e-local-storage.c:636
 # shell/e-local-storage.c:636
-#: 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 "本地文件夹"
@@ -21531,14 +22058,14 @@ msgstr "本地文件夹"
 # mail/mail-local.c:626
 # mail/mail-local.c:626
 # mail/mail-local.c:626
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr "正在重新配置文件夹"
 
 # mail/mail-local.c:707
 # mail/mail-local.c:707
 # mail/mail-local.c:707
-#: 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"
@@ -21550,7 +22077,7 @@ msgstr ""
 # mail/mail-local.c:763
 # mail/mail-local.c:763
 # mail/mail-local.c:763
-#: mail/mail-local.c:808
+#: mail/mail-local.c:804
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "无法把文件夹元信息保存到 %s： %s"
@@ -21558,7 +22085,7 @@ msgstr "无法把文件夹元信息保存到 %s： %s"
 # mail/mail-local.c:815
 # mail/mail-local.c:815
 # mail/mail-local.c:815
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "无法删除文件夹元信息 %s： %s"
@@ -21574,7 +22101,7 @@ msgstr "将文件夹格式从“%s”改为“%s”"
 # mail/mail-local.c:1318
 # mail/mail-local.c:1318
 # mail/mail-local.c:1318
-#: 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."
@@ -21585,7 +22112,7 @@ msgstr ""
 # mail/mail-local.c:1416
 # mail/mail-local.c:1416
 # mail/mail-local.c:1416
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "重新配置 /%s"
@@ -21593,7 +22120,7 @@ msgstr "重新配置 /%s"
 # mail/mail-local.c:1407
 # mail/mail-local.c:1407
 # mail/mail-local.c:1407
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
 msgstr "您不能改变远程文件夹的格式。"
 
@@ -21624,35 +22151,35 @@ msgstr ""
 # mail/mail-mt.c:901
 # mail/mail-mt.c:901
 # mail/mail-mt.c:901
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "正在工作"
 
 # mail/mail-ops.c:86
 # mail/mail-ops.c:87
 # mail/mail-ops.c:87
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "正在过滤文件夹"
 
 # mail/mail-ops.c:249
 # mail/mail-ops.c:250
 # mail/mail-ops.c:258
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "正在收取邮件"
 
 # mail/mail-ops.c:489 mail/mail-ops.c:518
 # mail/mail-ops.c:491 mail/mail-ops.c:520
 # mail/mail-ops.c:534 mail/mail-ops.c:563
-#: 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:554
 # mail/mail-ops.c:556
 # mail/mail-ops.c:599
-#: mail/mail-ops.c:618
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "正在发送“%s”"
@@ -21660,7 +22187,7 @@ msgstr "正在发送“%s”"
 # mail/mail-ops.c:674
 # mail/mail-ops.c:676
 # mail/mail-ops.c:719
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "发送第 %d 个邮件，共 %d 个"
@@ -21668,7 +22195,7 @@ msgstr "发送第 %d 个邮件，共 %d 个"
 # mail/mail-ops.c:693
 # mail/mail-ops.c:695
 # mail/mail-ops.c:738
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "在第 %d 个邮件失败，共 %d 个"
@@ -21676,21 +22203,21 @@ msgstr "在第 %d 个邮件失败，共 %d 个"
 # mail/mail-ops.c:695 mail/mail-send-recv.c:537
 # mail/mail-ops.c:697 mail/mail-send-recv.c:545
 # mail/mail-ops.c:740 mail/mail-send-recv.c:545
-#: 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:788
 # mail/mail-ops.c:790
 # mail/mail-ops.c:833
-#: mail/mail-ops.c:853
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "把邮件保存到文件夹中"
 
 # mail/mail-ops.c:868
 # mail/mail-ops.c:870
 # mail/mail-ops.c:913
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "把邮件移动到 %s"
@@ -21698,7 +22225,7 @@ msgstr "把邮件移动到 %s"
 # mail/mail-ops.c:868
 # mail/mail-ops.c:870
 # mail/mail-ops.c:913
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "把邮件复制到 %s"
@@ -21706,7 +22233,7 @@ msgstr "把邮件复制到 %s"
 # mail/mail-ops.c:1008
 # mail/mail-ops.c:1010
 # mail/mail-ops.c:1053
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "正在“%s”中扫描文件夹"
@@ -21714,14 +22241,14 @@ msgstr "正在“%s”中扫描文件夹"
 # mail/mail-ops.c:1191
 # mail/mail-ops.c:1193
 # mail/mail-ops.c:1236
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "已转发邮件"
 
 # mail/mail-ops.c:1234
 # mail/mail-ops.c:1236
 # mail/mail-ops.c:1279
-#: mail/mail-ops.c:1277
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "正在打开文件夹 %s"
@@ -21729,7 +22256,7 @@ msgstr "正在打开文件夹 %s"
 # mail/mail-ops.c:1306
 # mail/mail-ops.c:1308
 # mail/mail-ops.c:1351
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "正在打开存储 %s"
@@ -21737,7 +22264,7 @@ msgstr "正在打开存储 %s"
 # mail/mail-ops.c:1375
 # mail/mail-ops.c:1377
 # mail/mail-ops.c:1420
-#: mail/mail-ops.c:1422
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "正在删除文件夹“%s”"
@@ -21745,7 +22272,7 @@ msgstr "正在删除文件夹“%s”"
 # mail/mail-ops.c:1469
 # mail/mail-ops.c:1471
 # mail/mail-ops.c:1514
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "正在存储文件夹“%s”"
@@ -21753,21 +22280,21 @@ msgstr "正在存储文件夹“%s”"
 # mail/mail-ops.c:1520
 # mail/mail-ops.c:1522
 # mail/mail-ops.c:1565
-#: mail/mail-ops.c:1567
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "正在刷新文件夹"
 
 # mail/mail-ops.c:1556
 # mail/mail-ops.c:1558
 # mail/mail-ops.c:1601
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1594
 msgid "Expunging folder"
 msgstr "正在删除文件夹"
 
 # mail/mail-ops.c:1605
 # mail/mail-ops.c:1607
 # mail/mail-ops.c:1650
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
 msgstr "正在检索邮件 %s"
@@ -21775,7 +22302,7 @@ msgstr "正在检索邮件 %s"
 # mail/mail-ops.c:1672
 # mail/mail-ops.c:1674
 # mail/mail-ops.c:1717
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "正在检索 %d 个邮件"
@@ -21783,7 +22310,7 @@ msgstr "正在检索 %d 个邮件"
 # mail/mail-ops.c:1758
 # mail/mail-ops.c:1760
 # mail/mail-ops.c:1803
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1801
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "正在保存 %d 个邮件"
@@ -21791,7 +22318,7 @@ msgstr "正在保存 %d 个邮件"
 # mail/mail-ops.c:1870
 # mail/mail-ops.c:1872
 # mail/mail-ops.c:1915
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1849
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -21803,7 +22330,7 @@ msgstr ""
 # mail/mail-ops.c:1898
 # mail/mail-ops.c:1900
 # mail/mail-ops.c:1943
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1877
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -21815,14 +22342,14 @@ msgstr ""
 # mail/mail-ops.c:1972
 # mail/mail-ops.c:1974
 # mail/mail-ops.c:2017
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1951
 msgid "Saving attachment"
 msgstr "正在保存附件"
 
 # mail/mail-ops.c:1988
 # mail/mail-ops.c:1990
 # mail/mail-ops.c:2033
-#: mail/mail-ops.c:2041
+#: mail/mail-ops.c:1968
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -21834,7 +22361,7 @@ msgstr ""
 # mail/mail-ops.c:2019
 # mail/mail-ops.c:2021
 # mail/mail-ops.c:2064
-#: mail/mail-ops.c:2071
+#: mail/mail-ops.c:1998
 #, c-format
 msgid "Could not write data: %s"
 msgstr "无法写数据： %s"
@@ -21842,7 +22369,7 @@ msgstr "无法写数据： %s"
 # mail/mail-ops.c:2088
 # mail/mail-ops.c:2090
 # mail/mail-ops.c:2133
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "断开与 %s 的连接"
@@ -21850,71 +22377,74 @@ msgstr "断开与 %s 的连接"
 # mail/mail-ops.c:2089
 # mail/mail-ops.c:2091
 # mail/mail-ops.c:2134
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "重新与 %s 连接"
 
-# mail/mail-search-dialogue.c:113
-# mail/mail-search-dialogue.c:113
-# mail/mail-search-dialogue.c:113
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "搜索(_S)"
-
 # mail/mail-search.c:137
 # mail/mail-search.c:137
 # mail/mail-search.c:137
-#: mail/mail-search.c:137
+#: mail/mail-search.c:150
 msgid "(Untitled Message)"
 msgstr "(无标题的消息)"
 
 # mail/mail-search.c:240
 # mail/mail-search.c:240
 # mail/mail-search.c:240
-#: mail/mail-search.c:240
+#: mail/mail-search.c:232
 msgid "Untitled Message"
 msgstr "无标题的消息"
 
 # mail/mail-search.c:244
 # mail/mail-search.c:244
 # mail/mail-search.c:244
-#: mail/mail-search.c:244
+#: mail/mail-search.c:234
 msgid "Empty Message"
 msgstr "空邮件"
 
 # mail/mail-search.c:291
 # mail/mail-search.c:291
 # mail/mail-search.c:291
-#: mail/mail-search.c:291
+#: mail/mail-search.c:282
 msgid "Find in Message"
 msgstr "在邮件中寻找"
 
+# addressbook/gui/search/e-addressbook-search-dialog.c:151
+# mail/mail-search.c:263
+# addressbook/gui/search/e-addressbook-search-dialog.c:151
+# mail/mail-search.c:263
+# addressbook/gui/search/e-addressbook-search-dialog.c:151
+# mail/mail-search.c:263
+#: mail/mail-search.c:285
+msgid "Search"
+msgstr "搜索"
+
 # mail/mail-search.c:321
 # mail/mail-search.c:321
 # mail/mail-search.c:321
-#: mail/mail-search.c:321
+#: mail/mail-search.c:311
 msgid "Case Sensitive"
 msgstr "大小写敏感"
 
 # mail/mail-search.c:323
 # mail/mail-search.c:323
 # mail/mail-search.c:323
-#: mail/mail-search.c:323
+#: mail/mail-search.c:313
 msgid "Search Forward"
 msgstr "向前搜索"
 
 # mail/mail-search.c:343
 # mail/mail-search.c:343
 # mail/mail-search.c:343
-#: mail/mail-search.c:343
+#: mail/mail-search.c:333
 msgid "Find:"
 msgstr "寻找："
 
 # mail/mail-search.c:346
 # mail/mail-search.c:346
 # mail/mail-search.c:346
-#: mail/mail-search.c:346
+#: mail/mail-search.c:336
 msgid "Matches:"
 msgstr "匹配："
 
@@ -21928,7 +22458,7 @@ msgstr "正在取消..."
 # mail/mail-send-recv.c:245
 # mail/mail-send-recv.c:251
 # mail/mail-send-recv.c:251
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "服务器： %s，类型： %s"
@@ -21936,7 +22466,7 @@ msgstr "服务器： %s，类型： %s"
 # mail/mail-send-recv.c:247
 # mail/mail-send-recv.c:253
 # mail/mail-send-recv.c:253
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "路径： %s，类型： %s"
@@ -21944,7 +22474,7 @@ msgstr "路径： %s，类型： %s"
 # mail/mail-send-recv.c:249
 # mail/mail-send-recv.c:255
 # mail/mail-send-recv.c:255
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:252
 #, c-format
 msgid "Type: %s"
 msgstr "类型： %s"
@@ -21952,57 +22482,42 @@ msgstr "类型： %s"
 # mail/mail-send-recv.c:286
 # mail/mail-send-recv.c:292
 # mail/mail-send-recv.c:292
-#: mail/mail-send-recv.c:293
+#: mail/mail-send-recv.c:297
 msgid "Send & Receive Mail"
 msgstr "发送和接收邮件"
 
 # mail/mail-send-recv.c:288
 # mail/mail-send-recv.c:294
 # mail/mail-send-recv.c:294
-#: mail/mail-send-recv.c:295
+#: mail/mail-send-recv.c:299
 msgid "Cancel All"
 msgstr "全部取消"
 
 # mail/mail-send-recv.c:348
 # mail/mail-send-recv.c:354
 # mail/mail-send-recv.c:354
-#: mail/mail-send-recv.c:355
+#: mail/mail-send-recv.c:378
 msgid "Updating..."
 msgstr "正在更新..."
 
 # mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 # mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
 # mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
-#: 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:220
 # mail/mail-session.c:220
 # mail/mail-session.c:222
-#: mail/mail-session.c:221
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr "用户己取消操作。"
 
-# mail/mail-config.glade.h:113
-# mail/mail-config.glade.h:113
-# mail/mail-config.glade.h:122
-#: mail/mail-session.c:272
-msgid "_Remember this password"
-msgstr "记住该密码(_R)"
-
-# e-util/e-passwords.c:362 mail/mail-session.c:268
-# e-util/e-passwords.c:362 mail/mail-session.c:268
-# e-util/e-passwords.c:362 mail/mail-session.c:270
-#: mail/mail-session.c:273
-#, fuzzy
-msgid "_Remember this password for the remainder of this session"
-msgstr "在本会话中记住该密码"
-
 # mail/mail-session.c:319
 # mail/mail-session.c:319
 # mail/mail-session.c:321
-#: mail/mail-session.c:330
+#: mail/mail-session.c:258
 #, c-format
 msgid "Enter Password for %s"
 msgstr "为 %s 输入密码"
@@ -22010,29 +22525,37 @@ msgstr "为 %s 输入密码"
 # mail/mail-session.c:322
 # mail/mail-session.c:322
 # mail/mail-session.c:324
-#: mail/mail-session.c:333
+#: mail/mail-session.c:260
 msgid "Enter Password"
 msgstr "输入密码"
 
+# mail/mail-config.glade.h:113
+# mail/mail-config.glade.h:113
+# mail/mail-config.glade.h:122
+#: mail/mail-session.c:280
+msgid "_Remember this password"
+msgstr "记住该密码(_R)"
+
+# e-util/e-passwords.c:362 mail/mail-session.c:268
+# e-util/e-passwords.c:362 mail/mail-session.c:268
+# e-util/e-passwords.c:362 mail/mail-session.c:270
+#: mail/mail-session.c:281
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "在本会话中记住该密码"
+
 # mail/mail-account-gui.c:962
 # mail/mail-account-gui.c:962
 # mail/mail-account-gui.c:959
-#: mail/mail-signature-editor.c:81
+#: mail/mail-signature-editor.c:80
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "无法保存签名文件。"
 
-# mail/mail-account-gui.c:1039
-# mail/mail-account-gui.c:1039
-# mail/mail-account-gui.c:1036
-#: mail/mail-signature-editor.c:175
-msgid "Save signature"
-msgstr "保存签名"
-
 # mail/mail-account-gui.c:1045
 # mail/mail-account-gui.c:1045
 # mail/mail-account-gui.c:1042
-#: 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"
@@ -22042,25 +22565,36 @@ msgstr ""
 "\n"
 "您希望保存改动吗？"
 
-#: mail/mail-signature-editor.c:333
+#: mail/mail-signature-editor.c:229
+msgid "_Discard changes"
+msgstr ""
+
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1036
+#: 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 "输入该签名的名字。"
 
 # my-evolution/e-summary-preferences.c:956
 # my-evolution/e-summary-preferences.c:956
 # my-evolution/e-summary-preferences.c:958
-#: 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:255
 # mail/mail-tools.c:255
 # mail/mail-tools.c:256
-#: mail/mail-tools.c:262
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "已转发邮件 - %s"
@@ -22068,21 +22602,21 @@ msgstr "已转发邮件 - %s"
 # mail/mail-tools.c:259
 # mail/mail-tools.c:259
 # mail/mail-tools.c:260
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "已转发邮件"
 
 # mail/mail-tools.c:393
 # mail/mail-tools.c:393
 # mail/mail-tools.c:394
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "已转发邮件"
 
 # mail/mail-vfolder.c:85
 # mail/mail-vfolder.c:85
 # mail/mail-vfolder.c:85
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "设置虚拟文件夹： %s"
@@ -22090,7 +22624,7 @@ msgstr "设置虚拟文件夹： %s"
 # mail/mail-vfolder.c:203
 # mail/mail-vfolder.c:203
 # mail/mail-vfolder.c:203
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "为 uri 更新虚拟文件夹： %s"
@@ -22098,7 +22632,7 @@ msgstr "为 uri 更新虚拟文件夹： %s"
 # mail/mail-vfolder.c:419
 # mail/mail-vfolder.c:419
 # mail/mail-vfolder.c:419
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -22110,28 +22644,28 @@ msgstr ""
 # mail/mail-vfolder.c:728
 # mail/mail-vfolder.c:728
 # mail/mail-vfolder.c:728
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "虚拟文件夹"
 
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
 # mail/mail-vfolder.c:785
 # mail/mail-vfolder.c:785
-#: mail/mail-vfolder.c:819
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "虚拟文件夹"
 
 # mail/mail-vfolder.c:824
 # mail/mail-vfolder.c:825
 # mail/mail-vfolder.c:825
-#: mail/mail-vfolder.c:861
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "编辑虚拟文件夹"
 
 # mail/mail-vfolder.c:840
 # mail/mail-vfolder.c:841
 # mail/mail-vfolder.c:841
-#: 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”。"
@@ -22139,21 +22673,21 @@ msgstr "试图编辑并不存在的虚拟文件夹“%s”。"
 # mail/mail-vfolder.c:894
 # mail/mail-vfolder.c:895
 # mail/mail-vfolder.c:895
-#: mail/mail-vfolder.c:931
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "新建虚拟文件夹"
 
 # mail/message-browser.c:212
 # mail/message-browser.c:212
 # mail/message-browser.c:212
-#: mail/message-browser.c:210
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(没有主题)"
 
 # mail/message-browser.c:214
 # mail/message-browser.c:214
 # mail/message-browser.c:214
-#: mail/message-browser.c:212
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - 邮件"
@@ -22161,109 +22695,109 @@ msgstr "%s - 邮件"
 # mail/message-list.c:639
 # mail/message-list.c:645
 # mail/message-list.c:662
-#: mail/message-list.c:736
+#: mail/message-list.c:740
 msgid "Unseen"
 msgstr "不可见"
 
 # mail/message-list.c:640
 # mail/message-list.c:646
 # mail/message-list.c:663
-#: mail/message-list.c:737
+#: mail/message-list.c:741
 msgid "Seen"
 msgstr "可见"
 
 # mail/message-list.c:641
 # mail/message-list.c:647
 # mail/message-list.c:664
-#: mail/message-list.c:738
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr "已应答"
 
 # mail/message-list.c:642
 # mail/message-list.c:648
 # mail/message-list.c:665
-#: mail/message-list.c:739
+#: mail/message-list.c:743
 msgid "Multiple Unseen Messages"
 msgstr "多个不可见邮件"
 
 # mail/message-list.c:643
 # mail/message-list.c:649
 # mail/message-list.c:666
-#: mail/message-list.c:740
+#: mail/message-list.c:744
 msgid "Multiple Messages"
 msgstr "多个邮件"
 
 # mail/message-list.c:647
 # mail/message-list.c:658
 # mail/message-list.c:675
-#: mail/message-list.c:744
+#: mail/message-list.c:748
 msgid "Lowest"
 msgstr "最低"
 
 # mail/message-list.c:648
 # mail/message-list.c:659
 # mail/message-list.c:676
-#: mail/message-list.c:745
+#: mail/message-list.c:749
 msgid "Lower"
 msgstr "较低"
 
 # mail/message-list.c:652
 # mail/message-list.c:663
 # mail/message-list.c:680
-#: mail/message-list.c:749
+#: mail/message-list.c:753
 msgid "Higher"
 msgstr "较高"
 
 # mail/message-list.c:653
 # mail/message-list.c:664
 # mail/message-list.c:681
-#: mail/message-list.c:750
+#: mail/message-list.c:754
 msgid "Highest"
 msgstr "最高"
 
 # mail/message-list.c:903
 # mail/message-list.c:920
 # mail/message-list.c:937
-#: mail/message-list.c:1066
+#: mail/message-list.c:1080
 msgid "?"
 msgstr "?"
 
 # mail/message-list.c:910
 # mail/message-list.c:927
 # mail/message-list.c:944
-#: mail/message-list.c:1073
+#: mail/message-list.c:1087
 msgid "Today %l:%M %p"
 msgstr "今天 %l:%M %p"
 
 # mail/message-list.c:919
 # mail/message-list.c:936
 # mail/message-list.c:953
-#: mail/message-list.c:1082
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %l:%M %p"
 
 # mail/message-list.c:931
 # mail/message-list.c:948
 # mail/message-list.c:965
-#: 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:941
 # mail/message-list.c:958
 # mail/message-list.c:975
-#: mail/message-list.c:1104
+#: mail/message-list.c:1118
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
 # mail/message-list.c:2334
 # mail/message-list.c:2358
 # mail/message-list.c:2387
-#: mail/message-list.c:2568
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "正在生成邮件列表"
 
@@ -22328,25 +22862,25 @@ msgstr "大小"
 # importers/elm-importer.c:525 importers/netscape-importer.c:958
 # importers/pine-importer.c:637 mail/component-factory.c:100
 # my-evolution/Locations.h:1355
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr "呼叫"
 
 # ui/evolution-mail-message.xml.h:31
 # ui/evolution-mail-message.xml.h:31
 # ui/evolution-mail-message.xml.h:31
-#: 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/mail-config.glade.h:81
 # mail/mail-config.glade.h:81
 # mail/mail-config.glade.h:90
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:65
 #, fuzzy
 msgid "For Your Information"
 msgstr "来源信息"
@@ -22354,37 +22888,37 @@ msgstr "来源信息"
 # ui/evolution-mail-message.xml.h:31
 # ui/evolution-mail-message.xml.h:31
 # ui/evolution-mail-message.xml.h:31
-#: 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 "不必回复"
 
 # ui/evolution-mail-message.xml.h:70
 # ui/evolution-mail-message.xml.h:70
 # ui/evolution-mail-message.xml.h:72
-#: 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 "回复"
 
 # ui/evolution-mail-message.xml.h:71
 # ui/evolution-mail-message.xml.h:71
 # ui/evolution-mail-message.xml.h:73
-#: 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 "全部回复"
 
 # calendar/gui/dialogs/recurrence-page.glade.h:6
 # calendar/gui/dialogs/recurrence-page.glade.h:6
 # calendar/gui/dialogs/recurrence-page.glade.h:6
-#: 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 ""
 
@@ -22436,7 +22970,7 @@ msgstr "标志(_F)："
 # mail/subscribe-dialog.c:219
 # mail/subscribe-dialog.c:219
 # mail/subscribe-dialog.c:219
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "在“%2$s”上的 %1$s 中扫描文件夹"
@@ -22444,7 +22978,7 @@ msgstr "在“%2$s”上的 %1$s 中扫描文件夹"
 # mail/subscribe-dialog.c:221
 # mail/subscribe-dialog.c:221
 # mail/subscribe-dialog.c:221
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "正在扫描“%s”上的根级文件夹"
@@ -22452,7 +22986,7 @@ msgstr "正在扫描“%s”上的根级文件夹"
 # mail/subscribe-dialog.c:318
 # mail/subscribe-dialog.c:318
 # mail/subscribe-dialog.c:318
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "订阅到文件夹 “%s”"
@@ -22460,7 +22994,7 @@ msgstr "订阅到文件夹 “%s”"
 # mail/subscribe-dialog.c:320
 # mail/subscribe-dialog.c:320
 # mail/subscribe-dialog.c:320
-#: mail/subscribe-dialog.c:338
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "取消到文件夹“%s”的订阅"
@@ -22471,7 +23005,7 @@ msgstr "取消到文件夹“%s”的订阅"
 # shell/e-storage-set-view.etspec.h:1
 # mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 # shell/e-storage-set-view.etspec.h:1
-#: 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 "文件夹"
@@ -22479,39 +23013,24 @@ msgstr "文件夹"
 # ui/evolution-message-composer.xml.h:23
 # ui/evolution-message-composer.xml.h:23
 # ui/evolution-message-composer.xml.h:23
-#: mail/subscribe-dialog.c:1450
+#: mail/subscribe-dialog.c:1389
 msgid "Scanning folders..."
 msgstr "正在扫描文件夹..."
 
 # mail/subscribe-dialog.c:1520
 # mail/subscribe-dialog.c:1520
 # mail/subscribe-dialog.c:1520
-#: mail/subscribe-dialog.c:1557
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "没有选定服务器"
 
 # mail/subscribe-dialog.c:1581
 # mail/subscribe-dialog.c:1581
 # mail/subscribe-dialog.c:1581
-#: mail/subscribe-dialog.c:1621
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "请选择服务器。"
 
-# mail/subscribe-dialog.glade.h:2
-# mail/subscribe-dialog.glade.h:2
-# mail/subscribe-dialog.glade.h:2
-#: mail/subscribe-dialog.glade.h:1
-msgid "All folders"
-msgstr "所有文件夹"
-
-# calendar/gui/goto-dialog.glade.h:1
-# calendar/gui/goto-dialog.glade.h:1
-# calendar/gui/goto-dialog.glade.h:1
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "Apri file"
-msgstr "四月"
-
 # 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
@@ -22536,106 +23055,77 @@ msgstr "四月"
 msgid "Close"
 msgstr "关闭"
 
-# mail/subscribe-dialog.glade.h:3
-# mail/subscribe-dialog.glade.h:3
-# mail/subscribe-dialog.glade.h:3
-#: mail/subscribe-dialog.glade.h:4
-msgid "Display Options"
-msgstr "显示选项"
-
-# mail/subscribe-dialog.glade.h:4
-# mail/subscribe-dialog.glade.h:4
-# mail/subscribe-dialog.glade.h:4
-#: mail/subscribe-dialog.glade.h:5
-msgid "Folders whose names begin with:"
-msgstr "名称以之开头的文件夹："
-
 # mail/subscribe-dialog.glade.h:5
 # mail/subscribe-dialog.glade.h:5
 # mail/subscribe-dialog.glade.h:5
-#: mail/subscribe-dialog.glade.h:6
+#: mail/subscribe-dialog.glade.h:4
 msgid "Manage Subscriptions"
 msgstr "管理订阅"
 
 # ui/evolution-subscribe.xml.h:3
 # ui/evolution-subscribe.xml.h:3
 # ui/evolution-subscribe.xml.h:3
-#: 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 "刷新列表"
 
 # shell/e-shell-importer.c:617
 # shell/e-shell-importer.c:617
 # executive-summary/component/e-summary-callbacks.c:125
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:6
 msgid "S_elect server: "
 msgstr "选择服务器(_E)："
 
-# shell/e-shell-importer.c:617
-# shell/e-shell-importer.c:617
-# shell/e-shell-importer.c:628
-#: mail/subscribe-dialog.glade.h:9
-#, fuzzy
-msgid "Salve file"
-msgstr "选择一个文件"
-
 # mail/subscribe-dialog.glade.h:7
 # mail/subscribe-dialog.glade.h:7
 # mail/subscribe-dialog.glade.h:7
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "订阅(_S)"
 
 # mail/subscribe-dialog.glade.h:8
 # mail/subscribe-dialog.glade.h:8
 # mail/subscribe-dialog.glade.h:8
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "退订(_U)"
 
 # my-evolution/component-factory.c:44
 # my-evolution/component-factory.c:44
 # my-evolution/component-factory.c:44
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 #, fuzzy
-msgid "Configuration control for the Evolution Summary."
+msgid "Configure the appearance of the Evolution Summary here"
 msgstr "含有 Evolution 概要的文件夹"
 
-# my-evolution/component-factory.c:44
-# my-evolution/component-factory.c:44
-# my-evolution/component-factory.c:44
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 #, fuzzy
-msgid "Configure the appearance of the Evolution Summary here"
-msgstr "含有 Evolution 概要的文件夹"
+msgid "Evolution Summary"
+msgstr "Evolution 概要组件。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
-msgid "Evolution Summary component."
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Summary component"
 msgstr "Evolution 概要组件。"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
 #, fuzzy
-msgid "Factory for Evolution Summary's configuration control."
+msgid "Evolution Summary configuration control"
 msgstr "Evolution 任务控制车间"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-# executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
-#, fuzzy
-msgid "Factory for the Evolution Summary component."
-msgstr "Evolution 实施概要组件车间。"
-
 # my-evolution/e-summary-preferences.c:1502
 # my-evolution/e-summary-preferences.c:1502
 # my-evolution/e-summary-preferences.c:1504
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 msgid "Summary Preferences"
 msgstr "概要首选项"
 
@@ -28045,7 +28535,7 @@ msgstr ""
 # my-evolution/metar.c:217
 # my-evolution/Locations.h:885 my-evolution/metar.c:217
 #. HAIL
-#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+#: my-evolution/Locations.h:885 my-evolution/metar.c:218
 msgid "Hail"
 msgstr "冰雹"
 
@@ -30587,48 +31077,40 @@ msgstr "马里恩"
 msgid "Marion-Wytheville"
 msgstr "马里恩-Wytheville"
 
-# addressbook/gui/contact-editor/fulladdr.glade.h:133
-# addressbook/gui/contact-editor/fulladdr.glade.h:133
-# my-evolution/Locations.h:1326
-#: my-evolution/Locations.h:1325
-#, fuzzy
-msgid "Marquette"
-msgstr "马提尼可岛"
-
 # my-evolution/Locations.h:1327
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marseille-Provence"
 msgstr "马赛-普罗旺斯"
 
 # my-evolution/Locations.h:1328
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseilles"
 msgstr "马赛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:132
 # addressbook/gui/contact-editor/fulladdr.glade.h:132
 # my-evolution/Locations.h:1329
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marshall"
 msgstr "马绍尔群岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:132
 # addressbook/gui/contact-editor/fulladdr.glade.h:132
 # my-evolution/Locations.h:1330
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 #, fuzzy
 msgid "Marshalltown"
 msgstr "马绍尔群岛"
 
 # my-evolution/Locations.h:1331
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshfield"
 msgstr ""
 
 # mail/mail-format.c:763
 # mail/mail-format.c:769
 # my-evolution/Locations.h:1332
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 #, fuzzy
 msgid "Marte"
 msgstr "日期"
@@ -30636,7 +31118,7 @@ msgstr "日期"
 # mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:45
 # mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:45
 # my-evolution/Locations.h:1333
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "标记为未读(_N)"
@@ -30644,7 +31126,7 @@ msgstr "标记为未读(_N)"
 # addressbook/printing/e-contact-print.glade.h:21
 # addressbook/printing/e-contact-print.glade.h:21
 # my-evolution/Locations.h:1334
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Martinsburg"
 msgstr "边界"
@@ -30652,7 +31134,7 @@ msgstr "边界"
 # addressbook/gui/contact-editor/fulladdr.glade.h:133
 # addressbook/gui/contact-editor/fulladdr.glade.h:133
 # my-evolution/Locations.h:1335
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsville"
 msgstr "马提尼可岛"
@@ -30660,47 +31142,47 @@ msgstr "马提尼可岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:105
 # addressbook/gui/contact-editor/fulladdr.glade.h:105
 # my-evolution/Locations.h:1336
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Maryland"
 msgstr "马里兰"
 
 # my-evolution/Locations.h:1337
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Marysville"
 msgstr ""
 
 # my-evolution/Locations.h:1338
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville-Beale AFB"
 msgstr ""
 
 # my-evolution/Locations.h:1339
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Mashhad"
 msgstr "马什哈德"
 
 # calendar/gui/goto-dialog.glade.h:10
 # calendar/gui/goto-dialog.glade.h:10
 # my-evolution/Locations.h:1340
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 #, fuzzy
 msgid "Masirah"
 msgstr "三月"
 
 # my-evolution/Locations.h:1341
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Mason City"
 msgstr "梅森城"
 
 # my-evolution/Locations.h:1342
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Massachusetts"
 msgstr "麻萨诸塞州"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:125
 # addressbook/gui/contact-editor/fulladdr.glade.h:125
 # my-evolution/Locations.h:1343
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 #, fuzzy
 msgid "Massena"
 msgstr "马其顿"
@@ -30708,29 +31190,29 @@ msgstr "马其顿"
 # addressbook/gui/contact-editor/fulladdr.glade.h:51
 # addressbook/gui/contact-editor/fulladdr.glade.h:51
 # my-evolution/Locations.h:1344
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Matamoros"
 msgstr "马塔莫罗斯"
 
 # my-evolution/Locations.h:1345
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matsumoto Airport"
 msgstr "松本机场"
 
 # my-evolution/Locations.h:1346
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsushima Ab"
 msgstr ""
 
 # my-evolution/Locations.h:1347
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsuyama Airport"
 msgstr "松山机场"
 
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/backend/ebook/e-card-simple.c:93
 # my-evolution/Locations.h:1348
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 #, fuzzy
 msgid "Mattoon"
 msgstr "经理"
@@ -30740,7 +31222,7 @@ msgstr "经理"
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/gui/widgets/e-addressbook-view.c:882
 # my-evolution/Locations.h:1349
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mayaguez"
 msgstr "经理"
@@ -30748,7 +31230,7 @@ msgstr "经理"
 # addressbook/gui/contact-editor/fulladdr.glade.h:136
 # addressbook/gui/contact-editor/fulladdr.glade.h:136
 # my-evolution/Locations.h:1350
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayport"
 msgstr "马约特岛"
@@ -30756,7 +31238,7 @@ msgstr "马约特岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:5
 # calendar/zones.h:127
 # my-evolution/Locations.h:1351
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mazatlan"
 msgstr "美洲萨摩亚"
@@ -30764,17 +31246,17 @@ msgstr "美洲萨摩亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:124
 # addressbook/gui/contact-editor/fulladdr.glade.h:124
 # my-evolution/Locations.h:1352
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazu"
 msgstr "马祖"
 
 # my-evolution/Locations.h:1353
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "McAlester"
 msgstr ""
 
 # my-evolution/Locations.h:1354
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAllen"
 msgstr "麦卡伦"
 
@@ -30783,7 +31265,7 @@ msgstr "麦卡伦"
 # importers/elm-importer.c:525 importers/netscape-importer.c:958
 # importers/pine-importer.c:637 mail/component-factory.c:100
 # my-evolution/Locations.h:1355
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 #, fuzzy
 msgid "McCall"
 msgstr "邮件"
@@ -30791,7 +31273,7 @@ msgstr "邮件"
 # calendar/gui/goto-dialog.glade.h:10
 # calendar/gui/goto-dialog.glade.h:10
 # my-evolution/Locations.h:1356
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCarthy"
 msgstr "三月"
@@ -30799,37 +31281,37 @@ msgstr "三月"
 # addressbook/gui/contact-editor/fulladdr.glade.h:102
 # addressbook/gui/contact-editor/fulladdr.glade.h:102
 # my-evolution/Locations.h:1357
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McClellan"
 msgstr "麦克莱伦"
 
 # addressbook/backend/ebook/e-card-simple.c:67
 # addressbook/backend/ebook/e-card-simple.c:67
 # my-evolution/Locations.h:1358
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 #, fuzzy
 msgid "McComb"
 msgstr "公司"
 
 # my-evolution/Locations.h:1359
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McCook"
 msgstr ""
 
 # my-evolution/Locations.h:1360
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McGrath"
 msgstr ""
 
 # my-evolution/Locations.h:1361
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "Mc Gregor"
 msgstr ""
 
 # calendar/gui/goto-dialog.glade.h:10
 # calendar/gui/goto-dialog.glade.h:10
 # my-evolution/Locations.h:1362
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 #, fuzzy
 msgid "Meacham"
 msgstr "三月"
@@ -30837,89 +31319,89 @@ msgstr "三月"
 # calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
 # calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
 # my-evolution/Locations.h:1363
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Medford"
 msgstr "之前"
 
 # my-evolution/Locations.h:1364
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medicine Lodge"
 msgstr ""
 
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/backend/ebook/e-card-simple.c:93
 # my-evolution/Locations.h:1365
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 #, fuzzy
 msgid "Mehamn"
 msgstr "经理"
 
 # my-evolution/Locations.h:1366
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mekoryuk"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # calendar/zones.h:280
 # my-evolution/Locations.h:1367
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Melbourne"
 msgstr "墨尔本"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:131
 # addressbook/gui/contact-editor/fulladdr.glade.h:131
 # my-evolution/Locations.h:1368
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 #, fuzzy
 msgid "Melfa"
 msgstr "马耳他"
 
 # my-evolution/Locations.h:1369
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melilla"
 msgstr "梅利利亚"
 
 # my-evolution/Locations.h:1370
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Memambetsu Airport"
 msgstr ""
 
 # my-evolution/Locations.h:1371
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memphis"
 msgstr "孟斐斯"
 
 # my-evolution/Locations.h:1372
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis-NAS"
 msgstr "孟斐斯-国家科学院"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:5
 # calendar/zones.h:128
 # my-evolution/Locations.h:1373
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 #, fuzzy
 msgid "Mendoza"
 msgstr "美洲萨摩亚"
 
 # my-evolution/Locations.h:1374
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mene Grande"
 msgstr ""
 
 # my-evolution/Locations.h:1375
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Menominee"
 msgstr ""
 
 # my-evolution/Locations.h:1376
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menorca"
 msgstr "米诺卡"
 
 # my-evolution/Locations.h:1377
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Merced"
 msgstr ""
 
@@ -30928,53 +31410,53 @@ msgstr ""
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 # calendar/gui/dialogs/recurrence-page.c:963
 # my-evolution/Locations.h:1378
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 #, fuzzy
 msgid "Merida"
 msgstr "星期五"
 
 # my-evolution/Locations.h:1379
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Meridian"
 msgstr ""
 
 # my-evolution/Locations.h:1380
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian-Lauderdale"
 msgstr ""
 
 # ui/evolution-message-composer.xml.h:49
 # ui/evolution-message-composer.xml.h:49
 # my-evolution/Locations.h:1381
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 #, fuzzy
 msgid "Merril Field"
 msgstr "发件人域(_F)"
 
 # my-evolution/Locations.h:1382
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Mersa Matruh"
 msgstr ""
 
 # my-evolution/Locations.h:1383
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mesa-Falcon Field"
 msgstr ""
 
 # my-evolution/Locations.h:1384
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Metabaru Ab"
 msgstr ""
 
 # my-evolution/Locations.h:1385
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metz-Frescaty"
 msgstr "梅斯-Frescaty"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:137
 # addressbook/gui/contact-editor/fulladdr.glade.h:137
 # my-evolution/Locations.h:1386
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Mexicali"
 msgstr "墨西卡利"
 
@@ -30983,43 +31465,43 @@ msgstr "墨西卡利"
 # importers/elm-importer.c:525 importers/netscape-importer.c:958
 # importers/pine-importer.c:637 mail/component-factory.c:100
 # my-evolution/Locations.h:1388
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Miami"
 msgstr "迈阿密"
 
 # my-evolution/Locations.h:1389
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami-Kendall"
 msgstr "迈阿密-肯德尔"
 
 # my-evolution/Locations.h:1390
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Opa Locka"
 msgstr "迈阿密-Opa Locka"
 
 # my-evolution/Locations.h:1391
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Michigan"
 msgstr "密歇根州"
 
 # addressbook/gui/contact-editor/fullname.glade.h:15
 # addressbook/gui/contact-editor/fullname.glade.h:15
 # my-evolution/Locations.h:1392
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Middle East"
 msgstr "中东"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:192
 # addressbook/gui/contact-editor/fulladdr.glade.h:192
 # my-evolution/Locations.h:1393
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middleton Island"
 msgstr "米德尔顿岛"
 
 # addressbook/gui/contact-editor/fullname.glade.h:15
 # addressbook/gui/contact-editor/fullname.glade.h:15
 # my-evolution/Locations.h:1394
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 #, fuzzy
 msgid "Middletown"
 msgstr "中间名(_M)："
@@ -31027,146 +31509,146 @@ msgstr "中间名(_M)："
 # addressbook/gui/contact-editor/fulladdr.glade.h:76
 # addressbook/gui/contact-editor/fulladdr.glade.h:76
 # my-evolution/Locations.h:1395
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Midland"
 msgstr ""
 
 # my-evolution/Locations.h:1396
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Miho Ab"
 msgstr ""
 
 # my-evolution/Locations.h:1397
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Milano/Linate"
 msgstr "米兰/Linate"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:129
 # calendar/zones.h:341
 # my-evolution/Locations.h:1398
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Malpensa"
 msgstr "米兰/Malpensa"
 
 # shell/e-shell-importer.c:627
 # shell/e-shell-importer.c:627
 # my-evolution/Locations.h:1399
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Miles City"
 msgstr "迈尔斯城"
 
 # my-evolution/Locations.h:1400
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Milford"
 msgstr "米尔福德"
 
 # my-evolution/Locations.h:1401
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Millinocket"
 msgstr ""
 
 # my-evolution/Locations.h:1402
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millville"
 msgstr ""
 
 # mail/mail-autofilter.c:72
 # mail/mail-autofilter.c:72
 # my-evolution/Locations.h:1403
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Milton"
 msgstr "米尔顿"
 
 # my-evolution/Locations.h:1404
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milwaukee"
 msgstr "密尔沃基"
 
 # my-evolution/Locations.h:1405
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee-Timmerman"
 msgstr "密尔沃基-Timmerman"
 
 # my-evolution/Locations.h:1406
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Minamitorishima"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:134
 # addressbook/gui/contact-editor/fulladdr.glade.h:134
 # my-evolution/Locations.h:1407
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 #, fuzzy
 msgid "Minatitlan"
 msgstr "毛里塔尼亚"
 
 # my-evolution/Locations.h:1408
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 #, fuzzy
 msgid "Minchumina"
 msgstr "接收"
 
 # my-evolution/Locations.h:1409
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Mineralnye Vody"
 msgstr ""
 
 # my-evolution/Locations.h:1410
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineral Wells"
 msgstr ""
 
 # my-evolution/Locations.h:1411
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Minneapolis"
 msgstr "明尼阿波利斯"
 
 # my-evolution/Locations.h:1412
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis [2]"
 msgstr "明尼阿波利斯 [2]"
 
 # my-evolution/Locations.h:1413
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [3]"
 msgstr "明尼阿波利斯 [3]"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:138
 # addressbook/gui/contact-editor/fulladdr.glade.h:138
 # my-evolution/Locations.h:1414
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minnesota"
 msgstr "明尼苏达州"
 
 # my-evolution/Locations.h:1415
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minocqua"
 msgstr ""
 
 # my-evolution/Locations.h:1416
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minot"
 msgstr "迈诺特"
 
 # my-evolution/Locations.h:1417
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot AFB"
 msgstr "迈诺特空军基地"
 
 # my-evolution/Locations.h:1418
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Misawa Ab"
 msgstr ""
 
 # my-evolution/Locations.h:1419
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Mississippi"
 msgstr "密西西比"
 
 # addressbook/gui/contact-editor/fullname.glade.h:8
 # addressbook/gui/contact-editor/fullname.glade.h:8
 # my-evolution/Locations.h:1420
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 #, fuzzy
 msgid "Missoula"
 msgstr "小姐"
@@ -31174,37 +31656,37 @@ msgstr "小姐"
 # addressbook/gui/contact-editor/fullname.glade.h:8
 # addressbook/gui/contact-editor/fullname.glade.h:8
 # my-evolution/Locations.h:1421
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missouri"
 msgstr "密苏里州"
 
 # mail/mail-search.c:346
 # mail/mail-search.c:346
 # my-evolution/Locations.h:1422
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Mitchell"
 msgstr "米切尔"
 
 # my-evolution/Locations.h:1423
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 msgid "Mitilini"
 msgstr "邮件列表"
 
 # my-evolution/Locations.h:1424
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Miyakejima Airport"
 msgstr ""
 
 # my-evolution/Locations.h:1425
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyazaki Airport"
 msgstr "宫崎机场"
 
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
 # my-evolution/Locations.h:1426
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 #, fuzzy
 msgid "Moa"
 msgstr "一"
@@ -31212,13 +31694,13 @@ msgstr "一"
 # addressbook/gui/widgets/e-addressbook-view.c:861
 # addressbook/gui/widgets/e-addressbook-view.c:861
 # my-evolution/Locations.h:1427
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "手机"
 
 # my-evolution/Locations.h:1428
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Regional Airport"
 msgstr ""
 
@@ -31229,7 +31711,7 @@ msgstr ""
 # addressbook/gui/contact-editor/contact-editor.glade.h:20
 # addressbook/gui/contact-editor/e-contact-editor.c:1655
 # my-evolution/Locations.h:1429
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 #, fuzzy
 msgid "Mobridge"
 msgstr "手机"
@@ -31237,20 +31719,20 @@ msgstr "手机"
 # my-evolution/metar.c:280
 # my-evolution/metar.c:280
 # my-evolution/Locations.h:1430
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Modesto"
 msgstr "中雾"
 
 # my-evolution/Locations.h:1431
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Mo I Rana"
 msgstr ""
 
 # ui/evolution-mail-message.xml.h:52
 # ui/evolution-mail-message.xml.h:52
 # my-evolution/Locations.h:1432
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mojave"
 msgstr "莫哈韦"
 
@@ -31261,7 +31743,7 @@ msgstr "莫哈韦"
 # addressbook/gui/contact-editor/contact-editor.glade.h:20
 # addressbook/gui/contact-editor/e-contact-editor.c:1655
 # my-evolution/Locations.h:1433
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Molde"
 msgstr "手机"
@@ -31271,36 +31753,36 @@ msgstr "手机"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 # calendar/gui/dialogs/recurrence-page.c:959
 # my-evolution/Locations.h:1434
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Moldova"
 msgstr "摩尔多瓦"
 
 # my-evolution/Locations.h:1435
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moline-Quad Cities"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:127
 # addressbook/gui/contact-editor/fulladdr.glade.h:127
 # my-evolution/Locations.h:1436
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Molokai"
 msgstr "莫洛凯岛"
 
 # my-evolution/Locations.h:1437
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Mombetsu Airport"
 msgstr ""
 
 # my-evolution/Locations.h:1438
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Monchengladbach"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # my-evolution/Locations.h:1439
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 #, fuzzy
 msgid "Monclova"
 msgstr "摩纳哥"
@@ -31308,7 +31790,7 @@ msgstr "摩纳哥"
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # my-evolution/Locations.h:1440
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Moncton"
 msgstr "摩纳哥"
@@ -31318,20 +31800,20 @@ msgstr "摩纳哥"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 # calendar/gui/dialogs/recurrence-page.c:959
 # my-evolution/Locations.h:1441
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Monida"
 msgstr "星期一"
 
 # my-evolution/Locations.h:1442
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-地中海"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # my-evolution/Locations.h:1443
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monroe"
 msgstr "门罗"
 
@@ -31340,7 +31822,7 @@ msgstr "门罗"
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/gui/widgets/e-addressbook-view.c:882
 # my-evolution/Locations.h:1444
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Montague"
 msgstr "经理"
@@ -31348,37 +31830,37 @@ msgstr "经理"
 # ui/evolution-calendar.xml.h:20
 # ui/evolution-calendar.xml.h:20
 # my-evolution/Locations.h:1445
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montana"
 msgstr "蒙大拿"
 
 # my-evolution/Locations.h:1446
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Mont-de-Marsan"
 msgstr ""
 
 # my-evolution/Locations.h:1447
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Monte Argentario"
 msgstr ""
 
 # my-evolution/metar.c:160
 # my-evolution/metar.c:160
 # my-evolution/Locations.h:1448
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 #, fuzzy
 msgid "Monte Bisbino"
 msgstr "中雪"
 
 # my-evolution/Locations.h:1449
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Calamita"
 msgstr ""
 
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 # my-evolution/Locations.h:1450
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "月视图"
@@ -31386,20 +31868,20 @@ msgstr "月视图"
 # addressbook/gui/contact-editor/fulladdr.glade.h:140
 # addressbook/gui/contact-editor/fulladdr.glade.h:140
 # my-evolution/Locations.h:1451
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Montego Bay"
 msgstr "蒙古"
 
 # my-evolution/Locations.h:1452
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Monte Malanotte"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:141
 # addressbook/gui/contact-editor/fulladdr.glade.h:141
 # my-evolution/Locations.h:1453
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 #, fuzzy
 msgid "Monterey"
 msgstr "蒙特塞拉特群岛"
@@ -31407,43 +31889,43 @@ msgstr "蒙特塞拉特群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:141
 # addressbook/gui/contact-editor/fulladdr.glade.h:141
 # my-evolution/Locations.h:1454
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 #, fuzzy
 msgid "Monterrey"
 msgstr "蒙特塞拉特群岛"
 
 # my-evolution/Locations.h:1455
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monte Scuro"
 msgstr ""
 
 # my-evolution/Locations.h:1456
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Terminillo"
 msgstr ""
 
 # my-evolution/Locations.h:1457
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Montevideo/Carrasco"
 msgstr "蒙德维的亚/Carrasco"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:141
 # addressbook/gui/contact-editor/fulladdr.glade.h:141
 # my-evolution/Locations.h:1458
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 #, fuzzy
 msgid "Montgomery"
 msgstr "蒙特塞拉特群岛"
 
 # my-evolution/Locations.h:1459
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery-Maxwell AFB"
 msgstr "蒙哥马利-麦克斯维尔空军基地"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # my-evolution/Locations.h:1460
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 #, fuzzy
 msgid "Monticello"
 msgstr "摩纳哥"
@@ -31451,42 +31933,42 @@ msgstr "摩纳哥"
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 # my-evolution/Locations.h:1461
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Montpelier"
 msgstr "蒙比利埃"
 
 # my-evolution/Locations.h:1462
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montreal Dorval"
 msgstr "蒙特利尔 Dorval"
 
 # my-evolution/Locations.h:1463
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Mirabel"
 msgstr "蒙特利尔 米拉贝尔"
 
 # my-evolution/Locations.h:1464
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Saint-Hubert"
 msgstr "蒙特利尔 圣休伯特"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:141
 # addressbook/gui/contact-editor/fulladdr.glade.h:141
 # my-evolution/Locations.h:1465
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 #, fuzzy
 msgid "Montrose"
 msgstr "蒙特塞拉特群岛"
 
 # my-evolution/Locations.h:1466
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose (2)"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:140
 # addressbook/gui/contact-editor/fulladdr.glade.h:140
 # my-evolution/Locations.h:1467
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Morelia"
 msgstr "莫雷利亚"
 
@@ -31495,7 +31977,7 @@ msgstr "莫雷利亚"
 # addressbook/backend/ebook/e-card-simple.c:69
 # addressbook/gui/widgets/e-addressbook-view.c:858
 # my-evolution/Locations.h:1468
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morgantown"
 msgstr "组织"
@@ -31505,28 +31987,28 @@ msgstr "组织"
 # addressbook/backend/ebook/e-card-simple.c:63
 # addressbook/gui/contact-editor/e-contact-editor.c:1659
 # my-evolution/Locations.h:1469
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Moriarty"
 msgstr "主要"
 
 # my-evolution/Locations.h:1471
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morristown"
 msgstr ""
 
 # my-evolution/Locations.h:1472
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Moscow Domodedovo"
 msgstr "莫斯科 Domodedovo"
 
 # my-evolution/Locations.h:1473
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Sheremetyevo"
 msgstr "莫斯科 Sheremetyevo"
 
 # my-evolution/Locations.h:1474
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moses Lake"
 msgstr "摩西湖"
 
@@ -31537,48 +32019,48 @@ msgstr "摩西湖"
 # addressbook/gui/contact-editor/contact-editor.glade.h:20
 # addressbook/gui/contact-editor/e-contact-editor.c:1655
 # my-evolution/Locations.h:1475
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 #, fuzzy
 msgid "Mosinee"
 msgstr "手机"
 
 # my-evolution/Locations.h:1476
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosjoen"
 msgstr ""
 
 # my-evolution/Locations.h:1477
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Moultrie"
 msgstr ""
 
 # my-evolution/Locations.h:1478
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Mountain Home"
 msgstr ""
 
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 # my-evolution/Locations.h:1479
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 #, fuzzy
 msgid "Mountain View"
 msgstr "月视图"
 
 # my-evolution/Locations.h:1480
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mount Clemens"
 msgstr ""
 
 # my-evolution/Locations.h:1481
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Holly"
 msgstr ""
 
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
 # my-evolution/Locations.h:1482
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 #, fuzzy
 msgid "Mount Shasta"
 msgstr "东南"
@@ -31586,79 +32068,79 @@ msgstr "东南"
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 # my-evolution/Locations.h:1483
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "月视图"
 
 # my-evolution/Locations.h:1484
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Wilson"
 msgstr ""
 
 # my-evolution/Locations.h:1485
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mt Washington"
 msgstr "Mt 华盛顿"
 
 # my-evolution/Locations.h:1486
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mugla/Dalaman"
 msgstr ""
 
 # my-evolution/Locations.h:1487
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Muir"
 msgstr ""
 
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/backend/ebook/e-card-simple.c:93
 # my-evolution/Locations.h:1488
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 #, fuzzy
 msgid "Mullan"
 msgstr "经理"
 
 # my-evolution/Locations.h:1489
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullen"
 msgstr ""
 
 # my-evolution/Locations.h:1490
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Munchen"
 msgstr ""
 
 # calendar/gui/goto-dialog.glade.h:9
 # calendar/gui/goto-dialog.glade.h:9
 # my-evolution/Locations.h:1491
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 #, fuzzy
 msgid "Muncie"
 msgstr "六月"
 
 # my-evolution/Locations.h:1492
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Munster/Osnabruck"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:134
 # addressbook/gui/contact-editor/fulladdr.glade.h:134
 # my-evolution/Locations.h:1493
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 #, fuzzy
 msgid "Murcia"
 msgstr "毛里塔尼亚"
 
 # my-evolution/Locations.h:1494
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murmansk"
 msgstr "摩尔曼斯克"
 
 # addressbook/gui/contact-editor/fullname.glade.h:11
 # addressbook/gui/contact-editor/fullname.glade.h:11
 # my-evolution/Locations.h:1495
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 #, fuzzy
 msgid "Mus"
 msgstr "女士"
@@ -31666,126 +32148,126 @@ msgstr "女士"
 # addressbook/gui/contact-editor/fulladdr.glade.h:133
 # addressbook/gui/contact-editor/fulladdr.glade.h:133
 # my-evolution/Locations.h:1496
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Muscatine"
 msgstr "马提尼可岛"
 
 # my-evolution/Locations.h:1497
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscle Shoals"
 msgstr ""
 
 # my-evolution/Locations.h:1498
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muskegon"
 msgstr ""
 
 # addressbook/printing/e-contact-print.glade.h:8
 # my-evolution/metar.c:33
 # my-evolution/Locations.h:1499
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 #, fuzzy
 msgid "Mykonos"
 msgstr "节"
 
 # my-evolution/Locations.h:1500
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Myrtle Beach"
 msgstr ""
 
 # my-evolution/Locations.h:1501
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
 # my-evolution/Locations.h:1502
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nacogdoches"
 msgstr ""
 
 # my-evolution/Locations.h:1503
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nagasaki Airport"
 msgstr "长崎机场"
 
 # my-evolution/Locations.h:1504
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagoya Airport"
 msgstr "名古屋机场"
 
 # my-evolution/Locations.h:1505
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagpur Sonegaon"
 msgstr "那格浦尔 Sonegaon"
 
 # my-evolution/Locations.h:1506
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Naha Airport"
 msgstr "那霸机场"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:18
 # addressbook/gui/contact-editor/fulladdr.glade.h:18
 # my-evolution/Locations.h:1507
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 #, fuzzy
 msgid "Najran"
 msgstr "巴林岛"
 
 # my-evolution/Locations.h:1508
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Nakashibetsu Airport"
 msgstr ""
 
 # my-evolution/Locations.h:1509
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nalchik"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:116
 # addressbook/gui/contact-editor/fulladdr.glade.h:116
 # my-evolution/Locations.h:1510
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 #, fuzzy
 msgid "Namsos"
 msgstr "老挝"
 
 # my-evolution/Locations.h:1511
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Nancy-Essey"
 msgstr ""
 
 # my-evolution/Locations.h:1512
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Ochey"
 msgstr ""
 
 # my-evolution/Locations.h:1513
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nankishirahama Airport"
 msgstr ""
 
 # mail/mail-callbacks.c:2128 widgets/misc/e-messagebox.c:159
 # mail/mail-callbacks.c:2247 widgets/misc/e-messagebox.c:159
 # my-evolution/Locations.h:1514
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nanning"
 msgstr "南宁"
 
 # my-evolution/Locations.h:1515
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nantes Adlantique"
 msgstr "南特 Adlantique"
 
 # my-evolution/Locations.h:1516
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantucket"
 msgstr "楠塔基特"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:147
 # addressbook/gui/contact-editor/fulladdr.glade.h:147
 # my-evolution/Locations.h:1517
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 #, fuzzy
 msgid "Napa"
 msgstr "尼泊尔"
@@ -31793,163 +32275,163 @@ msgstr "尼泊尔"
 # mail/mail-config.glade.h:46
 # mail/mail-config.glade.h:46
 # my-evolution/Locations.h:1518
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Naples"
 msgstr "那不勒斯"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:130
 # addressbook/gui/contact-editor/fulladdr.glade.h:130
 # my-evolution/Locations.h:1519
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Napoli"
 msgstr "那不勒斯"
 
 # addressbook/backend/ebook/e-card-simple.c:95
 # addressbook/backend/ebook/e-card-simple.c:95
 # my-evolution/Locations.h:1520
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Narvik"
 msgstr "纳尔维克"
 
 # my-evolution/Locations.h:1521
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Nasa Shuttle"
 msgstr ""
 
 # my-evolution/Locations.h:1522
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nashua"
 msgstr ""
 
 # my-evolution/Locations.h:1523
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashville"
 msgstr "纳什维尔"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:5
 # calendar/zones.h:137
 # my-evolution/Locations.h:1524
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nassau"
 msgstr "拿骚"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:172
 # addressbook/gui/contact-editor/fulladdr.glade.h:172
 # my-evolution/Locations.h:1525
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Natal"
 msgstr "纳塔耳"
 
 # mail/mail-search.c:346
 # mail/mail-search.c:346
 # my-evolution/Locations.h:1526
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natchez"
 msgstr "纳齐兹"
 
 # my-evolution/Locations.h:1527
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Nawabshah"
 msgstr ""
 
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 # my-evolution/Locations.h:1528
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nebraska"
 msgstr "内布拉斯加州"
 
 # my-evolution/Locations.h:1529
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Needles"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:89
 # addressbook/gui/contact-editor/fulladdr.glade.h:89
 # my-evolution/Locations.h:1530
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 #, fuzzy
 msgid "Nenana"
 msgstr "格林纳达"
 
 # my-evolution/Locations.h:1532
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Neuquen"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:89
 # addressbook/gui/contact-editor/fulladdr.glade.h:89
 # my-evolution/Locations.h:1533
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Nevada"
 msgstr "内华达州"
 
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 # my-evolution/Locations.h:1534
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Newark"
 msgstr "内瓦克"
 
 # my-evolution/e-summary-rdf.c:528
 # my-evolution/e-summary-rdf.c:528
 # my-evolution/Locations.h:1535
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "New Bedford"
 msgstr "新贝德福德"
 
 # ui/evolution.xml.h:44
 # ui/evolution.xml.h:44
 # my-evolution/Locations.h:1536
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bern"
 msgstr "新伯尔尼"
 
 # my-evolution/Locations.h:1537
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Braunfels"
 msgstr ""
 
 # my-evolution/Locations.h:1538
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Brunswick"
 msgstr ""
 
 # my-evolution/Locations.h:1539
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "Newburgh"
 msgstr ""
 
 # mail/mail-config.glade.h:46
 # mail/mail-config.glade.h:46
 # my-evolution/Locations.h:1540
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newcastle"
 msgstr "纽卡斯尔"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:151
 # addressbook/gui/contact-editor/fulladdr.glade.h:151
 # my-evolution/Locations.h:1541
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "New Delhi/Palam"
 msgstr "新德里/Palam"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:151
 # addressbook/gui/contact-editor/fulladdr.glade.h:151
 # my-evolution/Locations.h:1542
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "Newfoundland"
 msgstr "纽芬兰"
 
 # my-evolution/Locations.h:1543
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "New Hampshire"
 msgstr "新汉普郡"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:150
 # addressbook/gui/contact-editor/fulladdr.glade.h:150
 # my-evolution/Locations.h:1544
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 #, fuzzy
 msgid "New Haven"
 msgstr "新喀里多尼亚"
@@ -31957,144 +32439,144 @@ msgstr "新喀里多尼亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:150
 # addressbook/gui/contact-editor/fulladdr.glade.h:150
 # my-evolution/Locations.h:1545
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Iberia"
 msgstr "新伊比利亚"
 
 # ui/evolution-mail-global.xml.h:10
 # ui/evolution-mail-global.xml.h:10
 # my-evolution/Locations.h:1546
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Jersey"
 msgstr "新泽西州"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:137
 # addressbook/gui/contact-editor/fulladdr.glade.h:137
 # my-evolution/Locations.h:1547
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Mexico"
 msgstr "新墨西哥州"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:151
 # addressbook/gui/contact-editor/fulladdr.glade.h:151
 # my-evolution/Locations.h:1548
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Orleans"
 msgstr "新奥尔良"
 
 # my-evolution/Locations.h:1549
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans-Lakefront"
 msgstr "新奥尔良-Lakefront"
 
 # my-evolution/Locations.h:1550
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans NAS"
 msgstr "新奥尔良国家科学院"
 
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
 # my-evolution/Locations.h:1551
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 #, fuzzy
 msgid "Newport"
 msgstr "北"
 
 # my-evolution/Locations.h:1552
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport News"
 msgstr ""
 
 # my-evolution/Locations.h:1553
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "New Port Richey"
 msgstr ""
 
 # ui/evolution.xml.h:44
 # ui/evolution.xml.h:44
 # my-evolution/Locations.h:1554
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 #, fuzzy
 msgid "New River"
 msgstr "新建文件夹(_N)"
 
 # my-evolution/Locations.h:1555
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New Tokyo International Airport"
 msgstr "东京新国际机场"
 
 # widgets/misc/e-charset-picker.c:101
 # widgets/misc/e-charset-picker.c:101
 # my-evolution/Locations.h:1556
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "Newton"
 msgstr "牛顿"
 
 # ui/evolution.xml.h:44
 # ui/evolution.xml.h:44
 # my-evolution/Locations.h:1557
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "New York"
 msgstr "纽约"
 
 # my-evolution/Locations.h:1558
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York-JFK Arpt"
 msgstr "纽约-JFK Arpt"
 
 # my-evolution/Locations.h:1559
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-La Guardia"
 msgstr "纽约-La Guardia"
 
 # my-evolution/Locations.h:1561
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "Niagara Falls"
 msgstr "尼亚加拉瀑布"
 
 # my-evolution/Locations.h:1563
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
 # my-evolution/Locations.h:1564
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Niigata Airport"
 msgstr "新滹机场"
 
 # addressbook/printing/e-contact-print.glade.h:6
 # addressbook/printing/e-contact-print.glade.h:6
 # my-evolution/Locations.h:1565
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Nimes-Garons"
 msgstr "尼姆-Garons"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:196
 # addressbook/gui/contact-editor/fulladdr.glade.h:196
 # my-evolution/Locations.h:1566
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nipawin"
 msgstr "西班牙"
 
 # my-evolution/Locations.h:1567
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nis"
 msgstr "是"
 
 # my-evolution/Locations.h:1568
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nizhny Novgorod"
 msgstr ""
 
 # my-evolution/Locations.h:1569
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "N Las Vegas"
 msgstr ""
 
 # my-evolution/Locations.h:1570
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Myrtle Beach"
 msgstr ""
 
@@ -32107,7 +32589,7 @@ msgstr ""
 # calendar/gui/dialogs/task-details-page.glade.h:9
 # calendar/gui/e-calendar-table.c:406 mail/message-list.c:661
 # my-evolution/Locations.h:1571
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 #, fuzzy
 msgid "Nogales"
 msgstr "中"
@@ -32115,28 +32597,28 @@ msgstr "中"
 # addressbook/backend/ebook/e-card-simple.c:61
 # addressbook/backend/ebook/e-card-simple.c:61
 # my-evolution/Locations.h:1572
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nome"
 msgstr "诺母"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:156
 # addressbook/gui/contact-editor/fulladdr.glade.h:156
 # my-evolution/Locations.h:1573
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Norfolk"
 msgstr "诺福克"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:156
 # addressbook/gui/contact-editor/fulladdr.glade.h:156
 # my-evolution/Locations.h:1575
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk NAS"
 msgstr "诺福克国家科学院"
 
 # mail/mail-mt.c:901
 # mail/mail-mt.c:901
 # my-evolution/Locations.h:1576
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 #, fuzzy
 msgid "Norrkoping"
 msgstr "正在工作"
@@ -32144,27 +32626,27 @@ msgstr "正在工作"
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
 # my-evolution/Locations.h:1577
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "North Adams"
 msgstr "北亚当斯"
 
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
 # my-evolution/Locations.h:1578
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Bend"
 msgstr "北"
 
 # my-evolution/Locations.h:1579
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Carolina"
 msgstr "北卡罗莱纳州"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:158
 # addressbook/gui/contact-editor/fulladdr.glade.h:158
 # my-evolution/Locations.h:1580
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 #, fuzzy
 msgid "North Conway"
 msgstr "挪威"
@@ -32172,31 +32654,31 @@ msgstr "挪威"
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
 # my-evolution/Locations.h:1581
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Dakota"
 msgstr "北达科他"
 
 # my-evolution/Locations.h:1582
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "Northeast Philadelphia"
 msgstr "东北费城"
 
 # my-evolution/Locations.h:1583
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "North Kingstown"
 msgstr "北金斯敦"
 
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
 # my-evolution/Locations.h:1584
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Platte"
 msgstr "北普拉特"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:158
 # addressbook/gui/contact-editor/fulladdr.glade.h:158
 # my-evolution/Locations.h:1585
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "Northway"
 msgstr "挪威"
@@ -32204,7 +32686,7 @@ msgstr "挪威"
 # addressbook/gui/contact-editor/fulladdr.glade.h:80
 # addressbook/gui/contact-editor/fulladdr.glade.h:80
 # my-evolution/Locations.h:1586
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "法属南部地区"
@@ -32212,7 +32694,7 @@ msgstr "法属南部地区"
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
 # my-evolution/Locations.h:1588
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 #, fuzzy
 msgid "Norwich"
 msgstr "北"
@@ -32220,7 +32702,7 @@ msgstr "北"
 # addressbook/gui/contact-editor/fulladdr.glade.h:158
 # addressbook/gui/contact-editor/fulladdr.glade.h:158
 # my-evolution/Locations.h:1589
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwood"
 msgstr "挪威"
@@ -32230,33 +32712,33 @@ msgstr "挪威"
 # addressbook/backend/ebook/e-card-simple.c:97
 # addressbook/gui/widgets/e-addressbook-view.c:886
 # my-evolution/Locations.h:1590
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Notodden"
 msgstr "注释"
 
 # my-evolution/Locations.h:1591
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Novara/Cameri"
 msgstr "诺瓦蜡/Cameri"
 
 # my-evolution/Locations.h:1592
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Nova Scotia"
 msgstr "新斯科舍"
 
 # my-evolution/Locations.h:1593
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Novosibirsk"
 msgstr "新西伯利亚"
 
 # my-evolution/Locations.h:1594
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Nueva Gerona"
 msgstr ""
 
 # my-evolution/Locations.h:1595
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Ocotepeque"
 msgstr ""
 
@@ -32267,60 +32749,60 @@ msgstr ""
 # calendar/gui/dialogs/task-details-page.glade.h:10
 # calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 # my-evolution/Locations.h:1596
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "尚未开始"
 
 # my-evolution/Locations.h:1597
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nurnberg"
 msgstr ""
 
 # my-evolution/Locations.h:1598
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nyutabaru Ab"
 msgstr ""
 
 # my-evolution/Locations.h:1599
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Oahu"
 msgstr "瓦胡岛"
 
 # my-evolution/Locations.h:1600
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oak Harbor"
 msgstr "橡树湾"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:208
 # addressbook/gui/contact-editor/fulladdr.glade.h:208
 # my-evolution/Locations.h:1601
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oakland"
 msgstr "奥克兰"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:108
 # addressbook/gui/contact-editor/fulladdr.glade.h:108
 # my-evolution/Locations.h:1602
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oaxaca"
 msgstr "牙买加"
 
 # my-evolution/Locations.h:1603
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oberpfaffenhofen"
 msgstr ""
 
 # my-evolution/Locations.h:1604
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Obihiro Airport"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # my-evolution/Locations.h:1605
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 #, fuzzy
 msgid "Ocala"
 msgstr "帕劳群岛"
@@ -32328,7 +32810,7 @@ msgstr "帕劳群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:102
 # addressbook/gui/contact-editor/fulladdr.glade.h:102
 # my-evolution/Locations.h:1606
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Oceanside"
 msgstr "冰岛"
@@ -32338,7 +32820,7 @@ msgstr "冰岛"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 # ui/evolution-message-composer.xml.h:13
 # my-evolution/Locations.h:1607
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Odense"
 msgstr "欧登塞"
 
@@ -32347,7 +32829,7 @@ msgstr "欧登塞"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 # ui/evolution-message-composer.xml.h:13
 # my-evolution/Locations.h:1608
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 #, fuzzy
 msgid "Odesa"
 msgstr "打开"
@@ -32355,7 +32837,7 @@ msgstr "打开"
 # mail/message-list.c:640
 # mail/message-list.c:646
 # my-evolution/Locations.h:1609
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 #, fuzzy
 msgid "Oelwen"
 msgstr "可见"
@@ -32365,22 +32847,22 @@ msgstr "可见"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 # ui/evolution-message-composer.xml.h:13
 # my-evolution/Locations.h:1610
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Ogden"
 msgstr "奥格登"
 
 # my-evolution/Locations.h:1611
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden-Hill AFB"
 msgstr "奥格登山空军基地"
 
 # my-evolution/Locations.h:1612
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogdensburg"
 msgstr ""
 
 # my-evolution/Locations.h:1613
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ohio"
 msgstr "俄亥俄州"
 
@@ -32395,63 +32877,63 @@ msgstr "俄亥俄州"
 # addressbook/gui/contact-editor/e-contact-editor.c:1714
 # mail/mail-config.glade.h:49
 # my-evolution/Locations.h:1614
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 #, fuzzy
 msgid "Ohrid"
 msgstr "其它"
 
 # my-evolution/Locations.h:1615
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Oita Airport"
 msgstr "大分机场"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:53
 # addressbook/gui/contact-editor/fulladdr.glade.h:53
 # my-evolution/Locations.h:1616
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 #, fuzzy
 msgid "Ojika Island"
 msgstr "库克群岛"
 
 # my-evolution/Locations.h:1617
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Okayama Airport"
 msgstr "冈山机场"
 
 # my-evolution/Locations.h:1618
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Oki Airport"
 msgstr ""
 
 # my-evolution/Locations.h:1619
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Okinoerabu"
 msgstr ""
 
 # my-evolution/Locations.h:1620
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Oklahoma"
 msgstr "俄克拉荷马州"
 
 # my-evolution/Locations.h:1621
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma City"
 msgstr "俄克拉荷马城"
 
 # my-evolution/Locations.h:1622
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City-Bethany"
 msgstr "俄克拉荷马城-Bethany"
 
 # my-evolution/Locations.h:1623
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Midwest City"
 msgstr "俄克拉荷马城-中西部城市"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:33
 # addressbook/gui/contact-editor/fulladdr.glade.h:33
 # my-evolution/Locations.h:1624
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 #, fuzzy
 msgid "Okushiri Island"
 msgstr "不列颠处女群岛"
@@ -32467,68 +32949,68 @@ msgstr "不列颠处女群岛"
 # addressbook/gui/contact-editor/e-contact-editor.c:1714
 # mail/mail-config.glade.h:49
 # my-evolution/Locations.h:1625
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 #, fuzzy
 msgid "Olathe"
 msgstr "其它"
 
 # my-evolution/Locations.h:1626
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe/Ind."
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:3
 # addressbook/gui/contact-editor/fulladdr.glade.h:3
 # my-evolution/Locations.h:1627
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 #, fuzzy
 msgid "Olbia"
 msgstr "阿尔巴尼亚"
 
 # my-evolution/Locations.h:1628
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olympia"
 msgstr "奥林匹亚"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:159
 # addressbook/gui/contact-editor/fulladdr.glade.h:159
 # my-evolution/Locations.h:1629
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Omaha"
 msgstr "奥马哈"
 
 # my-evolution/Locations.h:1630
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha-Bellevue"
 msgstr "奥马哈-Bellevue"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:159
 # addressbook/gui/contact-editor/fulladdr.glade.h:159
 # my-evolution/Locations.h:1631
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 #, fuzzy
 msgid "Omak"
 msgstr "阿曼"
 
 # my-evolution/Locations.h:1633
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Ominato Ab"
 msgstr ""
 
 # my-evolution/Locations.h:1634
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Omsk"
 msgstr "鄂木斯克"
 
 # my-evolution/Locations.h:1635
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "O'Neill"
 msgstr ""
 
 # addressbook/printing/e-contact-print.glade.h:24
 # addressbook/printing/e-contact-print.glade.h:24
 # my-evolution/Locations.h:1636
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "Ontario"
 msgstr "安大略"
 
@@ -32537,55 +33019,55 @@ msgstr "安大略"
 # calendar/gui/dialogs/meeting-page.etspec.h:1
 # calendar/gui/e-meeting-time-sel.etspec.h:1
 # my-evolution/Locations.h:1637
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Oostende"
 msgstr "奥斯坦德"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:159
 # addressbook/gui/contact-editor/fulladdr.glade.h:159
 # my-evolution/Locations.h:1638
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oran"
 msgstr "奥兰"
 
 # my-evolution/Locations.h:1639
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran/Es Senia"
 msgstr "奥兰/Es Senia"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:77
 # addressbook/gui/contact-editor/fulladdr.glade.h:77
 # my-evolution/Locations.h:1640
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Orange"
 msgstr "奥林奇"
 
 # my-evolution/Locations.h:1641
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange City"
 msgstr "奥林奇城"
 
 # my-evolution/Locations.h:1642
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Ord-Sharp"
 msgstr ""
 
 # addressbook/backend/ebook/e-card-simple.c:69
 # addressbook/backend/ebook/e-card-simple.c:69
 # my-evolution/Locations.h:1643
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Oregon"
 msgstr "俄勒冈州"
 
 # my-evolution/Locations.h:1644
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Orenburg"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:105
 # addressbook/gui/contact-editor/fulladdr.glade.h:105
 # my-evolution/Locations.h:1645
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 #, fuzzy
 msgid "Orland"
 msgstr "爱尔兰"
@@ -32593,153 +33075,153 @@ msgstr "爱尔兰"
 # addressbook/gui/contact-editor/fulladdr.glade.h:105
 # addressbook/gui/contact-editor/fulladdr.glade.h:105
 # my-evolution/Locations.h:1646
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orlando"
 msgstr "奥兰多"
 
 # my-evolution/Locations.h:1647
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando (Orlando International)"
 msgstr "奥兰多 (奥兰多国际)"
 
 # my-evolution/Locations.h:1648
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orsta-Volda"
 msgstr ""
 
 # widgets/misc/e-messagebox.c:166
 # widgets/misc/e-messagebox.c:166
 # my-evolution/Locations.h:1649
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Oruro"
 msgstr "奥鲁罗"
 
 # my-evolution/Locations.h:1650
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Osaka International Airport"
 msgstr "大阪国际机场"
 
 # my-evolution/Locations.h:1651
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osan Ab"
 msgstr ""
 
 # my-evolution/Locations.h:1652
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 #, fuzzy
 msgid "Oscoda"
 msgstr "秒"
 
 # my-evolution/Locations.h:1653
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oseberg A"
 msgstr ""
 
 # my-evolution/Locations.h:1654
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oshima Airport"
 msgstr ""
 
 # my-evolution/Locations.h:1655
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshkosh"
 msgstr ""
 
 # my-evolution/Locations.h:1656
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oslo/Gardenmoen"
 msgstr "奥斯陆/Gardenmoen"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # my-evolution/Locations.h:1657
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Ostrava"
 msgstr "俄斯特拉发"
 
 # my-evolution/Locations.h:1658
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ottawa"
 msgstr "渥太华"
 
 # my-evolution/Locations.h:1659
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottumwa"
 msgstr ""
 
 # my-evolution/Locations.h:1660
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Owensboro"
 msgstr ""
 
 # my-evolution/Locations.h:1661
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 #, fuzzy
 msgid "Owyhee"
 msgstr "周"
 
 # my-evolution/Locations.h:1662
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Oxford"
 msgstr "牛津"
 
 # my-evolution/Locations.h:1663
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxnard"
 msgstr ""
 
 # my-evolution/Locations.h:1664
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Ozark"
 msgstr "奥扎克"
 
 # my-evolution/Locations.h:1665
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozuki Ab"
 msgstr ""
 
 # my-evolution/Locations.h:1666
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Paderborn-Haxterberg"
 msgstr "帕德伯恩-Haxterberg"
 
 # my-evolution/Locations.h:1667
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Padova"
 msgstr "帕多瓦"
 
 # my-evolution/Locations.h:1668
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Paducah"
 msgstr ""
 
 # my-evolution/Locations.h:1669
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paekado"
 msgstr ""
 
 # my-evolution/Locations.h:1670
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paengnyongdo Ab"
 msgstr ""
 
 # addressbook/printing/e-contact-print.glade.h:25
 # addressbook/printing/e-contact-print.glade.h:25
 # my-evolution/Locations.h:1671
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 #, fuzzy
 msgid "Paganella"
 msgstr "页面"
 
 # my-evolution/Locations.h:1674
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # my-evolution/Locations.h:1675
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 #, fuzzy
 msgid "Palacios"
 msgstr "帕劳群岛"
@@ -32747,19 +33229,19 @@ msgstr "帕劳群岛"
 # addressbook/printing/e-contact-print.glade.h:27
 # addressbook/printing/e-contact-print.glade.h:27
 # my-evolution/Locations.h:1676
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palermo"
 msgstr "巴勒莫"
 
 # my-evolution/Locations.h:1677
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palma de Mallorca"
 msgstr "帕尔马 德 马略卡"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # my-evolution/Locations.h:1678
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 #, fuzzy
 msgid "Palmdale"
 msgstr "帕劳群岛"
@@ -32771,27 +33253,27 @@ msgstr "帕劳群岛"
 # addressbook/gui/contact-editor/e-contact-editor.c:1658
 # addressbook/gui/widgets/e-addressbook-view.c:870
 # my-evolution/Locations.h:1679
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmer"
 msgstr "帕默"
 
 # mail/mail-accounts.c:783 mail/mail-config.glade.h:42
 # mail/mail-accounts.c:798 mail/mail-config.glade.h:42
 # my-evolution/Locations.h:1680
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palm Springs"
 msgstr "邮件设置"
 
 # my-evolution/Locations.h:1681
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palo Alto"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # my-evolution/Locations.h:1682
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 #, fuzzy
 msgid "Pamplona"
 msgstr "帕劳群岛"
@@ -32799,7 +33281,7 @@ msgstr "帕劳群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:163
 # addressbook/gui/contact-editor/fulladdr.glade.h:163
 # my-evolution/Locations.h:1684
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama City"
 msgstr "巴拿马城"
 
@@ -32814,7 +33296,7 @@ msgstr "巴拿马城"
 # calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
 # camel/camel-service.c:610 camel/camel-service.c:646
 # my-evolution/Locations.h:1685
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Pantelleria"
 msgstr "已经取消"
@@ -32822,7 +33304,7 @@ msgstr "已经取消"
 # addressbook/printing/e-contact-print.glade.h:27
 # addressbook/printing/e-contact-print.glade.h:27
 # my-evolution/Locations.h:1686
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Papa"
 msgstr "纸张"
@@ -32830,7 +33312,7 @@ msgstr "纸张"
 # addressbook/gui/contact-editor/fulladdr.glade.h:116
 # addressbook/gui/contact-editor/fulladdr.glade.h:116
 # my-evolution/Locations.h:1687
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Paphos"
 msgstr "老挝"
@@ -32838,29 +33320,29 @@ msgstr "老挝"
 # addressbook/printing/e-contact-print.glade.h:21
 # addressbook/printing/e-contact-print.glade.h:21
 # my-evolution/Locations.h:1689
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paris"
 msgstr "巴黎"
 
 # my-evolution/Locations.h:1690
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris/Charles De Gaulle"
 msgstr "巴黎/Charles De Gaulle"
 
 # my-evolution/Locations.h:1691
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Le Bourget"
 msgstr "巴黎/Le Bourget"
 
 # my-evolution/metar.c:359
 # my-evolution/metar.c:359
 # my-evolution/Locations.h:1692
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Orly"
 msgstr "巴黎/Orly"
 
 # my-evolution/Locations.h:1693
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Parkersburg"
 msgstr ""
 
@@ -32871,72 +33353,72 @@ msgstr ""
 # camel/providers/nntp/camel-nntp-store.c:149
 # camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 # my-evolution/Locations.h:1694
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 #, fuzzy
 msgid "Pasco"
 msgstr "密码"
 
 # my-evolution/Locations.h:1695
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Paso De Los Libres"
 msgstr ""
 
 # my-evolution/Locations.h:1696
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso Robles"
 msgstr ""
 
 # my-evolution/Locations.h:1697
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Passo dei Giovi"
 msgstr ""
 
 # my-evolution/Locations.h:1698
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo della Cisa"
 msgstr ""
 
 # my-evolution/Locations.h:1699
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo Resia"
 msgstr ""
 
 # my-evolution/Locations.h:1700
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Rolle"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:163
 # addressbook/gui/contact-editor/fulladdr.glade.h:163
 # my-evolution/Locations.h:1701
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Patna"
 msgstr "巴特纳"
 
 # my-evolution/Locations.h:1702
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patterson"
 msgstr "帕特森"
 
 # my-evolution/Locations.h:1703
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patuxent River"
 msgstr ""
 
 # my-evolution/Locations.h:1704
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Pau/Pyrenees"
 msgstr "Pau/比利牛斯山脉"
 
 # my-evolution/Locations.h:1705
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Paxson"
 msgstr ""
 
 # my-evolution/metar.c:326
 # my-evolution/metar.c:326
 # my-evolution/Locations.h:1706
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 #, fuzzy
 msgid "Paysandu"
 msgstr "重沙尘"
@@ -32944,7 +33426,7 @@ msgstr "重沙尘"
 # calendar/gui/dialogs/alarm-options.glade.h:3
 # calendar/gui/dialogs/alarm-options.glade.h:3
 # my-evolution/Locations.h:1707
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Payson"
 msgstr "播放声音："
@@ -32952,7 +33434,7 @@ msgstr "播放声音："
 # widgets/misc/e-messagebox.c:173
 # widgets/misc/e-messagebox.c:173
 # my-evolution/Locations.h:1708
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Pellston"
 msgstr "问题"
@@ -32960,7 +33442,7 @@ msgstr "问题"
 # ui/my-evolution.xml.h:5
 # ui/my-evolution.xml.h:5
 # my-evolution/Locations.h:1709
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pelotas"
 msgstr "重新载入"
@@ -32968,124 +33450,124 @@ msgstr "重新载入"
 # widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 # widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 # my-evolution/Locations.h:1710
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pendleton"
 msgstr "选择："
 
 # my-evolution/Locations.h:1711
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pennsylvania"
 msgstr "宾西法尼亚州"
 
 # my-evolution/Locations.h:1712
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Penn Yan"
 msgstr "佩恩 Yan"
 
 # my-evolution/Locations.h:1713
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Pensacola"
 msgstr ""
 
 # my-evolution/Locations.h:1714
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola NAS"
 msgstr ""
 
 # my-evolution/Locations.h:1715
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "People's Republic of China"
 msgstr "中华人民共和国"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:83
 # addressbook/gui/contact-editor/fulladdr.glade.h:83
 # my-evolution/Locations.h:1716
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 #, fuzzy
 msgid "Peoria"
 msgstr "格鲁吉亚"
 
 # my-evolution/Locations.h:1717
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Pequot Lakes"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:5
 # calendar/zones.h:127
 # my-evolution/Locations.h:1718
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pereira/Matecana"
 msgstr "佩雷拉/Matecana"
 
 # addressbook/backend/ebook/e-card-simple.c:63
 # addressbook/backend/ebook/e-card-simple.c:63
 # my-evolution/Locations.h:1719
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 #, fuzzy
 msgid "Perm"
 msgstr "主要"
 
 # my-evolution/Locations.h:1720
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
 # my-evolution/Locations.h:1721
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perry-Foley"
 msgstr "佩里-福利"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:166
 # addressbook/gui/contact-editor/fulladdr.glade.h:166
 # my-evolution/Locations.h:1722
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perth"
 msgstr "珀斯"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:166
 # addressbook/gui/contact-editor/fulladdr.glade.h:166
 # my-evolution/Locations.h:1724
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Perugia"
 msgstr "佩鲁贾"
 
 # my-evolution/Locations.h:1725
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Pescara"
 msgstr "佩斯卡拉"
 
 # my-evolution/Locations.h:1726
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Petersburg"
 msgstr "彼得斯堡"
 
 # my-evolution/Locations.h:1727
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
 # my-evolution/Locations.h:1728
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petrozavodsk"
 msgstr "彼得罗扎沃茨克"
 
 # my-evolution/Locations.h:1729
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Philadelphia"
 msgstr "费城"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:167
 # addressbook/gui/contact-editor/fulladdr.glade.h:167
 # my-evolution/Locations.h:1730
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philip"
 msgstr "菲利普"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:167
 # addressbook/gui/contact-editor/fulladdr.glade.h:167
 # my-evolution/Locations.h:1731
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 #, fuzzy
 msgid "Philipsburg"
 msgstr "菲利宾"
@@ -33093,145 +33575,145 @@ msgstr "菲利宾"
 # addressbook/gui/contact-editor/fulladdr.glade.h:167
 # addressbook/gui/contact-editor/fulladdr.glade.h:167
 # my-evolution/Locations.h:1732
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Phillips"
 msgstr "菲利普"
 
 # calendar/zones.h:146
 # my-evolution/Locations.h:1733
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phoenix"
 msgstr "凤凰城"
 
 # my-evolution/Locations.h:1734
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix-Deer Valley"
 msgstr "凤凰城-鹿谷"
 
 # my-evolution/Locations.h:1735
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Goodyear"
 msgstr "凤凰城-古德伊尔"
 
 # my-evolution/Locations.h:1736
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Luke AFB"
 msgstr "凤凰城-卢克空军基地"
 
 # my-evolution/Locations.h:1737
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Piacenza"
 msgstr ""
 
 # my-evolution/Locations.h:1738
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Pian Rosa"
 msgstr ""
 
 # my-evolution/Locations.h:1739
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Piedras Negras"
 msgstr ""
 
 # importers/pine-importer.c:691
 # importers/pine-importer.c:691
 # my-evolution/Locations.h:1740
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Pierre"
 msgstr "皮埃尔"
 
 # my-evolution/Locations.h:1741
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pietersburg"
 msgstr ""
 
 # calendar/gui/dialogs/recurrence-page.glade.h:6
 # calendar/gui/dialogs/recurrence-page.glade.h:6
 # my-evolution/Locations.h:1742
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 #, fuzzy
 msgid "Pikeville"
 msgstr "预览"
 
 # my-evolution/Locations.h:1743
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pine Bluff"
 msgstr ""
 
 # my-evolution/Locations.h:1744
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pingtung North"
 msgstr ""
 
 # my-evolution/Locations.h:1745
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung South"
 msgstr ""
 
 # my-evolution/Locations.h:1746
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pirassununga"
 msgstr ""
 
 # my-evolution/Locations.h:1747
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pisa"
 msgstr "比萨"
 
 # my-evolution/Locations.h:1748
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisco"
 msgstr "皮斯科"
 
 # my-evolution/Locations.h:1749
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pittsburgh"
 msgstr "匹兹堡"
 
 # my-evolution/Locations.h:1750
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh-West Mifflin"
 msgstr "匹兹堡-West Mifflin"
 
 # my-evolution/Locations.h:1751
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Plattsburg"
 msgstr ""
 
 # my-evolution/Locations.h:1752
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plovdiv"
 msgstr "普罗夫迪夫"
 
 # my-evolution/Locations.h:1753
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plymouth"
 msgstr "普利茅斯"
 
 # my-evolution/Locations.h:1754
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Pocatello"
 msgstr ""
 
 # my-evolution/Locations.h:1755
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocos De Caldas"
 msgstr ""
 
 # my-evolution/Locations.h:1756
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Podgorica"
 msgstr "波德戈里查"
 
 # my-evolution/metar.c:449
 # my-evolution/metar.c:449
 # my-evolution/Locations.h:1757
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica Titograd"
 msgstr "波德戈里查 铁托格勒"
 
 # my-evolution/Locations.h:1758
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Pohang Ab"
 msgstr ""
 
@@ -33240,7 +33722,7 @@ msgstr ""
 # addressbook/printing/e-contact-print-envelope.c:215
 # addressbook/printing/e-contact-print-envelope.c:236
 # my-evolution/Locations.h:1759
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 #, fuzzy
 msgid "Point Hope"
 msgstr "打印信封"
@@ -33248,7 +33730,7 @@ msgstr "打印信封"
 # ui/my-evolution.xml.h:4
 # ui/my-evolution.xml.h:4
 # my-evolution/Locations.h:1760
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Lay"
 msgstr "打印概要"
@@ -33256,70 +33738,70 @@ msgstr "打印概要"
 # mail/mail-callbacks.c:2325
 # mail/mail-callbacks.c:2465
 # my-evolution/Locations.h:1761
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Mugu"
 msgstr "打印消息"
 
 # my-evolution/Locations.h:1762
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Piedras Blanca"
 msgstr ""
 
 # mail/mail-callbacks.c:2262
 # mail/mail-callbacks.c:2381
 # my-evolution/Locations.h:1763
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 #, fuzzy
 msgid "Poitiers"
 msgstr "过滤规则"
 
 # my-evolution/Locations.h:1765
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Pompano Beach"
 msgstr ""
 
 # views/addressbook/galview.xml.h:3
 # views/addressbook/galview.xml.h:3
 # my-evolution/Locations.h:1766
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Ponca City"
 msgstr "彭加城"
 
 # mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 # mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 # my-evolution/Locations.h:1767
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponce"
 msgstr "庞塞"
 
 # my-evolution/Locations.h:1768
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponta Pora"
 msgstr ""
 
 # ui/evolution-addressbook.xml.h:31
 # ui/evolution-addressbook.xml.h:31
 # my-evolution/Locations.h:1769
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 #, fuzzy
 msgid "Pontiac"
 msgstr "联系人(_C)"
 
 # my-evolution/Locations.h:1770
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pope AFB"
 msgstr ""
 
 # my-evolution/Locations.h:1771
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Poplar Bluff"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # my-evolution/Locations.h:1772
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 #, fuzzy
 msgid "Poprad"
 msgstr "波兰"
@@ -33327,12 +33809,12 @@ msgstr "波兰"
 # calendar/gui/print.c:2386
 # calendar/gui/print.c:2386
 # my-evolution/Locations.h:1773
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Port Alexander"
 msgstr "亚历山大港"
 
 # my-evolution/Locations.h:1774
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alsworth"
 msgstr ""
 
@@ -33341,26 +33823,26 @@ msgstr ""
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
 # addressbook/gui/widgets/e-addressbook-view.c:738
 # my-evolution/Locations.h:1775
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 #, fuzzy
 msgid "Port Angeles"
 msgstr "打印信封"
 
 # calendar/zones.h:147
 # my-evolution/Locations.h:1776
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port-Au-Prince"
 msgstr "太子港"
 
 # my-evolution/Locations.h:1777
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port Elizabeth"
 msgstr "伊丽莎白港"
 
 # calendar/gui/dialogs/recurrence-page.glade.h:6
 # calendar/gui/dialogs/recurrence-page.glade.h:6
 # my-evolution/Locations.h:1778
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 #, fuzzy
 msgid "Porterville"
 msgstr "预览"
@@ -33370,54 +33852,54 @@ msgstr "预览"
 # addressbook/printing/e-contact-print.c:1171
 # addressbook/printing/e-contact-print.c:1193
 # my-evolution/Locations.h:1779
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Port Hardy"
 msgstr "哈代港"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # my-evolution/Locations.h:1780
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hedland"
 msgstr "波兰"
 
 # my-evolution/Locations.h:1781
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Heiden"
 msgstr "海顿港"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # my-evolution/Locations.h:1782
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Portland"
 msgstr "波特兰"
 
 # addressbook/gui/component/addressbook-config.glade.h:27
 # addressbook/gui/component/addressbook-config.glade.h:27
 # my-evolution/Locations.h:1783
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Porto"
 msgstr "波尔图"
 
 # calendar/gui/dialogs/task-details-page.glade.h:11
 # calendar/gui/dialogs/task-details-page.glade.h:11
 # my-evolution/Locations.h:1784
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "进度"
 
 # my-evolution/Locations.h:1785
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre Apt"
 msgstr ""
 
 # addressbook/printing/e-contact-print.glade.h:29
 # addressbook/printing/e-contact-print.glade.h:29
 # my-evolution/Locations.h:1786
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 #, fuzzy
 msgid "Portoroz"
 msgstr "纵向"
@@ -33425,56 +33907,56 @@ msgstr "纵向"
 # addressbook/printing/e-contact-print.glade.h:29
 # addressbook/printing/e-contact-print.glade.h:29
 # my-evolution/Locations.h:1787
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Porto Santo"
 msgstr "纵向"
 
 # my-evolution/Locations.h:1788
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Velho"
 msgstr ""
 
 # addressbook/printing/e-contact-print.glade.h:29
 # addressbook/printing/e-contact-print.glade.h:29
 # my-evolution/Locations.h:1789
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 #, fuzzy
 msgid "Port Said"
 msgstr "纵向"
 
 # my-evolution/Locations.h:1790
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Portsmouth"
 msgstr "朴次茅斯"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # my-evolution/Locations.h:1792
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 #, fuzzy
 msgid "Posadas"
 msgstr "波兰"
 
 # my-evolution/Locations.h:1793
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Potosi"
 msgstr ""
 
 # my-evolution/Locations.h:1794
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Poughkeepsie"
 msgstr ""
 
 # my-evolution/Locations.h:1795
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Pownal"
 msgstr "波纳尔"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:54
 # addressbook/gui/contact-editor/fulladdr.glade.h:54
 # my-evolution/Locations.h:1796
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 #, fuzzy
 msgid "Poza Rica"
 msgstr "哥斯达黎加"
@@ -33482,14 +33964,14 @@ msgstr "哥斯达黎加"
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # my-evolution/Locations.h:1797
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poznan"
 msgstr "波兹南"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:165
 # addressbook/gui/contact-editor/fulladdr.glade.h:165
 # my-evolution/Locations.h:1798
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Praha"
 msgstr "巴拉圭"
@@ -33497,13 +33979,13 @@ msgstr "巴拉圭"
 # my-evolution/metar.c:134
 # my-evolution/metar.c:134
 # my-evolution/Locations.h:1799
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 #, fuzzy
 msgid "Pratica di Mare"
 msgstr "部分细雨"
 
 # my-evolution/Locations.h:1800
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Prescott"
 msgstr "普雷斯科特"
 
@@ -33514,31 +33996,31 @@ msgstr "普雷斯科特"
 # mail/mail-callbacks.c:2524 my-evolution/e-summary.c:619
 # ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
 # my-evolution/Locations.h:1801
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Presidente Prudente"
 msgstr "Presidente 普鲁登斯"
 
 # my-evolution/Locations.h:1802
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presque Isle"
 msgstr ""
 
 # my-evolution/Locations.h:1803
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Prestwick"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:83
 # addressbook/gui/contact-editor/fulladdr.glade.h:83
 # my-evolution/Locations.h:1804
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Pretoria"
 msgstr "比勒陀利亚"
 
 # calendar/gui/dialogs/recurrence-page.glade.h:6
 # calendar/gui/dialogs/recurrence-page.glade.h:6
 # my-evolution/Locations.h:1805
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Preveza"
 msgstr "预览"
@@ -33546,7 +34028,7 @@ msgstr "预览"
 # addressbook/gui/contact-editor/fulladdr.glade.h:168
 # addressbook/gui/contact-editor/fulladdr.glade.h:168
 # my-evolution/Locations.h:1806
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 #, fuzzy
 msgid "Price-Carbon"
 msgstr "皮特克恩岛"
@@ -33554,7 +34036,7 @@ msgstr "皮特克恩岛"
 # widgets/misc/e-charset-picker.c:84
 # widgets/misc/e-charset-picker.c:84
 # my-evolution/Locations.h:1807
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 #, fuzzy
 msgid "Pristina"
 msgstr "繁体"
@@ -33562,14 +34044,14 @@ msgstr "繁体"
 # addressbook/gui/contact-editor/fulladdr.glade.h:240
 # addressbook/gui/contact-editor/fulladdr.glade.h:240
 # my-evolution/Locations.h:1808
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Providence"
 msgstr "普罗维登斯"
 
 # calendar/gui/dialogs/recurrence-page.glade.h:6
 # calendar/gui/dialogs/recurrence-page.glade.h:6
 # my-evolution/Locations.h:1809
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Provincetown"
 msgstr "预览"
@@ -33577,33 +34059,33 @@ msgstr "预览"
 # addressbook/backend/ebook/e-card-simple.c:92
 # addressbook/backend/ebook/e-card-simple.c:92
 # my-evolution/Locations.h:1810
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provo"
 msgstr "职业"
 
 # my-evolution/Locations.h:1811
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Pskov"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # my-evolution/Locations.h:1812
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 #, fuzzy
 msgid "Pucallpa"
 msgstr "帕劳群岛"
 
 # my-evolution/Locations.h:1813
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pudahuel"
 msgstr ""
 
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 # my-evolution/Locations.h:1814
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 #, fuzzy
 msgid "Puebla"
 msgstr "公开"
@@ -33611,27 +34093,27 @@ msgstr "公开"
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 # my-evolution/Locations.h:1815
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Pueblo"
 msgstr "普韦布洛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # my-evolution/Locations.h:1816
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 #, fuzzy
 msgid "Puerto Barrios"
 msgstr "波多黎各"
 
 # my-evolution/Locations.h:1817
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Cabezas"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # my-evolution/Locations.h:1818
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 #, fuzzy
 msgid "Puerto Escondido"
 msgstr "波多黎各"
@@ -33639,7 +34121,7 @@ msgstr "波多黎各"
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # my-evolution/Locations.h:1819
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 #, fuzzy
 msgid "Puerto Lempira"
 msgstr "波多黎各"
@@ -33647,7 +34129,7 @@ msgstr "波多黎各"
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # my-evolution/Locations.h:1820
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "波多黎各"
@@ -33655,7 +34137,7 @@ msgstr "波多黎各"
 # my-evolution/metar.c:449
 # my-evolution/metar.c:449
 # my-evolution/Locations.h:1821
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 #, fuzzy
 msgid "Puerto Maldonado"
 msgstr "局部地区性龙卷风"
@@ -33663,7 +34145,7 @@ msgstr "局部地区性龙卷风"
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # my-evolution/Locations.h:1822
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 #, fuzzy
 msgid "Puerto Montt"
 msgstr "波多黎各"
@@ -33671,7 +34153,7 @@ msgstr "波多黎各"
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # my-evolution/Locations.h:1823
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 #, fuzzy
 msgid "Puerto Plata"
 msgstr "波多黎各"
@@ -33679,74 +34161,74 @@ msgstr "波多黎各"
 # my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
 # my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
 # my-evolution/Locations.h:1825
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "打印概要"
 
 # my-evolution/Locations.h:1826
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Vallarta"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # my-evolution/Locations.h:1827
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Pula"
 msgstr "普拉"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # my-evolution/Locations.h:1828
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pullman"
 msgstr "波兰"
 
 # my-evolution/Locations.h:1829
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Punta Arenas"
 msgstr ""
 
 # calendar/gui/print.c:2386
 # calendar/gui/print.c:2386
 # my-evolution/Locations.h:1830
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 #, fuzzy
 msgid "Punta Cana"
 msgstr "打印日历"
 
 # my-evolution/Locations.h:1831
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Gorda"
 msgstr ""
 
 # my-evolution/Locations.h:1832
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Puntilla Lake"
 msgstr ""
 
 # my-evolution/Locations.h:1833
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Pusan/Kimhae"
 msgstr "釜山/Kimhae"
 
 # my-evolution/Locations.h:1834
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pyongtaek Ab"
 msgstr ""
 
 # calendar/zones.h:238
 # my-evolution/Locations.h:1835
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongyang"
 msgstr "平壤"
 
 # widgets/misc/e-messagebox.c:173
 # widgets/misc/e-messagebox.c:173
 # my-evolution/Locations.h:1837
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 #, fuzzy
 msgid "Quantico"
 msgstr "问题"
@@ -33754,85 +34236,85 @@ msgstr "问题"
 # mail/message-list.etspec.h:9
 # mail/message-list.etspec.h:10
 # my-evolution/Locations.h:1838
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quebec"
 msgstr "魁北克"
 
 # my-evolution/Locations.h:1839
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec City"
 msgstr "魁北克城"
 
 # my-evolution/Locations.h:1840
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Queretaro"
 msgstr ""
 
 # my-evolution/Locations.h:1841
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Quillayute"
 msgstr ""
 
 # my-evolution/Locations.h:1842
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quimper"
 msgstr ""
 
 # my-evolution/Locations.h:1843
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quincy"
 msgstr "昆西"
 
 # my-evolution/Locations.h:1844
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quito/Mariscal Sucre"
 msgstr "基多/Mariscal Sucre"
 
 # my-evolution/Locations.h:1845
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Rabat"
 msgstr "拉巴特"
 
 # my-evolution/Locations.h:1846
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Raduzhny"
 msgstr ""
 
 # my-evolution/Locations.h:1847
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Rafha"
 msgstr ""
 
 # my-evolution/Locations.h:1848
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Raleigh-Durham"
 msgstr "Raleigh-德拉谟"
 
 # my-evolution/Locations.h:1849
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Randolph AFB"
 msgstr "伦道夫空军基地"
 
 # my-evolution/Locations.h:1850
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 #, fuzzy
 msgid "Rapid City"
 msgstr "已回复"
 
 # my-evolution/Locations.h:1851
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
 # my-evolution/Locations.h:1852
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Ras Al Khaimah"
 msgstr ""
 
 # my-evolution/metar.c:142
 # my-evolution/metar.c:142
 # my-evolution/Locations.h:1853
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 #, fuzzy
 msgid "Rawlins"
 msgstr "雨"
@@ -33840,14 +34322,14 @@ msgstr "雨"
 # addressbook/printing/e-contact-print.glade.h:13
 # addressbook/printing/e-contact-print.glade.h:13
 # my-evolution/Locations.h:1854
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Reading"
 msgstr "雷丁"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:30
 # addressbook/gui/contact-editor/fulladdr.glade.h:30
 # my-evolution/Locations.h:1855
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Rebun Island"
 msgstr "布维岛"
@@ -33855,25 +34337,25 @@ msgstr "布维岛"
 # mail/message-list.etspec.h:4
 # mail/message-list.etspec.h:5
 # my-evolution/Locations.h:1856
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Recife"
 msgstr "累西腓"
 
 # my-evolution/Locations.h:1857
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Red Bluff"
 msgstr ""
 
 # addressbook/printing/e-contact-print.glade.h:13
 # addressbook/printing/e-contact-print.glade.h:13
 # my-evolution/Locations.h:1858
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 #, fuzzy
 msgid "Redding"
 msgstr "标题"
 
 # my-evolution/Locations.h:1859
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redig"
 msgstr "已读"
@@ -33881,67 +34363,67 @@ msgstr "已读"
 # calendar/gui/dialogs/event-editor.c:190
 # calendar/gui/dialogs/event-editor.c:190
 # my-evolution/Locations.h:1860
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redmond"
 msgstr "雷德蒙"
 
 # my-evolution/Locations.h:1861
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Red Oak"
 msgstr ""
 
 # my-evolution/Locations.h:1862
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Redwood Falls"
 msgstr ""
 
 # my-evolution/Locations.h:1863
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Reggio Calabria"
 msgstr "勒佐卡拉布里亚"
 
 # my-evolution/e-summary-weather.c:722
 # my-evolution/e-summary-weather.c:722
 # my-evolution/Locations.h:1864
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 #, fuzzy
 msgid "Regina"
 msgstr "区域"
 
 # my-evolution/Locations.h:1865
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Reims-Champagne"
 msgstr "兰斯-Champagne"
 
 # calendar/gui/dialogs/alarm-page.glade.h:5
 # calendar/gui/dialogs/alarm-page.glade.h:5
 # my-evolution/Locations.h:1866
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Rennes"
 msgstr "雷恩"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:175
 # addressbook/gui/contact-editor/fulladdr.glade.h:175
 # my-evolution/Locations.h:1867
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Reno"
 msgstr "里诺"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:175
 # addressbook/gui/contact-editor/fulladdr.glade.h:175
 # my-evolution/Locations.h:1868
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Renton"
 msgstr "留尼汪"
 
 # my-evolution/Locations.h:1869
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Resistencia"
 msgstr "雷西斯膝西亚"
 
 # my-evolution/Locations.h:1870
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 #, fuzzy
 msgid "Reus"
 msgstr "规则"
@@ -33949,28 +34431,28 @@ msgstr "规则"
 # ui/evolution-mail-message.xml.h:70
 # ui/evolution-mail-message.xml.h:70
 # my-evolution/Locations.h:1871
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reyes"
 msgstr "回复"
 
 # calendar/zones.h:269
 # my-evolution/Locations.h:1872
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reykjavik"
 msgstr "雷克雅未克"
 
 # ui/my-evolution.xml.h:5
 # ui/my-evolution.xml.h:5
 # my-evolution/Locations.h:1873
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reynosa"
 msgstr "雷萨诺"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:76
 # addressbook/gui/contact-editor/fulladdr.glade.h:76
 # my-evolution/Locations.h:1874
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Rhinelander"
 msgstr "芬兰"
@@ -33978,20 +34460,20 @@ msgstr "芬兰"
 # addressbook/gui/contact-editor/fulladdr.glade.h:74
 # addressbook/gui/contact-editor/fulladdr.glade.h:74
 # my-evolution/Locations.h:1875
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhode Island"
 msgstr "罗得岛州"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:86
 # addressbook/gui/contact-editor/fulladdr.glade.h:86
 # my-evolution/Locations.h:1876
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 #, fuzzy
 msgid "Riberalta"
 msgstr "直布罗陀"
 
 # my-evolution/Locations.h:1877
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Richmond"
 msgstr ""
 
@@ -34000,7 +34482,7 @@ msgstr ""
 # addressbook/backend/ebook/e-card-simple.c:95
 # addressbook/gui/widgets/e-addressbook-view.c:884
 # my-evolution/Locations.h:1878
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "绰号"
@@ -34008,7 +34490,7 @@ msgstr "绰号"
 # addressbook/gui/contact-editor/fulladdr.glade.h:96
 # addressbook/gui/contact-editor/fulladdr.glade.h:96
 # my-evolution/Locations.h:1879
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rieti"
 msgstr "海地"
@@ -34018,35 +34500,35 @@ msgstr "海地"
 # calendar/gui/dialogs/meeting-page.etspec.h:9
 # calendar/gui/e-meeting-time-sel.etspec.h:9
 # my-evolution/Locations.h:1880
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rifle"
 msgstr "角色"
 
 # my-evolution/Locations.h:1882
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rijeka"
 msgstr "里耶卡"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:176
 # addressbook/gui/contact-editor/fulladdr.glade.h:176
 # my-evolution/Locations.h:1883
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1880
 msgid "Rimini"
 msgstr "里米尼"
 
 # my-evolution/Locations.h:1884
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1881
 msgid "Rio De Janeiro"
 msgstr "里约热内卢"
 
 # my-evolution/Locations.h:1885
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1882
 msgid "Rio Gallegos"
 msgstr ""
 
 # my-evolution/Locations.h:1886
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1883
 msgid "Rio Grande"
 msgstr "格兰德河"
 
@@ -34057,63 +34539,63 @@ msgstr "格兰德河"
 # addressbook/gui/contact-editor/e-contact-editor.c:1660
 # addressbook/gui/widgets/e-addressbook-view.c:871
 # my-evolution/Locations.h:1887
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1884
 msgid "Rioja"
 msgstr "里奥哈"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:152
 # addressbook/gui/contact-editor/fulladdr.glade.h:152
 # my-evolution/Locations.h:1888
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1885
 #, fuzzy
 msgid "Rio / Jacarepagua"
 msgstr "尼加拉瓜"
 
 # my-evolution/Locations.h:1889
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1886
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M. 科尔多瓦"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:33
 # addressbook/gui/contact-editor/fulladdr.glade.h:33
 # my-evolution/Locations.h:1890
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1887
 #, fuzzy
 msgid "Rishiri Island"
 msgstr "不列颠处女群岛"
 
 # my-evolution/Locations.h:1891
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1888
 msgid "Rivas"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:120
 # addressbook/gui/contact-editor/fulladdr.glade.h:120
 # my-evolution/Locations.h:1892
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1889
 #, fuzzy
 msgid "Rivera"
 msgstr "利比里亚"
 
 # my-evolution/Locations.h:1893
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1890
 msgid "Riverside"
 msgstr ""
 
 # my-evolution/Locations.h:1894
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1891
 msgid "Riverside/March AFB"
 msgstr ""
 
 # my-evolution/Locations.h:1895
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1892
 msgid "Riverton"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:120
 # addressbook/gui/contact-editor/fulladdr.glade.h:120
 # my-evolution/Locations.h:1896
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1893
 #, fuzzy
 msgid "Rivne"
 msgstr "利比里亚"
@@ -34121,26 +34603,26 @@ msgstr "利比里亚"
 # data/evolution.desktop.in.h:1 shell/main.c:83
 # shell/main.c:83
 # my-evolution/Locations.h:1897
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
 # calendar/zones.h:241
 # my-evolution/Locations.h:1898
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1895
 msgid "Riyadh"
 msgstr "利雅得"
 
 # my-evolution/Locations.h:1899
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1896
 msgid "Roanoke"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:57
 # addressbook/gui/contact-editor/fulladdr.glade.h:57
 # my-evolution/Locations.h:1900
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1897
 #, fuzzy
 msgid "Roatan"
 msgstr "克罗地亚"
@@ -34148,41 +34630,41 @@ msgstr "克罗地亚"
 # calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
 # calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
 # my-evolution/Locations.h:1901
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Robore"
 msgstr "之前"
 
 # my-evolution/Locations.h:1902
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1899
 msgid "Rochester"
 msgstr ""
 
 # my-evolution/Locations.h:1903
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1900
 msgid "Rockford"
 msgstr "罗克福德"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # my-evolution/Locations.h:1904
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1901
 #, fuzzy
 msgid "Rockland"
 msgstr "波兰"
 
 # my-evolution/Locations.h:1905
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1902
 msgid "Rockport"
 msgstr ""
 
 # my-evolution/Locations.h:1906
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1903
 msgid "Rock Springs"
 msgstr ""
 
 # my-evolution/Locations.h:1907
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1904
 msgid "Rocky Mount"
 msgstr ""
 
@@ -34191,7 +34673,7 @@ msgstr ""
 # calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
 # calendar/gui/e-meeting-model.c:781
 # my-evolution/Locations.h:1908
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1905
 #, fuzzy
 msgid "Rodos"
 msgstr "房间"
@@ -34199,44 +34681,44 @@ msgstr "房间"
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
 # my-evolution/Locations.h:1909
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
 msgid "Rogers"
 msgstr "罗杰斯"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:176
 # addressbook/gui/contact-editor/fulladdr.glade.h:176
 # my-evolution/Locations.h:1910
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1907
 msgid "Roma/Ciampino"
 msgstr "罗马/Ciampino"
 
 # my-evolution/Locations.h:1911
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1908
 msgid "Roma/Fiumicino"
 msgstr "罗马/Fiumicino"
 
 # my-evolution/Locations.h:1913
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1910
 msgid "Roma/Urbe"
 msgstr "罗马/Urbe"
 
 # my-evolution/Locations.h:1914
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1911
 msgid "Rome-Russell"
 msgstr "罗马-拉塞尔"
 
 # my-evolution/Locations.h:1915
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1912
 msgid "Ronchi de' Legionari"
 msgstr ""
 
 # my-evolution/Locations.h:1916
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1913
 msgid "Ronneby"
 msgstr ""
 
 # my-evolution/Locations.h:1917
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1914
 msgid "Roosevelt"
 msgstr "罗斯福"
 
@@ -34245,13 +34727,13 @@ msgstr "罗斯福"
 # calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
 # calendar/gui/e-meeting-model.c:781
 # my-evolution/Locations.h:1918
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1915
 #, fuzzy
 msgid "Roros"
 msgstr "房间"
 
 # my-evolution/Locations.h:1919
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1916
 msgid "Rorvik/Ryum"
 msgstr ""
 
@@ -34262,12 +34744,12 @@ msgstr ""
 # addressbook/gui/contact-editor/e-contact-editor.c:1660
 # addressbook/gui/widgets/e-addressbook-view.c:871
 # my-evolution/Locations.h:1920
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1917
 msgid "Rosario"
 msgstr "罗萨里奥"
 
 # my-evolution/Locations.h:1921
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1918
 msgid "Roseburg"
 msgstr ""
 
@@ -34276,7 +34758,7 @@ msgstr ""
 # calendar/gui/dialogs/meeting-page.etspec.h:9
 # calendar/gui/e-meeting-time-sel.etspec.h:9
 # my-evolution/Locations.h:1922
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1919
 #, fuzzy
 msgid "Roseglen"
 msgstr "角色"
@@ -34284,131 +34766,131 @@ msgstr "角色"
 # shell/glade/e-active-connection-dialog.glade.h:3
 # shell/glade/e-active-connection-dialog.glade.h:3
 # my-evolution/Locations.h:1923
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Rost"
 msgstr "主机"
 
 # my-evolution/Locations.h:1924
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1921
 msgid "Rostov-Na-Donu"
 msgstr "罗斯托夫-Na-Donu"
 
 # my-evolution/Locations.h:1925
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1922
 msgid "Roswell"
 msgstr ""
 
 # my-evolution/Locations.h:1926
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1923
 msgid "Rotterdam"
 msgstr "鹿特丹"
 
 # my-evolution/Locations.h:1927
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1924
 msgid "Rouen-Valle de Seine"
 msgstr "鲁昂-Valle de Seine"
 
 # my-evolution/Locations.h:1928
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1925
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
 # calendar/gui/dialogs/event-editor.c:195
 # calendar/gui/dialogs/event-editor.c:195
 # my-evolution/Locations.h:1929
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1926
 #, fuzzy
 msgid "Rurrenabaque"
 msgstr "再次发生"
 
 # my-evolution/Locations.h:1930
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1927
 msgid "Russell"
 msgstr "拉塞尔"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:15
 # addressbook/gui/contact-editor/fulladdr.glade.h:15
 # my-evolution/Locations.h:1931
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1928
 msgid "Russia"
 msgstr "俄罗斯"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:26
 # addressbook/gui/contact-editor/fulladdr.glade.h:26
 # my-evolution/Locations.h:1932
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1929
 msgid "Rutland"
 msgstr "拉特兰郡"
 
 # my-evolution/Locations.h:1933
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1930
 msgid "Rygge"
 msgstr ""
 
 # my-evolution/Locations.h:1934
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1931
 msgid "Rzeszow"
 msgstr ""
 
 # my-evolution/Locations.h:1935
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1932
 msgid "Saarbrucken"
 msgstr ""
 
 # my-evolution/Locations.h:1936
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1933
 msgid "Sabine Pass"
 msgstr ""
 
 # mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 # mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 # my-evolution/Locations.h:1937
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1934
 msgid "Sacramento"
 msgstr "萨克拉曼多"
 
 # my-evolution/Locations.h:1938
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1935
 msgid "Sacramento-Woodland"
 msgstr "萨克拉曼多-Woodland"
 
 # my-evolution/Locations.h:1939
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1936
 msgid "Safford-Municipal Airport"
 msgstr "萨克拉曼多-市政机场"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:196
 # addressbook/gui/contact-editor/fulladdr.glade.h:196
 # my-evolution/Locations.h:1940
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1937
 msgid "Saginaw"
 msgstr "萨吉诺"
 
 # my-evolution/Locations.h:1941
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1938
 msgid "Saint Anthony"
 msgstr "圣安东尼"
 
 # my-evolution/Locations.h:1942
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1939
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
 # my-evolution/Locations.h:1943
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1940
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
 # my-evolution/Locations.h:1944
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1941
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:1945
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1942
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "圣马力诺"
@@ -34416,20 +34898,20 @@ msgstr "圣马力诺"
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:1946
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1943
 #, fuzzy
 msgid "Saint Mawgan"
 msgstr "圣马力诺"
 
 # my-evolution/Locations.h:1947
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1944
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # my-evolution/Locations.h:1948
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1945
 #, fuzzy
 msgid "Saint Paul"
 msgstr "圣卢西亚岛"
@@ -34437,7 +34919,7 @@ msgstr "圣卢西亚岛"
 # calendar/gui/print.c:499
 # calendar/gui/print.c:499
 # my-evolution/Locations.h:1949
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1946
 #, fuzzy
 msgid "Saiq"
 msgstr "六"
@@ -34445,7 +34927,7 @@ msgstr "六"
 # my-evolution/metar.c:382
 # my-evolution/metar.c:382
 # my-evolution/Locations.h:1950
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1947
 #, fuzzy
 msgid "Salalah"
 msgstr "暴风"
@@ -34455,27 +34937,27 @@ msgstr "暴风"
 # ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
 # ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
 # my-evolution/Locations.h:1951
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1948
 msgid "Salem"
 msgstr "赛伦"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # my-evolution/Locations.h:1952
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salida"
 msgstr "索马里"
 
 # my-evolution/Locations.h:1953
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1950
 msgid "Salida-Harriet"
 msgstr "Salida-哈里特"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # my-evolution/Locations.h:1954
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1951
 #, fuzzy
 msgid "Salina"
 msgstr "索马里"
@@ -34483,75 +34965,75 @@ msgstr "索马里"
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # my-evolution/Locations.h:1955
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salinas"
 msgstr "索马里"
 
 # my-evolution/Locations.h:1956
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1953
 msgid "Salisbury"
 msgstr "索尔兹伯里"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # my-evolution/Locations.h:1957
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1954
 #, fuzzy
 msgid "Salmon"
 msgstr "萨摩亚"
 
 # my-evolution/Locations.h:1958
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1955
 msgid "Salmon (2)"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:131
 # addressbook/gui/contact-editor/fulladdr.glade.h:131
 # my-evolution/Locations.h:1959
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1956
 msgid "Salta"
 msgstr "萨尔塔"
 
 # my-evolution/Locations.h:1960
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1957
 msgid "Saltillo"
 msgstr "萨尔提略"
 
 # my-evolution/Locations.h:1961
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1958
 msgid "Salt Lake City"
 msgstr "盐湖城"
 
 # ui/evolution-addressbook.xml.h:27
 # ui/evolution-addressbook.xml.h:27
 # my-evolution/Locations.h:1962
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1959
 #, fuzzy
 msgid "Salto"
 msgstr "停止"
 
 # my-evolution/Locations.h:1963
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1960
 msgid "Salt point"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:68
 # addressbook/gui/contact-editor/fulladdr.glade.h:68
 # my-evolution/Locations.h:1964
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1961
 msgid "Salvador"
 msgstr "萨尔瓦多"
 
 # my-evolution/Locations.h:1965
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1962
 msgid "Salzburg"
 msgstr "萨尔茨堡"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # my-evolution/Locations.h:1966
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1963
 #, fuzzy
 msgid "Samara"
 msgstr "萨摩亚"
@@ -34559,14 +35041,14 @@ msgstr "萨摩亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # my-evolution/Locations.h:1967
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1964
 msgid "Samos"
 msgstr "萨摩斯"
 
 # my-evolution/metar.c:322
 # my-evolution/metar.c:322
 # my-evolution/Locations.h:1968
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samsun"
 msgstr "沙尘"
@@ -34574,60 +35056,60 @@ msgstr "沙尘"
 # my-evolution/metar.c:322
 # my-evolution/metar.c:322
 # my-evolution/Locations.h:1969
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Sana'A"
 msgstr "沙尘"
 
 # my-evolution/Locations.h:1970
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1967
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:1971
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1968
 msgid "San Angelo"
 msgstr "圣安吉罗"
 
 # my-evolution/Locations.h:1972
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1969
 msgid "San Antonio"
 msgstr "圣安东妮亚"
 
 # my-evolution/Locations.h:1973
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1970
 msgid "San Antonio Del Tachira"
 msgstr ""
 
 # my-evolution/Locations.h:1974
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1971
 msgid "San Antonio-Kelly AFB"
 msgstr "圣安东妮亚-凯利空军基地"
 
 # my-evolution/Locations.h:1975
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Stinson"
 msgstr "圣安东妮亚-Stinson"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:1976
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1973
 msgid "San Carlos"
 msgstr "圣卡洛斯"
 
 # my-evolution/metar.c:322
 # my-evolution/metar.c:322
 # my-evolution/Locations.h:1977
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "Sandane"
 msgstr "沙尘"
 
 # my-evolution/Locations.h:1978
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandberg"
 msgstr "发件人"
@@ -34635,7 +35117,7 @@ msgstr "发件人"
 # my-evolution/metar.c:397
 # my-evolution/metar.c:397
 # my-evolution/Locations.h:1979
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sanderson"
 msgstr "沙暴"
@@ -34643,84 +35125,84 @@ msgstr "沙暴"
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:1980
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1977
 msgid "San Diego"
 msgstr "圣迭哥"
 
 # my-evolution/Locations.h:1981
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1978
 msgid "San Diego-Brown"
 msgstr "圣迭哥-Brown"
 
 # my-evolution/Locations.h:1982
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Miramar"
 msgstr "圣迭哥-Miramar"
 
 # my-evolution/Locations.h:1983
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Montgomery"
 msgstr "圣迭哥-Montgomery"
 
 # my-evolution/Locations.h:1984
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1981
 msgid "San Diego-North Island"
 msgstr "圣迭哥-北岛"
 
 # my-evolution/Locations.h:1985
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1982
 msgid "San Diego-Santee"
 msgstr "圣迭哥-Santee"
 
 # my-evolution/Locations.h:1986
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1983
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:1987
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1984
 #, fuzzy
 msgid "Sand Point"
 msgstr "圣马力诺"
 
 # my-evolution/Locations.h:1988
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1985
 msgid "San Fernando De Apure"
 msgstr ""
 
 # my-evolution/metar.c:322
 # my-evolution/metar.c:322
 # my-evolution/Locations.h:1989
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1986
 msgid "Sanford"
 msgstr "桑福德"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:1990
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1987
 msgid "San Francisco"
 msgstr "旧金山"
 
 # addressbook/printing/e-contact-print.glade.h:35
 # addressbook/printing/e-contact-print.glade.h:35
 # my-evolution/Locations.h:1991
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1988
 #, fuzzy
 msgid "Sangju"
 msgstr "阴影"
 
 # my-evolution/Locations.h:1992
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1989
 msgid "San Ignacio De Velasco"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:1993
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1990
 #, fuzzy
 msgid "San Joaquin"
 msgstr "圣马力诺"
@@ -34732,60 +35214,60 @@ msgstr "圣马力诺"
 # ui/evolution-contact-list-editor.xml.h:6
 # ui/evolution-signature-editor.xml.h:4
 # my-evolution/Locations.h:1994
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1991
 #, fuzzy
 msgid "San Jose"
 msgstr "保存并关闭"
 
 # my-evolution/Locations.h:1995
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1992
 msgid "San Jose De Chiquitos"
 msgstr ""
 
 # my-evolution/Locations.h:1996
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1993
 msgid "San Jose del Cabo"
 msgstr ""
 
 # my-evolution/Locations.h:1997
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1994
 msgid "San Jose-Santa Clara"
 msgstr "圣何塞-Santa Clara"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:1998
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1995
 msgid "San Juan"
 msgstr "圣胡安"
 
 # my-evolution/Locations.h:1999
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1996
 msgid "Sankt-Peterburg"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # my-evolution/Locations.h:2000
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1997
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "索马里"
 
 # my-evolution/Locations.h:2001
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1998
 msgid "San Luis Obispo"
 msgstr ""
 
 # my-evolution/Locations.h:2002
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1999
 msgid "San Luis Potosi"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:2003
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2000
 #, fuzzy
 msgid "San Miguel"
 msgstr "圣马力诺"
@@ -34793,69 +35275,69 @@ msgstr "圣马力诺"
 # addressbook/gui/contact-editor/fulladdr.glade.h:156
 # addressbook/gui/contact-editor/fulladdr.glade.h:156
 # my-evolution/Locations.h:2004
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2001
 msgid "San Nicholas Island"
 msgstr "圣尼古拉斯岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:68
 # addressbook/gui/contact-editor/fulladdr.glade.h:68
 # my-evolution/Locations.h:2005
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2002
 msgid "San Salvador"
 msgstr "圣萨尔瓦多"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:2006
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2003
 msgid "San Sebastian"
 msgstr "圣塞巴斯蒂安"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # my-evolution/Locations.h:2007
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2004
 #, fuzzy
 msgid "Santa Ana"
 msgstr "圣卢西亚岛"
 
 # my-evolution/Locations.h:2008
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2005
 msgid "Santa Barbara"
 msgstr ""
 
 # my-evolution/Locations.h:2009
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2006
 msgid "Santa Cruz"
 msgstr ""
 
 # my-evolution/Locations.h:2010
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2007
 msgid "Santa Fe"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:2011
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2008
 msgid "Santa Maria"
 msgstr "圣玛丽亚"
 
 # my-evolution/Locations.h:2012
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2009
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # my-evolution/Locations.h:2013
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2010
 #, fuzzy
 msgid "Santa Monica"
 msgstr "圣卢西亚岛"
 
 # my-evolution/Locations.h:2014
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2011
 #, fuzzy
 msgid "Santander"
 msgstr "发件人"
@@ -34863,42 +35345,42 @@ msgstr "发件人"
 # my-evolution/metar.c:397
 # my-evolution/metar.c:397
 # my-evolution/Locations.h:2015
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santarem"
 msgstr "沙暴"
 
 # my-evolution/Locations.h:2016
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2013
 msgid "Santa Rosa"
 msgstr ""
 
 # my-evolution/Locations.h:2017
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa de Copan"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:5
 # calendar/zones.h:157
 # my-evolution/Locations.h:2018
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2015
 msgid "Santiago"
 msgstr "圣地亚哥"
 
 # my-evolution/Locations.h:2019
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2016
 msgid "Santiago de Cuba"
 msgstr ""
 
 # my-evolution/Locations.h:2020
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2017
 msgid "Santiago Del Estero"
 msgstr ""
 
 # my-evolution/metar.c:397
 # my-evolution/metar.c:397
 # my-evolution/Locations.h:2021
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2018
 #, fuzzy
 msgid "Santorini"
 msgstr "沙暴"
@@ -34906,19 +35388,19 @@ msgstr "沙暴"
 # my-evolution/metar.c:397
 # my-evolution/metar.c:397
 # my-evolution/Locations.h:2022
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2019
 msgid "Santos"
 msgstr "桑托斯"
 
 # my-evolution/Locations.h:2023
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2020
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # my-evolution/Locations.h:2024
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2021
 #, fuzzy
 msgid "Sao Luiz"
 msgstr "圣卢西亚岛"
@@ -34926,86 +35408,86 @@ msgstr "圣卢西亚岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:5
 # calendar/zones.h:159
 # my-evolution/Locations.h:2025
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2022
 #, fuzzy
 msgid "Sao Paulo"
 msgstr "美洲萨摩亚"
 
 # my-evolution/Locations.h:2026
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2023
 msgid "Sapporo Ab"
 msgstr "札幌 Ab"
 
 # calendar/zones.h:318
 # my-evolution/Locations.h:2027
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2024
 msgid "Sarajevo"
 msgstr "萨拉热窝"
 
 # my-evolution/Locations.h:2028
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2025
 msgid "Saranac Lake"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # my-evolution/Locations.h:2029
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2026
 msgid "Sarasota"
 msgstr "萨拉索塔"
 
 # my-evolution/Locations.h:2030
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2027
 msgid "Saratov"
 msgstr "萨拉托夫"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:197
 # addressbook/gui/contact-editor/fulladdr.glade.h:197
 # my-evolution/Locations.h:2031
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2028
 #, fuzzy
 msgid "Sarzana"
 msgstr "斯里兰卡"
 
 # my-evolution/Locations.h:2032
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2029
 msgid "Saskatchewan"
 msgstr "萨斯喀彻温省"
 
 # my-evolution/Locations.h:2033
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2030
 msgid "Saskatoon"
 msgstr ""
 
 # my-evolution/Locations.h:2034
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2031
 msgid "Sauce Viejo"
 msgstr ""
 
 # my-evolution/Locations.h:2036
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2033
 msgid "Sault Ste Marie"
 msgstr ""
 
 # my-evolution/Locations.h:2037
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2034
 msgid "Savannah"
 msgstr ""
 
 # my-evolution/Locations.h:2038
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2035
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
 # my-evolution/Locations.h:2039
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2036
 msgid "Sawyer AFB"
 msgstr ""
 
 # my-evolution/metar.c:322
 # my-evolution/metar.c:322
 # my-evolution/Locations.h:2040
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2037
 #, fuzzy
 msgid "Sayun"
 msgstr "沙尘"
@@ -35019,33 +35501,33 @@ msgstr "沙尘"
 # calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:31
 # mail/message-list.etspec.h:9
 # my-evolution/Locations.h:2041
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Scatsta"
 msgstr "状态"
 
 # my-evolution/Locations.h:2042
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2039
 msgid "Schaffen"
 msgstr ""
 
 # my-evolution/Locations.h:2043
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2040
 msgid "Schenectady"
 msgstr ""
 
 # my-evolution/Locations.h:2044
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2041
 msgid "Scilly Isles"
 msgstr ""
 
 # my-evolution/Locations.h:2045
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2042
 msgid "Scottsbluff"
 msgstr ""
 
 # my-evolution/Locations.h:2046
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2043
 msgid "Scottsdale"
 msgstr ""
 
@@ -35054,27 +35536,27 @@ msgstr ""
 # addressbook/backend/ebook/e-card-simple.c:69
 # addressbook/gui/widgets/e-addressbook-view.c:858
 # my-evolution/Locations.h:2047
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2044
 msgid "Scranton"
 msgstr "斯克兰顿"
 
 # mail/mail-callbacks.c:2492
 # my-evolution/Locations.h:2048
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2045
 msgid "Seattle"
 msgstr "西雅图"
 
 # importers/netscape-importer.c:963
 # importers/netscape-importer.c:963
 # my-evolution/Locations.h:2049
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2046
 msgid "Seattle-Boeing"
 msgstr "西雅图-Boeing"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # my-evolution/Locations.h:2050
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Sedalia"
 msgstr "索马里"
@@ -35082,50 +35564,50 @@ msgstr "索马里"
 # mail/message-list.c:640
 # mail/message-list.c:646
 # my-evolution/Locations.h:2051
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Seeb"
 msgstr "可见"
 
 # my-evolution/Locations.h:2052
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2049
 msgid "Selanik"
 msgstr ""
 
 # importers/netscape-importer.c:897
 # importers/netscape-importer.c:897
 # my-evolution/Locations.h:2053
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2050
 msgid "Sendai Airport"
 msgstr "仙台机场"
 
 # my-evolution/Locations.h:2054
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2051
 msgid "Seoul E Ab"
 msgstr "汉城 E Ab"
 
 # my-evolution/Locations.h:2055
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2052
 msgid "Seoul/Kimp'O International Airport"
 msgstr "汉城/Kimp'O 国际机场"
 
 # my-evolution/Locations.h:2056
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "汉城/Yongdungp'O Rokaf Wc"
 
 # my-evolution/Locations.h:2057
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2054
 msgid "Sept-Iles"
 msgstr ""
 
 # my-evolution/Locations.h:2058
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2055
 msgid "Seul Choix Pt"
 msgstr ""
 
 # my-evolution/Locations.h:2059
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2056
 msgid "Sevilla"
 msgstr ""
 
@@ -35134,23 +35616,23 @@ msgstr ""
 # addressbook/gui/search/e-addressbook-search-dialog.c:151
 # mail/mail-search.c:263
 # my-evolution/Locations.h:2060
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2057
 msgid "Seward"
 msgstr "苏厄德"
 
 # my-evolution/Locations.h:2061
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2058
 msgid "Sexton Summit"
 msgstr ""
 
 # calendar/zones.h:246
 # my-evolution/Locations.h:2062
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2059
 msgid "Shanghai"
 msgstr "上海"
 
 # my-evolution/Locations.h:2063
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2060
 msgid "Shannon"
 msgstr "香农"
 
@@ -35159,13 +35641,13 @@ msgstr "香农"
 # addressbook/gui/search/e-addressbook-search-dialog.c:151
 # mail/mail-search.c:263
 # my-evolution/Locations.h:2064
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2061
 #, fuzzy
 msgid "Sharjah"
 msgstr "搜索"
 
 # my-evolution/Locations.h:2065
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2062
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
@@ -35174,7 +35656,7 @@ msgstr ""
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 # calendar/gui/dialogs/recurrence-page.c:964
 # my-evolution/Locations.h:2066
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2063
 #, fuzzy
 msgid "Sharurah"
 msgstr "星期六"
@@ -35184,7 +35666,7 @@ msgstr "星期六"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 # calendar/gui/dialogs/recurrence-page.c:964
 # my-evolution/Locations.h:2067
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Shawbury"
 msgstr "星期六"
@@ -35192,83 +35674,83 @@ msgstr "星期六"
 # calendar/gui/e-calendar-table.etspec.h:14
 # calendar/gui/e-calendar-table.etspec.h:14
 # my-evolution/Locations.h:2068
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shearwater"
 msgstr "开始日期"
 
 # my-evolution/Locations.h:2069
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2066
 msgid "Sheboygan"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:204
 # addressbook/gui/contact-editor/fulladdr.glade.h:204
 # my-evolution/Locations.h:2070
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2067
 msgid "Sheldon"
 msgstr "谢尔登"
 
 # my-evolution/Locations.h:2071
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2068
 msgid "Shelter Cove"
 msgstr ""
 
 # widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 # widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 # my-evolution/Locations.h:2072
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2069
 msgid "Shelton"
 msgstr "谢尔顿"
 
 # my-evolution/Locations.h:2073
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2070
 msgid "Shenandoah"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:200
 # addressbook/gui/contact-editor/fulladdr.glade.h:200
 # my-evolution/Locations.h:2074
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2071
 msgid "Sheridan"
 msgstr "谢里丹"
 
 # my-evolution/Locations.h:2075
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2072
 msgid "Sherman-Denison"
 msgstr "谢尔曼-Denison"
 
 # my-evolution/Locations.h:2076
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2073
 msgid "Shimofusa Ab"
 msgstr ""
 
 # my-evolution/Locations.h:2077
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2074
 msgid "Shingle Point"
 msgstr ""
 
 # mail/message-list.etspec.h:7
 # mail/message-list.etspec.h:8
 # my-evolution/Locations.h:2078
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2075
 msgid "Shiraz"
 msgstr "设拉子"
 
 # my-evolution/Locations.h:2079
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2076
 msgid "Shishmaref"
 msgstr ""
 
 # my-evolution/Locations.h:2080
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2077
 msgid "Shizuhama Ab"
 msgstr ""
 
 # mail/message-list.etspec.h:5
 # mail/message-list.etspec.h:6
 # my-evolution/Locations.h:2081
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2078
 #, fuzzy
 msgid "Shoreham"
 msgstr "分数"
@@ -35276,42 +35758,42 @@ msgstr "分数"
 # my-evolution/metar.c:162
 # my-evolution/metar.c:162
 # my-evolution/Locations.h:2082
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Show Low"
 msgstr "微雪"
 
 # my-evolution/Locations.h:2083
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2080
 msgid "Shreveport Downtown"
 msgstr "什里夫波特市区"
 
 # my-evolution/Locations.h:2084
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Regional"
 msgstr "什里夫波特地区"
 
 # mail/message-list.etspec.h:7
 # mail/message-list.etspec.h:8
 # my-evolution/Locations.h:2085
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2082
 msgid "Sidney"
 msgstr "西德尼"
 
 # my-evolution/Locations.h:2086
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2083
 msgid "Sigonella"
 msgstr ""
 
 # my-evolution/Locations.h:2087
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2084
 msgid "Siloam Springs"
 msgstr ""
 
 # mail/mail-config.glade.h:67
 # mail/mail-config.glade.h:67
 # my-evolution/Locations.h:2088
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2085
 #, fuzzy
 msgid "Silver City"
 msgstr "安全"
@@ -35321,48 +35803,48 @@ msgstr "安全"
 # camel/providers/sendmail/camel-sendmail-provider.c:36
 # mail/mail-config.glade.h:72
 # my-evolution/Locations.h:2089
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2086
 #, fuzzy
 msgid "Sindal"
 msgstr "Sendmail"
 
 # my-evolution/Locations.h:2091
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2088
 msgid "Sioux City"
 msgstr ""
 
 # my-evolution/Locations.h:2092
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2089
 msgid "Sioux Falls"
 msgstr ""
 
 # my-evolution/Locations.h:2093
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2090
 msgid "Sitka"
 msgstr ""
 
 # my-evolution/Locations.h:2094
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2091
 msgid "Sivas"
 msgstr ""
 
 # my-evolution/Locations.h:2095
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2092
 msgid "Sivrihisar"
 msgstr ""
 
 # my-evolution/Locations.h:2096
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2093
 msgid "Skagway"
 msgstr ""
 
 # my-evolution/Locations.h:2097
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2094
 msgid "Skiathos"
 msgstr ""
 
 # my-evolution/Locations.h:2098
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2095
 msgid "Skien/Geiteryggen"
 msgstr ""
 
@@ -35371,14 +35853,14 @@ msgstr ""
 # ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
 # ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
 # my-evolution/Locations.h:2099
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2096
 #, fuzzy
 msgid "Skive"
 msgstr "保存"
 
 # calendar/zones.h:320
 # my-evolution/Locations.h:2100
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2097
 msgid "Skopje"
 msgstr "斯科普里"
 
@@ -35387,7 +35869,7 @@ msgstr "斯科普里"
 # mail/mail-config.glade.h:73 mail/message-list.etspec.h:7
 # shell/e-local-storage.c:176
 # my-evolution/Locations.h:2101
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skwentna"
 msgstr "已发送"
@@ -35395,7 +35877,7 @@ msgstr "已发送"
 # my-evolution/metar.c:322
 # my-evolution/metar.c:322
 # my-evolution/Locations.h:2102
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Slana"
 msgstr "沙尘"
@@ -35403,20 +35885,20 @@ msgstr "沙尘"
 # my-evolution/metar.c:137
 # my-evolution/metar.c:137
 # my-evolution/Locations.h:2105
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2102
 #, fuzzy
 msgid "Smithers"
 msgstr "骤雨"
 
 # my-evolution/Locations.h:2106
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2103
 msgid "Smyrna"
 msgstr "士麦纳"
 
 # my-evolution/metar.c:167
 # my-evolution/metar.c:167
 # my-evolution/Locations.h:2107
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2104
 #, fuzzy
 msgid "Snowshoe Lake"
 msgstr "骤雪"
@@ -35424,14 +35906,14 @@ msgstr "骤雪"
 # my-evolution/metar.c:66
 # my-evolution/metar.c:66
 # my-evolution/Locations.h:2108
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2105
 msgid "Sochi"
 msgstr "索契"
 
 # mail/message-list.etspec.h:5
 # mail/message-list.etspec.h:6
 # my-evolution/Locations.h:2109
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Socorro"
 msgstr "分数"
@@ -35439,14 +35921,14 @@ msgstr "分数"
 # mail/message-list.etspec.h:5
 # mail/message-list.etspec.h:6
 # my-evolution/Locations.h:2110
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2107
 msgid "Socotra"
 msgstr "索科特拉岛"
 
 # my-evolution/metar.c:172
 # my-evolution/metar.c:172
 # my-evolution/Locations.h:2111
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2108
 #, fuzzy
 msgid "Soda Springs"
 msgstr "冰雪"
@@ -35454,7 +35936,7 @@ msgstr "冰雪"
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # my-evolution/Locations.h:2112
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2109
 msgid "Sofia"
 msgstr "索非亚"
 
@@ -35463,7 +35945,7 @@ msgstr "索非亚"
 # camel/providers/sendmail/camel-sendmail-provider.c:36
 # mail/mail-config.glade.h:72
 # my-evolution/Locations.h:2113
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2110
 #, fuzzy
 msgid "Sogndal"
 msgstr "Sendmail"
@@ -35471,7 +35953,7 @@ msgstr "Sendmail"
 # addressbook/gui/contact-editor/fulladdr.glade.h:191
 # addressbook/gui/contact-editor/fulladdr.glade.h:191
 # my-evolution/Locations.h:2114
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2111
 #, fuzzy
 msgid "Soldotna"
 msgstr "斯洛文尼亚"
@@ -35479,38 +35961,38 @@ msgstr "斯洛文尼亚"
 # my-evolution/metar.c:137
 # my-evolution/metar.c:137
 # my-evolution/Locations.h:2115
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2112
 #, fuzzy
 msgid "Somerset"
 msgstr "骤雨"
 
 # my-evolution/Locations.h:2116
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Sonderborg"
 msgstr "发件人"
 
 # my-evolution/Locations.h:2117
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2114
 msgid "Songmu Ab"
 msgstr ""
 
 # my-evolution/Locations.h:2118
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2115
 msgid "Sorkjosen"
 msgstr ""
 
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
 # my-evolution/Locations.h:2120
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2117
 msgid "Southampton"
 msgstr "南安普敦"
 
 # my-evolution/metar.c:66
 # my-evolution/metar.c:66
 # my-evolution/Locations.h:2121
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "South Bend"
 msgstr "南"
@@ -35518,21 +36000,21 @@ msgstr "南"
 # addressbook/gui/contact-editor/fulladdr.glade.h:194
 # addressbook/gui/contact-editor/fulladdr.glade.h:194
 # my-evolution/Locations.h:2122
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2119
 msgid "South Carolina"
 msgstr "南卡罗莱纳州"
 
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
 # my-evolution/Locations.h:2123
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
 msgid "South Dakota"
 msgstr "南达科塔"
 
 # my-evolution/metar.c:66
 # my-evolution/metar.c:66
 # my-evolution/Locations.h:2124
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "Southend"
 msgstr "南"
@@ -35540,98 +36022,98 @@ msgstr "南"
 # addressbook/gui/contact-editor/fulladdr.glade.h:132
 # addressbook/gui/contact-editor/fulladdr.glade.h:132
 # my-evolution/Locations.h:2125
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "South Marsh Island"
 msgstr "马绍尔群岛"
 
 # my-evolution/Locations.h:2126
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2123
 msgid "South Timbalier"
 msgstr ""
 
 # my-evolution/Locations.h:2128
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2125
 msgid "Sparrevohn"
 msgstr ""
 
 # my-evolution/Locations.h:2129
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2126
 msgid "Spencer"
 msgstr "斯宾塞"
 
 # my-evolution/Locations.h:2130
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2127
 msgid "Spickard"
 msgstr ""
 
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
 # my-evolution/Locations.h:2131
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2128
 msgid "Split"
 msgstr "斯普利特"
 
 # my-evolution/metar.c:292
 # my-evolution/metar.c:292
 # my-evolution/Locations.h:2132
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Spokane"
 msgstr "烟霞"
 
 # my-evolution/Locations.h:2133
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2130
 msgid "Spokane-Parkwater"
 msgstr ""
 
 # my-evolution/Locations.h:2134
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2131
 msgid "Springbok"
 msgstr ""
 
 # widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 # widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 # my-evolution/Locations.h:2135
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2132
 #, fuzzy
 msgid "Springfield"
 msgstr "简体"
 
 # my-evolution/Locations.h:2136
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2133
 msgid "Stampede Pass"
 msgstr ""
 
 # calendar/gui/dialogs/task-details-page.glade.h:5
 # calendar/gui/dialogs/task-details-page.glade.h:5
 # my-evolution/Locations.h:2137
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2134
 msgid "State College"
 msgstr "州立学院"
 
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 # my-evolution/Locations.h:2138
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "Stauning"
 msgstr "开始："
 
 # my-evolution/Locations.h:2139
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2136
 msgid "Staunton"
 msgstr "斯托顿"
 
 # my-evolution/Locations.h:2140
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2137
 msgid "Stavanger/Sola"
 msgstr "斯塔万格/Sola"
 
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 # my-evolution/Locations.h:2141
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2138
 #, fuzzy
 msgid "Staverton"
 msgstr "开始："
@@ -35639,25 +36121,25 @@ msgstr "开始："
 # ui/evolution-addressbook.xml.h:27
 # ui/evolution-addressbook.xml.h:27
 # my-evolution/Locations.h:2142
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Stavropol"
 msgstr "停止"
 
 # my-evolution/Locations.h:2143
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2140
 msgid "St Cloud"
 msgstr ""
 
 # my-evolution/Locations.h:2144
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2141
 msgid "Steamboat Springs"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:187
 # addressbook/gui/contact-editor/fulladdr.glade.h:187
 # my-evolution/Locations.h:2145
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2142
 #, fuzzy
 msgid "Stephenville"
 msgstr "塞舌尔"
@@ -35665,30 +36147,30 @@ msgstr "塞舌尔"
 # addressbook/gui/contact-editor/fulladdr.glade.h:198
 # addressbook/gui/contact-editor/fulladdr.glade.h:198
 # my-evolution/Locations.h:2146
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2143
 #, fuzzy
 msgid "St. George"
 msgstr "圣赫勒拿岛"
 
 # my-evolution/Locations.h:2147
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2144
 msgid "Stillwater"
 msgstr ""
 
 # my-evolution/Locations.h:2148
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2145
 msgid "St. John's"
 msgstr ""
 
 # my-evolution/Locations.h:2149
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2146
 msgid "St Johnsbury"
 msgstr ""
 
 # ui/evolution-addressbook.xml.h:27
 # ui/evolution-addressbook.xml.h:27
 # my-evolution/Locations.h:2150
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2147
 #, fuzzy
 msgid "St Joseph"
 msgstr "停止"
@@ -35696,44 +36178,44 @@ msgstr "停止"
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # my-evolution/Locations.h:2151
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2148
 msgid "St Louis"
 msgstr "圣路易斯"
 
 # my-evolution/Locations.h:2152
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2149
 msgid "St Louis-Spirit"
 msgstr "圣路易斯-Spirit"
 
 # my-evolution/Locations.h:2153
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2150
 msgid "Stockholm (Arlanda)"
 msgstr "斯德哥尔摩 (Arlanda)"
 
 # my-evolution/Locations.h:2154
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Bromma)"
 msgstr "斯德哥尔摩 (Bromma)"
 
 # my-evolution/Locations.h:2155
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2152
 msgid "Stockton"
 msgstr ""
 
 # my-evolution/Locations.h:2156
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2153
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
 # my-evolution/Locations.h:2157
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2154
 msgid "Stord/Sorstokken"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:197
 # addressbook/gui/contact-editor/fulladdr.glade.h:197
 # my-evolution/Locations.h:2158
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2155
 #, fuzzy
 msgid "Storm Lake"
 msgstr "斯里兰卡"
@@ -35741,7 +36223,7 @@ msgstr "斯里兰卡"
 # addressbook/gui/contact-editor/fulladdr.glade.h:158
 # addressbook/gui/contact-editor/fulladdr.glade.h:158
 # my-evolution/Locations.h:2159
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Stornoway"
 msgstr "挪威"
@@ -35755,39 +36237,39 @@ msgstr "挪威"
 # calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:31
 # mail/message-list.etspec.h:9
 # my-evolution/Locations.h:2160
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2157
 msgid "St Paul"
 msgstr "圣保罗"
 
 # my-evolution/Locations.h:2161
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2158
 msgid "St Petersburg"
 msgstr "圣彼得堡"
 
 # my-evolution/Locations.h:2162
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg / Clearwater"
 msgstr "圣彼得堡 / Clearwater"
 
 # my-evolution/Locations.h:2163
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2160
 msgid "Strasbourg"
 msgstr "斯特拉斯堡"
 
 # my-evolution/Locations.h:2164
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2161
 msgid "Strevell"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:192
 # addressbook/gui/contact-editor/fulladdr.glade.h:192
 # my-evolution/Locations.h:2165
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2162
 msgid "St Simon's Island"
 msgstr "圣西蒙岛"
 
 # my-evolution/Locations.h:2166
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2163
 msgid "Stumpy Point"
 msgstr ""
 
@@ -35796,26 +36278,26 @@ msgstr ""
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 # calendar/gui/dialogs/recurrence-page.c:964
 # my-evolution/Locations.h:2167
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2164
 msgid "Sturgeon Bay"
 msgstr "鲟鱼湾"
 
 # my-evolution/Locations.h:2168
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2165
 msgid "Stuttgart"
 msgstr "斯图加特"
 
 # mail/message-list.etspec.h:5
 # mail/message-list.etspec.h:6
 # my-evolution/Locations.h:2169
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2166
 msgid "Sucre"
 msgstr "苏克雷"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:123
 # addressbook/gui/contact-editor/fulladdr.glade.h:123
 # my-evolution/Locations.h:2170
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sumburgh"
 msgstr "卢森堡"
@@ -35827,170 +36309,170 @@ msgstr "卢森堡"
 # my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
 # shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
 # my-evolution/Locations.h:2171
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2168
 #, fuzzy
 msgid "Sumter"
 msgstr "概要"
 
 # my-evolution/Locations.h:2172
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2169
 msgid "Sumter (2)"
 msgstr ""
 
 # my-evolution/Locations.h:2173
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2170
 msgid "Sundsvall-Harnosand"
 msgstr "松兹瓦尔-Harnosand"
 
 # calendar/zones.h:248
 # my-evolution/Locations.h:2174
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2171
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/台北"
 
 # my-evolution/Locations.h:2175
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2172
 msgid "Superior"
 msgstr ""
 
 # ui/evolution-addressbook.xml.h:27
 # ui/evolution-addressbook.xml.h:27
 # my-evolution/Locations.h:2177
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2174
 msgid "Sutton"
 msgstr "萨顿"
 
 # my-evolution/Locations.h:2178
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2175
 msgid "Suwon Ab"
 msgstr ""
 
 # my-evolution/Locations.h:2179
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2176
 msgid "Svalbard"
 msgstr "斯瓦尔巴特"
 
 # my-evolution/Locations.h:2180
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2177
 msgid "Svolvaer/Helle"
 msgstr ""
 
 # my-evolution/Locations.h:2182
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2179
 msgid "Swift Current"
 msgstr ""
 
 # my-evolution/Locations.h:2184
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2181
 msgid "Sydney"
 msgstr "悉尼"
 
 # my-evolution/Locations.h:2185
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2182
 msgid "Syktyvkar"
 msgstr ""
 
 # ui/evolution-addressbook.xml.h:27
 # ui/evolution-addressbook.xml.h:27
 # my-evolution/Locations.h:2186
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2183
 #, fuzzy
 msgid "Sympheropol"
 msgstr "停止"
 
 # my-evolution/Locations.h:2187
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2184
 msgid "Syracuse"
 msgstr "锡拉库扎"
 
 # my-evolution/Locations.h:2188
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2185
 msgid "Szczecin"
 msgstr "什切青"
 
 # my-evolution/Locations.h:2189
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2186
 msgid "Szombathely"
 msgstr ""
 
 # widgets/misc/e-charset-picker.c:84
 # widgets/misc/e-charset-picker.c:84
 # my-evolution/Locations.h:2190
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2187
 #, fuzzy
 msgid "Tabatinga"
 msgstr "繁体"
 
 # my-evolution/Locations.h:2191
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2188
 msgid "Tabriz"
 msgstr "大不里士"
 
 # calendar/gui/print.c:2205
 # calendar/gui/print.c:2205
 # my-evolution/Locations.h:2192
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2189
 #, fuzzy
 msgid "Tabuk"
 msgstr "任务"
 
 # my-evolution/Locations.h:2193
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2190
 msgid "Tachikawa Ab"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:211
 # addressbook/gui/contact-editor/fulladdr.glade.h:211
 # my-evolution/Locations.h:2194
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2191
 #, fuzzy
 msgid "Tacna"
 msgstr "汤加"
 
 # my-evolution/Locations.h:2195
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2192
 msgid "Tacoma"
 msgstr "塔科马"
 
 # my-evolution/Locations.h:2196
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2193
 msgid "Tacoma-Lakewood"
 msgstr "塔科马-Lakewood"
 
 # my-evolution/Locations.h:2197
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2194
 msgid "Tacuarembo"
 msgstr ""
 
 # my-evolution/Locations.h:2198
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2195
 msgid "Taegu"
 msgstr "大丘"
 
 # my-evolution/Locations.h:2199
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2196
 msgid "Taegu Ab"
 msgstr "大丘 Ab"
 
 # my-evolution/Locations.h:2200
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2197
 msgid "Taejon"
 msgstr "大田"
 
 # my-evolution/Locations.h:2201
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2198
 msgid "Tahoe Valley"
 msgstr "塔霍谷"
 
 # my-evolution/Locations.h:2202
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2199
 msgid "Taichung"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2203
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2200
 #, fuzzy
 msgid "Taif"
 msgstr "台湾"
@@ -35998,111 +36480,111 @@ msgstr "台湾"
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2204
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
 msgid "Tainan"
 msgstr "台南"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2206
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2203
 msgid "Taiyuan"
 msgstr "太原"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2207
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2204
 msgid "Taiz"
 msgstr "塔伊兹"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2208
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Tajima"
 msgstr "台湾"
 
 # my-evolution/Locations.h:2209
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2206
 msgid "Takamatsu Airport"
 msgstr "高松机场"
 
 # my-evolution/Locations.h:2210
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2207
 msgid "Talara"
 msgstr ""
 
 # my-evolution/Locations.h:2212
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2208
 msgid "Talkeetna"
 msgstr ""
 
 # my-evolution/Locations.h:2213
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2209
 msgid "Tallahassee"
 msgstr "塔拉哈西"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2211
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2210
 #, fuzzy
 msgid "Tallinn"
 msgstr "台湾"
 
 # my-evolution/Locations.h:2214
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2211
 msgid "Tamanrasset"
 msgstr ""
 
 # my-evolution/Locations.h:2215
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # my-evolution/Locations.h:2216
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2213
 msgid "Tampa"
 msgstr "坦帕"
 
 # my-evolution/Locations.h:2217
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2214
 msgid "Tampa-Macdill AFB"
 msgstr "坦帕-Macdill 空军基地"
 
 # addressbook/printing/e-contact-print.glade.h:27
 # addressbook/printing/e-contact-print.glade.h:27
 # my-evolution/Locations.h:2218
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2215
 msgid "Tampere"
 msgstr "坦佩雷"
 
 # my-evolution/Locations.h:2219
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2216
 msgid "Tampico"
 msgstr "坦皮科"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2220
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2217
 #, fuzzy
 msgid "Tanana"
 msgstr "台湾"
 
 # my-evolution/Locations.h:2221
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2218
 msgid "Tanegashima Airport"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:116
 # addressbook/gui/contact-editor/fulladdr.glade.h:116
 # my-evolution/Locations.h:2222
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2219
 #, fuzzy
 msgid "Taos"
 msgstr "老挝"
@@ -36110,24 +36592,24 @@ msgstr "老挝"
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2223
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2220
 msgid "Taoyuan"
 msgstr ""
 
 # my-evolution/Locations.h:2224
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2221
 msgid "Tapachula"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2225
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2222
 msgid "Taranto"
 msgstr "塔兰托"
 
 # my-evolution/Locations.h:2226
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Tarbes"
 msgstr "测试"
@@ -36135,59 +36617,59 @@ msgstr "测试"
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2227
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarija"
 msgstr "台湾"
 
 # my-evolution/Locations.h:2228
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2225
 msgid "Tarvisio"
 msgstr ""
 
 # widgets/misc/e-charset-picker.c:84
 # widgets/misc/e-charset-picker.c:84
 # my-evolution/Locations.h:2229
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2226
 #, fuzzy
 msgid "Tatalina"
 msgstr "繁体"
 
 # my-evolution/Locations.h:2230
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2227
 msgid "Tateyama Ab"
 msgstr ""
 
 # my-evolution/Locations.h:2231
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2228
 msgid "Taunton"
 msgstr ""
 
 # my-evolution/Locations.h:2232
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2229
 msgid "Tebessa"
 msgstr ""
 
 # my-evolution/Locations.h:2233
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2230
 msgid "Tees-Side"
 msgstr ""
 
 # calendar/zones.h:168
 # my-evolution/Locations.h:2234
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2231
 msgid "Tegucigalpa"
 msgstr "特古西加尔巴"
 
 # my-evolution/Locations.h:2235
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2232
 msgid "Tehran-Mehrabad"
 msgstr "德黑兰-Mehrabad"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # my-evolution/Locations.h:2236
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2233
 #, fuzzy
 msgid "Tela"
 msgstr "托克劳群岛"
@@ -36199,70 +36681,70 @@ msgstr "托克劳群岛"
 # addressbook/gui/contact-editor/e-contact-editor.c:1661
 # addressbook/gui/widgets/e-addressbook-view.c:872
 # my-evolution/Locations.h:2237
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2234
 msgid "Temple"
 msgstr "坦普尔"
 
 # my-evolution/Locations.h:2238
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2235
 msgid "Tennessee"
 msgstr "田纳西"
 
 # my-evolution/Locations.h:2239
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2236
 msgid "Tepic"
 msgstr "特皮克"
 
 # my-evolution/Locations.h:2240
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2237
 msgid "Teresina"
 msgstr "特雷西纳"
 
 # my-evolution/Locations.h:2241
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2238
 msgid "Terre Haute"
 msgstr ""
 
 # my-evolution/Locations.h:2242
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2239
 msgid "Terrell"
 msgstr "特雷尔"
 
 # my-evolution/Locations.h:2243
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2240
 msgid "Teterboro"
 msgstr ""
 
 # my-evolution/Locations.h:2244
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2241
 msgid "Texarkana"
 msgstr ""
 
 # my-evolution/Locations.h:2245
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2242
 msgid "Texas"
 msgstr "德克萨斯州"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:187
 # addressbook/gui/contact-editor/fulladdr.glade.h:187
 # my-evolution/Locations.h:2246
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2243
 #, fuzzy
 msgid "The Dalles"
 msgstr "塞舌尔"
 
 # my-evolution/Locations.h:2247
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2244
 msgid "Thessaloniki"
 msgstr "萨洛尼卡"
 
 # my-evolution/Locations.h:2248
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2245
 msgid "Thief River Falls"
 msgstr ""
 
 # my-evolution/Locations.h:2249
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2246
 msgid "Thiruvananthapuram"
 msgstr ""
 
@@ -36271,13 +36753,13 @@ msgstr ""
 # addressbook/backend/ebook/e-card-simple.c:91
 # addressbook/gui/widgets/e-addressbook-view.c:880
 # my-evolution/Locations.h:2250
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2247
 #, fuzzy
 msgid "Thisted"
 msgstr "头衔"
 
 # my-evolution/Locations.h:2251
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2248
 msgid "Thompson Falls"
 msgstr "汤普森瀑布"
 
@@ -36286,7 +36768,7 @@ msgstr "汤普森瀑布"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 # calendar/gui/dialogs/recurrence-page.c:962
 # my-evolution/Locations.h:2252
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2249
 #, fuzzy
 msgid "Thumrait"
 msgstr "星期四"
@@ -36294,31 +36776,31 @@ msgstr "星期四"
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2253
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2250
 msgid "Tianjin"
 msgstr "天津"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:16
 # calendar/zones.h:171
 # my-evolution/Locations.h:2254
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2251
 msgid "Tijuana"
 msgstr "提华纳"
 
 # my-evolution/Locations.h:2255
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2252
 msgid "Timisoara"
 msgstr ""
 
 # my-evolution/Locations.h:2256
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2253
 msgid "Tin City"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2257
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2254
 #, fuzzy
 msgid "Tirana"
 msgstr "台湾"
@@ -36326,18 +36808,18 @@ msgstr "台湾"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 # my-evolution/Locations.h:2258
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2255
 #, fuzzy
 msgid "Tiree"
 msgstr "时间"
 
 # my-evolution/Locations.h:2259
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2256
 msgid "Tirgu Mures"
 msgstr ""
 
 # my-evolution/Locations.h:2260
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2257
 msgid "Tiruchchirapalli"
 msgstr ""
 
@@ -36346,7 +36828,7 @@ msgstr ""
 # addressbook/backend/ebook/e-card-simple.c:91
 # addressbook/gui/widgets/e-addressbook-view.c:880
 # my-evolution/Locations.h:2261
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2258
 #, fuzzy
 msgid "Titusville"
 msgstr "头衔"
@@ -36356,81 +36838,81 @@ msgstr "头衔"
 # calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
 # calendar/gui/e-calendar-table.c:384
 # my-evolution/Locations.h:2262
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Tivat"
 msgstr "保密"
 
 # my-evolution/Locations.h:2263
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2260
 msgid "Tlemcen Zenata"
 msgstr ""
 
 # my-evolution/Locations.h:2264
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2261
 msgid "Tobias Bolanos"
 msgstr "托拜厄斯 Bolanos"
 
 # my-evolution/Locations.h:2265
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2262
 msgid "Tocumen"
 msgstr ""
 
 # my-evolution/Locations.h:2266
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2263
 msgid "Togiak Village"
 msgstr ""
 
 # my-evolution/Locations.h:2267
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2264
 msgid "Tokachi GSDF"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:48
 # addressbook/gui/contact-editor/fulladdr.glade.h:48
 # my-evolution/Locations.h:2268
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2265
 msgid "Tokunoshima Island"
 msgstr ""
 
 # my-evolution/Locations.h:2269
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2266
 msgid "Tokushima Ab"
 msgstr "德岛 Ab"
 
 # my-evolution/Locations.h:2270
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2267
 msgid "Tokyo Heliport"
 msgstr "东京直升机场"
 
 # my-evolution/Locations.h:2271
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2268
 msgid "Tokyo International Airport"
 msgstr "东京国际机场"
 
 # my-evolution/Locations.h:2272
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2269
 msgid "Tokyo New International Airport"
 msgstr "东京新机场"
 
 # ui/evolution.xml.h:25
 # ui/evolution.xml.h:25
 # my-evolution/Locations.h:2273
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2270
 msgid "Toledo"
 msgstr "托莱多"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # my-evolution/Locations.h:2274
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2271
 msgid "Toluca"
 msgstr "托卢卡"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:211
 # addressbook/gui/contact-editor/fulladdr.glade.h:211
 # my-evolution/Locations.h:2275
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2272
 #, fuzzy
 msgid "Tonopah"
 msgstr "汤加"
@@ -36438,36 +36920,36 @@ msgstr "汤加"
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # my-evolution/Locations.h:2276
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2273
 msgid "Topeka"
 msgstr "托皮卡"
 
 # my-evolution/Locations.h:2277
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2274
 msgid "Topeka-Forbes Field"
 msgstr "托皮卡-Forbes Field"
 
 # my-evolution/Locations.h:2278
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2275
 msgid "Torino/Bric Della Croce"
 msgstr "托里诺/Bric Della Croce"
 
 # my-evolution/Locations.h:2279
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2276
 msgid "Torino/Caselle"
 msgstr "托里诺/Caselle"
 
 # my-evolution/metar.c:442 my-evolution/metar.c:451
 # my-evolution/metar.c:442 my-evolution/metar.c:451
 # my-evolution/Locations.h:2280
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2277
 msgid "Toronto"
 msgstr "多伦多"
 
 # addressbook/printing/e-contact-print.glade.h:39
 # addressbook/printing/e-contact-print.glade.h:39
 # my-evolution/Locations.h:2281
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2278
 #, fuzzy
 msgid "Torp"
 msgstr "顶部："
@@ -36475,14 +36957,14 @@ msgstr "顶部："
 # addressbook/gui/contact-editor/fulladdr.glade.h:77
 # addressbook/gui/contact-editor/fulladdr.glade.h:77
 # my-evolution/Locations.h:2282
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
 msgid "Torrance"
 msgstr "托兰斯"
 
 # widgets/misc/e-charset-picker.c:64
 # widgets/misc/e-charset-picker.c:64
 # my-evolution/Locations.h:2283
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torreon"
 msgstr "韩语"
@@ -36490,7 +36972,7 @@ msgstr "韩语"
 # importers/netscape-importer.c:897
 # importers/netscape-importer.c:897
 # my-evolution/Locations.h:2284
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "开始导入"
@@ -36506,39 +36988,39 @@ msgstr "开始导入"
 # ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 # ui/evolution.xml.h:4
 # my-evolution/Locations.h:2285
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2282
 msgid "Toulouse"
 msgstr "图鲁兹"
 
 # my-evolution/Locations.h:2286
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2283
 msgid "Toul-Rosieres"
 msgstr ""
 
 # my-evolution/Locations.h:2287
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2284
 msgid "Tours-St-Symphorien"
 msgstr "图尔斯-St-Symphorien"
 
 # my-evolution/Locations.h:2288
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2285
 msgid "Toussus-Le Noble"
 msgstr ""
 
 # my-evolution/Locations.h:2289
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2286
 msgid "Townsville"
 msgstr "汤斯维尔"
 
 # my-evolution/Locations.h:2290
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2287
 msgid "Toyama Airport"
 msgstr "富山机场"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:81
 # addressbook/gui/contact-editor/fulladdr.glade.h:81
 # my-evolution/Locations.h:2291
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2288
 #, fuzzy
 msgid "Trabzon"
 msgstr "加蓬"
@@ -36546,12 +37028,12 @@ msgstr "加蓬"
 # addressbook/gui/contact-editor/fulladdr.glade.h:109
 # addressbook/gui/contact-editor/fulladdr.glade.h:109
 # my-evolution/Locations.h:2292
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2289
 msgid "Trapani"
 msgstr "特拉帕尼"
 
 # my-evolution/Locations.h:2293
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2290
 msgid "Traverse City"
 msgstr ""
 
@@ -36562,7 +37044,7 @@ msgstr ""
 # addressbook/gui/contact-editor/e-contact-editor.c:1661
 # addressbook/gui/widgets/e-addressbook-view.c:872
 # my-evolution/Locations.h:2294
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2291
 #, fuzzy
 msgid "Trelew"
 msgstr "电传"
@@ -36570,116 +37052,116 @@ msgstr "电传"
 # addressbook/printing/e-contact-print.glade.h:24
 # addressbook/printing/e-contact-print.glade.h:24
 # my-evolution/Locations.h:2295
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2292
 msgid "Trenton"
 msgstr "特伦顿"
 
 # ui/evolution-mail-message.xml.h:63
 # ui/evolution-mail-message.xml.h:63
 # my-evolution/Locations.h:2296
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trevico"
 msgstr "上一个"
 
 # my-evolution/Locations.h:2297
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2294
 msgid "Treviso/Istrana"
 msgstr ""
 
 # my-evolution/Locations.h:2298
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2295
 msgid "Treviso/S.Angelo"
 msgstr ""
 
 # my-evolution/Locations.h:2299
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2296
 msgid "Trieste"
 msgstr "的里雅斯特"
 
 # my-evolution/metar.c:442 my-evolution/metar.c:451
 # my-evolution/metar.c:442 my-evolution/metar.c:451
 # my-evolution/Locations.h:2300
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2297
 msgid "Trinidad"
 msgstr "特立尼达"
 
 # calendar/zones.h:56
 # my-evolution/Locations.h:2301
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2298
 msgid "Tripoli"
 msgstr "的黎波里"
 
 # my-evolution/Locations.h:2302
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2299
 msgid "Tromso/Langnes"
 msgstr "特罗姆兹/Langnes"
 
 # my-evolution/Locations.h:2303
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2300
 msgid "Trondheim/Vaernes"
 msgstr "特隆赫姆/Vaernes"
 
 # my-evolution/Locations.h:2304
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2301
 msgid "Troutdale"
 msgstr ""
 
 # my-evolution/Locations.h:2305
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2302
 msgid "Troyes/Barberey"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:214
 # addressbook/gui/contact-editor/fulladdr.glade.h:214
 # my-evolution/Locations.h:2306
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2303
 #, fuzzy
 msgid "Truckee"
 msgstr "土耳其"
 
 # my-evolution/Locations.h:2307
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2304
 msgid "Truth or Consequences"
 msgstr ""
 
 # my-evolution/Locations.h:2308
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2305
 msgid "Tsuiki Ab"
 msgstr ""
 
 # my-evolution/Locations.h:2309
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2306
 msgid "Tsushima Airport"
 msgstr "对马机场"
 
 # my-evolution/Locations.h:2310
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2307
 msgid "Tucson"
 msgstr "图森"
 
 # my-evolution/Locations.h:2311
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2308
 msgid "Tucson-Davis AFB"
 msgstr "图森-戴维斯空军基地"
 
 # my-evolution/Locations.h:2312
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2309
 msgid "Tucuman"
 msgstr ""
 
 # my-evolution/Locations.h:2313
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2310
 msgid "Tucumcari"
 msgstr ""
 
 # my-evolution/Locations.h:2314
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2311
 msgid "Tucurui"
 msgstr ""
 
 # my-evolution/Locations.h:2315
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2312
 msgid "Tulancingo"
 msgstr ""
 
@@ -36688,7 +37170,7 @@ msgstr ""
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 # calendar/gui/dialogs/recurrence-page.c:960
 # my-evolution/Locations.h:2316
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2313
 #, fuzzy
 msgid "Tulcea"
 msgstr "星期二"
@@ -36698,7 +37180,7 @@ msgstr "星期二"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 # calendar/gui/dialogs/recurrence-page.c:960
 # my-evolution/Locations.h:2317
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2314
 msgid "Tulsa"
 msgstr "塔尔萨"
 
@@ -36711,7 +37193,7 @@ msgstr "塔尔萨"
 # calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 # shell/glade/e-active-connection-dialog.glade.h:5
 # my-evolution/Locations.h:2318
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tupelo"
 msgstr "类型"
@@ -36719,7 +37201,7 @@ msgstr "类型"
 # widgets/misc/e-charset-picker.c:65
 # widgets/misc/e-charset-picker.c:65
 # my-evolution/Locations.h:2319
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Turaif"
 msgstr "土耳其语"
@@ -36727,24 +37209,24 @@ msgstr "土耳其语"
 # widgets/misc/e-charset-picker.c:65
 # widgets/misc/e-charset-picker.c:65
 # my-evolution/Locations.h:2320
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
 msgid "Turin"
 msgstr "都灵"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:214
 # addressbook/gui/contact-editor/fulladdr.glade.h:214
 # my-evolution/Locations.h:2322
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2319
 msgid "Turku"
 msgstr "土尔库"
 
 # my-evolution/Locations.h:2323
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2320
 msgid "Tuscaloosa"
 msgstr ""
 
 # my-evolution/Locations.h:2324
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2321
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
@@ -36753,105 +37235,105 @@ msgstr ""
 # calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
 # calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
 # my-evolution/Locations.h:2325
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2322
 #, fuzzy
 msgid "Twenthe"
 msgstr "暂时的"
 
 # my-evolution/Locations.h:2326
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2323
 msgid "Twentynine Palms"
 msgstr ""
 
 # my-evolution/Locations.h:2327
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2324
 msgid "Twin Falls"
 msgstr ""
 
 # my-evolution/Locations.h:2328
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2325
 msgid "Tyler"
 msgstr "泰勒"
 
 # my-evolution/Locations.h:2329
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2326
 msgid "Tyndall AFB"
 msgstr "廷德尔空军基地"
 
 # my-evolution/Locations.h:2330
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2327
 msgid "Tyumen"
 msgstr "秋明"
 
 # my-evolution/Locations.h:2331
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2328
 msgid "Uberaba"
 msgstr ""
 
 # my-evolution/Locations.h:2332
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2329
 msgid "Ufa"
 msgstr ""
 
 # my-evolution/Locations.h:2333
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2330
 msgid "Ukiah"
 msgstr ""
 
 # my-evolution/Locations.h:2335
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2332
 msgid "Ulan-Ude"
 msgstr ""
 
 # my-evolution/Locations.h:2336
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2333
 msgid "Ulsan"
 msgstr ""
 
 # my-evolution/Locations.h:2337
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2334
 msgid "Ulyanovsk"
 msgstr "乌里扬诺夫斯克"
 
 # my-evolution/Locations.h:2338
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2335
 msgid "Umea"
 msgstr ""
 
 # my-evolution/Locations.h:2339
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2336
 msgid "Umiat"
 msgstr ""
 
 # my-evolution/Locations.h:2340
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2337
 msgid "Unalakleet"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:221
 # addressbook/gui/contact-editor/fulladdr.glade.h:221
 # my-evolution/Locations.h:2341
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2338
 msgid "United Arab Emirates "
 msgstr "阿拉伯联合酋长国 "
 
 # mail/message-list.c:639
 # mail/message-list.c:645
 # my-evolution/Locations.h:2344
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2341
 #, fuzzy
 msgid "Unst"
 msgstr "不可见"
 
 # my-evolution/Locations.h:2345
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2342
 msgid "Upington"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:109
 # addressbook/gui/contact-editor/fulladdr.glade.h:109
 # my-evolution/Locations.h:2346
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2343
 #, fuzzy
 msgid "Uruapan"
 msgstr "日本"
@@ -36859,39 +37341,39 @@ msgstr "日本"
 # addressbook/gui/contact-editor/fulladdr.glade.h:226
 # addressbook/gui/contact-editor/fulladdr.glade.h:226
 # my-evolution/Locations.h:2347
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2344
 msgid "Uruguaiana"
 msgstr "乌拉圭亚纳"
 
 # my-evolution/Locations.h:2349
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2346
 msgid "Urumqi"
 msgstr ""
 
 # ui/evolution-message-composer.xml.h:1
 # ui/evolution-message-composer.xml.h:1
 # my-evolution/Locations.h:2350
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2347
 msgid "Utah"
 msgstr "犹他州"
 
 # my-evolution/Locations.h:2351
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2348
 msgid "Utica"
 msgstr "尤蒂卡"
 
 # my-evolution/Locations.h:2352
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2349
 msgid "Utrecht/Soesterberg"
 msgstr "乌德勒支/Soesterberg"
 
 # my-evolution/Locations.h:2353
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2350
 msgid "Utsunomiya Ab"
 msgstr "宇都宫 Ab"
 
 # my-evolution/Locations.h:2354
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2351
 msgid "Uzhgorod"
 msgstr ""
 
@@ -36902,7 +37384,7 @@ msgstr ""
 # addressbook/gui/contact-editor/e-contact-editor.c:1660
 # addressbook/gui/widgets/e-addressbook-view.c:871
 # my-evolution/Locations.h:2355
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2352
 #, fuzzy
 msgid "Vadso"
 msgstr "收音机"
@@ -36910,7 +37392,7 @@ msgstr "收音机"
 # my-evolution/metar.c:63
 # my-evolution/metar.c:63
 # my-evolution/Locations.h:2356
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2353
 #, fuzzy
 msgid "Vaerlose"
 msgstr "不定风"
@@ -36918,139 +37400,139 @@ msgstr "不定风"
 # addressbook/gui/contact-editor/fulladdr.glade.h:172
 # addressbook/gui/contact-editor/fulladdr.glade.h:172
 # my-evolution/Locations.h:2357
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2354
 msgid "Vagar"
 msgstr "瓦尔迪兹"
 
 # my-evolution/Locations.h:2358
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2355
 msgid "Valdez 2"
 msgstr "瓦尔迪兹 2"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:131
 # addressbook/gui/contact-editor/fulladdr.glade.h:131
 # my-evolution/Locations.h:2359
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2356
 #, fuzzy
 msgid "Valdosta"
 msgstr "马耳他"
 
 # my-evolution/Locations.h:2360
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2357
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:191
 # addressbook/gui/contact-editor/fulladdr.glade.h:191
 # my-evolution/Locations.h:2361
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2358
 msgid "Valencia"
 msgstr "巴伦西亚"
 
 # calendar/zones.h:257
 # my-evolution/Locations.h:2362
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2359
 msgid "Valentine"
 msgstr "瓦伦丁"
 
 # my-evolution/Locations.h:2363
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2360
 msgid "Valera*"
 msgstr "瓦勒拉"
 
 # my-evolution/Locations.h:2364
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2361
 msgid "Valkenburg"
 msgstr ""
 
 # my-evolution/Locations.h:2365
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2362
 msgid "Valley"
 msgstr ""
 
 # my-evolution/Locations.h:2366
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2363
 msgid "Valparaiso"
 msgstr "瓦尔帕莱索"
 
 # my-evolution/Locations.h:2367
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso-Eglin AFB"
 msgstr "瓦尔帕莱索-Eglin 空军基地"
 
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/backend/ebook/e-card-simple.c:93
 # my-evolution/Locations.h:2368
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2365
 #, fuzzy
 msgid "Van"
 msgstr "经理"
 
 # my-evolution/Locations.h:2369
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2366
 msgid "Vancouver"
 msgstr "范库弗峰"
 
 # calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
 # calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
 # my-evolution/Locations.h:2370
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2367
 #, fuzzy
 msgid "Vandel"
 msgstr "取消"
 
 # my-evolution/Locations.h:2371
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2368
 msgid "Vandenberg AFB"
 msgstr "范登堡空军基地"
 
 # my-evolution/Locations.h:2372
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg Range"
 msgstr "范登堡山脉"
 
 # my-evolution/Locations.h:2373
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2370
 msgid "Van Nuys"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:20
 # addressbook/gui/contact-editor/fulladdr.glade.h:20
 # my-evolution/Locations.h:2374
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2371
 #, fuzzy
 msgid "Varadero"
 msgstr "巴巴多斯岛"
 
 # my-evolution/Locations.h:2375
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2372
 msgid "Varanasi/Babatpur"
 msgstr "瓦蜡纳西/Babatpur"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:228
 # addressbook/gui/contact-editor/fulladdr.glade.h:228
 # my-evolution/Locations.h:2376
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2373
 msgid "Varna"
 msgstr "瓦尔纳"
 
 # calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
 # calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
 # my-evolution/Locations.h:2377
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2374
 #, fuzzy
 msgid "Vasteras"
 msgstr "之后"
 
 # my-evolution/Locations.h:2378
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2375
 msgid "Vaxjo"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:229
 # addressbook/gui/contact-editor/fulladdr.glade.h:229
 # my-evolution/Locations.h:2379
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2376
 #, fuzzy
 msgid "Venezia"
 msgstr "委内瑞拉"
@@ -37058,186 +37540,186 @@ msgstr "委内瑞拉"
 # widgets/misc/e-charset-picker.c:66
 # widgets/misc/e-charset-picker.c:66
 # my-evolution/Locations.h:2381
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2378
 #, fuzzy
 msgid "Venice"
 msgstr "Unicode"
 
 # my-evolution/Locations.h:2382
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2379
 msgid "Veracruz"
 msgstr "韦拉克鲁斯"
 
 # my-evolution/Locations.h:2383
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2380
 msgid "Vermillion"
 msgstr ""
 
 # my-evolution/Locations.h:2384
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2381
 msgid "Vermont"
 msgstr "佛蒙特州"
 
 # addressbook/gui/contact-editor/contact-editor.glade.h:16
 # addressbook/gui/contact-editor/contact-editor.glade.h:16
 # my-evolution/Locations.h:2385
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2382
 #, fuzzy
 msgid "Vernal"
 msgstr "常规"
 
 # my-evolution/Locations.h:2386
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2383
 msgid "Vero Beach"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:229
 # addressbook/gui/contact-editor/fulladdr.glade.h:229
 # my-evolution/Locations.h:2387
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2384
 msgid "Vicenza"
 msgstr "维琴察"
 
 # my-evolution/Locations.h:2388
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2385
 msgid "Vichy-Charmeil"
 msgstr "维希-Charmeil"
 
 # my-evolution/Locations.h:2389
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Rolla"
 msgstr "维希-Rolla"
 
 # my-evolution/Locations.h:2390
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2387
 msgid "Vicksburg"
 msgstr ""
 
 # my-evolution/Locations.h:2391
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2388
 msgid "Victoria"
 msgstr "维多利亚"
 
 # my-evolution/Locations.h:2393
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2390
 msgid "Vigo"
 msgstr "比戈"
 
 # shell/e-shell-importer.c:612
 # shell/e-shell-importer.c:612
 # my-evolution/Locations.h:2394
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2391
 #, fuzzy
 msgid "Vilhena"
 msgstr "文件名："
 
 # my-evolution/Locations.h:2395
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2392
 msgid "Villacoublay"
 msgstr ""
 
 # my-evolution/Locations.h:2396
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2393
 msgid "Villafranca"
 msgstr ""
 
 # my-evolution/Locations.h:2397
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2394
 msgid "Villahermosa"
 msgstr ""
 
 # my-evolution/Locations.h:2398
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2395
 msgid "Villamontes"
 msgstr ""
 
 # my-evolution/Locations.h:2399
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2396
 msgid "Villa Reynolds"
 msgstr ""
 
 # calendar/zones.h:329
 # my-evolution/Locations.h:2400
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2397
 msgid "Vilnius"
 msgstr "维尔纽斯"
 
 # my-evolution/Locations.h:2401
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2398
 msgid "Virginia"
 msgstr "维吉尼亚"
 
 # my-evolution/Locations.h:2402
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2399
 msgid "Virginia Beach"
 msgstr "维吉尼亚海岸"
 
 # my-evolution/Locations.h:2403
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2400
 msgid "Virginia Tech Airport"
 msgstr "维吉尼亚 Tech 机场"
 
 # my-evolution/Locations.h:2404
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2401
 msgid "Viru-Viru"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # my-evolution/Locations.h:2405
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2402
 #, fuzzy
 msgid "Visalia"
 msgstr "澳大利亚"
 
 # my-evolution/Locations.h:2406
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2403
 msgid "Visby"
 msgstr "维斯比"
 
 # my-evolution/Locations.h:2407
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2404
 msgid "Viterbo"
 msgstr ""
 
 # my-evolution/Locations.h:2408
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2405
 msgid "Vitoria"
 msgstr "维多利亚"
 
 # my-evolution/Locations.h:2409
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2406
 msgid "Vladikavkaz"
 msgstr ""
 
 # calendar/zones.h:258
 # my-evolution/Locations.h:2410
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2407
 msgid "Vladivostok"
 msgstr "符拉迪沃斯托克"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:105
 # addressbook/gui/contact-editor/fulladdr.glade.h:105
 # my-evolution/Locations.h:2411
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2408
 #, fuzzy
 msgid "Vlieland"
 msgstr "爱尔兰"
 
 # my-evolution/Locations.h:2412
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2409
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
 # my-evolution/Locations.h:2413
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2410
 msgid "Volgograd"
 msgstr "伏尔加格勒"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # my-evolution/Locations.h:2414
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2411
 #, fuzzy
 msgid "Volkel"
 msgstr "托克劳群岛"
@@ -37245,20 +37727,20 @@ msgstr "托克劳群岛"
 # ui/evolution-message-composer.xml.h:49
 # ui/evolution-message-composer.xml.h:49
 # my-evolution/Locations.h:2415
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volk Field"
 msgstr "发件人域(_F)"
 
 # my-evolution/Locations.h:2416
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2413
 msgid "Voronezh"
 msgstr "沃罗涅什"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # my-evolution/Locations.h:2417
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2414
 #, fuzzy
 msgid "Voslau"
 msgstr "托克劳群岛"
@@ -37266,94 +37748,94 @@ msgstr "托克劳群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # my-evolution/Locations.h:2418
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2415
 msgid "Waco"
 msgstr "韦科"
 
 # my-evolution/Locations.h:2419
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2416
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
 # my-evolution/Locations.h:2420
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2417
 msgid "Wainwright"
 msgstr ""
 
 # my-evolution/Locations.h:2421
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2418
 msgid "Wakefield"
 msgstr "韦克菲尔德"
 
 # my-evolution/Locations.h:2422
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2419
 msgid "Wakkanai Airport"
 msgstr ""
 
 # my-evolution/Locations.h:2423
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2420
 msgid "Walla Walla"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:132
 # addressbook/gui/contact-editor/fulladdr.glade.h:132
 # my-evolution/Locations.h:2424
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2421
 #, fuzzy
 msgid "Wallops Island"
 msgstr "马绍尔群岛"
 
 # my-evolution/Locations.h:2425
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2422
 msgid "Walnut Ridge"
 msgstr ""
 
 # mail/mail-callbacks.c:2128 widgets/misc/e-messagebox.c:159
 # mail/mail-callbacks.c:2247 widgets/misc/e-messagebox.c:159
 # my-evolution/Locations.h:2426
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2423
 #, fuzzy
 msgid "Warner Robins"
 msgstr "警告"
 
 # my-evolution/Locations.h:2427
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2424
 msgid "Warroad"
 msgstr ""
 
 # my-evolution/Locations.h:2428
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2425
 msgid "Warszawa"
 msgstr "华沙"
 
 # my-evolution/Locations.h:2429
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2426
 msgid "Washington"
 msgstr "华盛顿"
 
 # my-evolution/Locations.h:2430
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2427
 msgid "Washington/Dulles"
 msgstr "华盛顿/杜勒斯"
 
 # my-evolution/e-summary-weather.c:559
 # my-evolution/e-summary-weather.c:559
 # my-evolution/Locations.h:2431
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2428
 msgid "Waterbury"
 msgstr "沃特伯里"
 
 # my-evolution/e-summary-weather.c:559
 # my-evolution/e-summary-weather.c:559
 # my-evolution/Locations.h:2432
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
 msgid "Waterloo"
 msgstr "滑铁卢"
 
 # my-evolution/e-summary-weather.c:559
 # my-evolution/e-summary-weather.c:559
 # my-evolution/Locations.h:2433
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Watertown"
 msgstr "天气"
@@ -37363,31 +37845,31 @@ msgstr "天气"
 # addressbook/backend/ebook/e-card-simple.c:104
 # calendar/gui/e-calendar-table.etspec.h:4
 # my-evolution/Locations.h:2434
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Waterville"
 msgstr "类别"
 
 # my-evolution/Locations.h:2435
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2432
 msgid "Waukesha"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:228
 # addressbook/gui/contact-editor/fulladdr.glade.h:228
 # my-evolution/Locations.h:2436
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2433
 #, fuzzy
 msgid "Wausau"
 msgstr "努瓦阿图"
 
 # my-evolution/Locations.h:2437
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2434
 msgid "Waycross"
 msgstr ""
 
 # my-evolution/Locations.h:2438
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2435
 msgid "Waynesboro"
 msgstr ""
 
@@ -37396,46 +37878,46 @@ msgstr ""
 # addressbook/backend/ebook/e-card-simple.c:88
 # addressbook/gui/widgets/e-addressbook-view.c:877
 # my-evolution/Locations.h:2439
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2436
 msgid "Webster City"
 msgstr "韦伯斯特城"
 
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
 # my-evolution/Locations.h:2440
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2437
 #, fuzzy
 msgid "Wejh"
 msgstr "三"
 
 # my-evolution/Locations.h:2441
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2438
 msgid "Wellington"
 msgstr "惠灵顿"
 
 # my-evolution/e-summary-weather.c:559
 # my-evolution/e-summary-weather.c:559
 # my-evolution/Locations.h:2442
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2439
 #, fuzzy
 msgid "Wenatchee"
 msgstr "天气"
 
 # my-evolution/Locations.h:2443
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wendover"
 msgstr "发件人"
 
 # my-evolution/Locations.h:2444
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2441
 msgid "West Atlanta"
 msgstr "西亚特兰大"
 
 # widgets/misc/e-charset-picker.c:67
 # widgets/misc/e-charset-picker.c:67
 # my-evolution/Locations.h:2445
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2442
 #, fuzzy
 msgid "West Burke"
 msgstr "西欧"
@@ -37443,7 +37925,7 @@ msgstr "西欧"
 # addressbook/gui/contact-editor/fulladdr.glade.h:148
 # addressbook/gui/contact-editor/fulladdr.glade.h:148
 # my-evolution/Locations.h:2446
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "Westerland"
 msgstr "荷兰"
@@ -37451,33 +37933,33 @@ msgstr "荷兰"
 # my-evolution/metar.c:67
 # my-evolution/metar.c:67
 # my-evolution/Locations.h:2447
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westfield"
 msgstr "西"
 
 # my-evolution/Locations.h:2448
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2445
 msgid "Westhampton"
 msgstr ""
 
 # my-evolution/Locations.h:2449
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2446
 msgid "West Palm Beach"
 msgstr ""
 
 # my-evolution/Locations.h:2450
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2447
 msgid "West Virginia"
 msgstr "西维吉尼亚"
 
 # my-evolution/Locations.h:2451
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2448
 msgid "West Yellowstone"
 msgstr "西黄石国家公园"
 
 # my-evolution/Locations.h:2452
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone (2)"
 msgstr "西黄石国家公园 (2)"
 
@@ -37488,7 +37970,7 @@ msgstr "西黄石国家公园 (2)"
 # calendar/gui/dialogs/event-editor.c:263
 # calendar/gui/dialogs/event-editor.c:366
 # my-evolution/Locations.h:2453
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2450
 #, fuzzy
 msgid "Wheeling"
 msgstr "会见"
@@ -37496,55 +37978,55 @@ msgstr "会见"
 # addressbook/gui/contact-editor/fulladdr.glade.h:48
 # addressbook/gui/contact-editor/fulladdr.glade.h:48
 # my-evolution/Locations.h:2454
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2451
 #, fuzzy
 msgid "Whidbey Island"
 msgstr "圣诞岛"
 
 # my-evolution/Locations.h:2455
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2452
 msgid "Whitefield"
 msgstr "怀特菲尔德"
 
 # my-evolution/Locations.h:2456
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2453
 msgid "White Plains"
 msgstr ""
 
 # my-evolution/Locations.h:2457
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2454
 msgid "White Sulphur"
 msgstr ""
 
 # my-evolution/Locations.h:2458
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2455
 msgid "Whittier"
 msgstr "惠蒂尔"
 
 # my-evolution/Locations.h:2459
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2456
 msgid "Wichita"
 msgstr ""
 
 # my-evolution/Locations.h:2460
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2457
 msgid "Wichita Falls"
 msgstr ""
 
 # my-evolution/Locations.h:2461
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2458
 msgid "Wichita-Jabara"
 msgstr ""
 
 # my-evolution/Locations.h:2462
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2459
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
 # addressbook/backend/ebook/e-card-simple.c:95
 # addressbook/backend/ebook/e-card-simple.c:95
 # my-evolution/Locations.h:2463
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2460
 #, fuzzy
 msgid "Wick"
 msgstr "绰号"
@@ -37552,147 +38034,147 @@ msgstr "绰号"
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
 # my-evolution/Locations.h:2464
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2461
 msgid "Wien"
 msgstr "维也纳"
 
 # my-evolution/Locations.h:2465
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2462
 msgid "Wildwood"
 msgstr ""
 
 # my-evolution/Locations.h:2466
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2463
 msgid "Wilkes - Barre"
 msgstr "威尔克斯地 - Barre"
 
 # my-evolution/Locations.h:2467
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2464
 msgid "Williams Field"
 msgstr ""
 
 # my-evolution/Locations.h:2468
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2465
 msgid "Williamsport"
 msgstr ""
 
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
 # my-evolution/Locations.h:2469
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2466
 #, fuzzy
 msgid "Williston"
 msgstr "列表"
 
 # my-evolution/Locations.h:2470
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2467
 msgid "Willoughby"
 msgstr "威洛比"
 
 # my-evolution/Locations.h:2471
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2468
 msgid "Willow Airport"
 msgstr ""
 
 # my-evolution/Locations.h:2472
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2469
 msgid "Wilmington"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:121
 # addressbook/gui/contact-editor/fulladdr.glade.h:121
 # my-evolution/Locations.h:2473
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2470
 msgid "Winchester"
 msgstr "温彻斯特"
 
 # my-evolution/metar.c:397
 # my-evolution/metar.c:397
 # my-evolution/Locations.h:2474
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2471
 msgid "Windsor"
 msgstr "温莎"
 
 # my-evolution/Locations.h:2475
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2472
 msgid "Windsor Locks"
 msgstr ""
 
 # my-evolution/Locations.h:2476
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2473
 msgid "Wink"
 msgstr ""
 
 # my-evolution/Locations.h:2477
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2474
 msgid "Winnemucca"
 msgstr ""
 
 # calendar/zones.h:175
 # my-evolution/Locations.h:2478
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2475
 msgid "Winnipeg"
 msgstr "温尼伯"
 
 # my-evolution/Locations.h:2479
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2476
 msgid "Winslow"
 msgstr "温斯洛"
 
 # my-evolution/Locations.h:2480
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2477
 msgid "Winston-Salem"
 msgstr "温斯顿-塞伦"
 
 # my-evolution/Locations.h:2481
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2478
 msgid "Winter Haven"
 msgstr ""
 
 # mail/mail-session.c:322
 # mail/mail-session.c:322
 # my-evolution/Locations.h:2482
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2479
 msgid "Winter Park"
 msgstr "冬季公园"
 
 # my-evolution/Locations.h:2483
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2480
 msgid "Wiscasset"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:138
 # addressbook/gui/contact-editor/fulladdr.glade.h:138
 # my-evolution/Locations.h:2484
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2481
 msgid "Wisconsin"
 msgstr "威斯康星州"
 
 # my-evolution/Locations.h:2485
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin Rapids"
 msgstr ""
 
 # my-evolution/Locations.h:2486
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2483
 #, fuzzy
 msgid "Wise"
 msgstr "是"
 
 # my-evolution/Locations.h:2487
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2484
 msgid "Woensdrecht"
 msgstr ""
 
 # my-evolution/Locations.h:2488
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2485
 msgid "Wolf Point"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:100
 # addressbook/gui/contact-editor/fulladdr.glade.h:100
 # my-evolution/Locations.h:2489
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2486
 #, fuzzy
 msgid "Woong Cheon"
 msgstr "香港"
@@ -37700,7 +38182,7 @@ msgstr "香港"
 # addressbook/printing/e-contact-print.glade.h:9
 # addressbook/printing/e-contact-print.glade.h:9
 # my-evolution/Locations.h:2490
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Wooster"
 msgstr "脚注："
@@ -37708,14 +38190,14 @@ msgstr "脚注："
 # calendar/gui/dialogs/recurrence-page.glade.h:16
 # calendar/gui/dialogs/recurrence-page.glade.h:16
 # my-evolution/Locations.h:2491
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2488
 msgid "Worcester"
 msgstr "伍斯特"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # my-evolution/Locations.h:2492
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worland"
 msgstr "波兰"
@@ -37723,190 +38205,190 @@ msgstr "波兰"
 # mail/mail-mt.c:901
 # mail/mail-mt.c:901
 # my-evolution/Locations.h:2493
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worthington"
 msgstr "正在工作"
 
 # my-evolution/Locations.h:2494
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2491
 msgid "Wrangell"
 msgstr "兰格尔"
 
 # my-evolution/Locations.h:2495
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2492
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
 # my-evolution/Locations.h:2496
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2493
 msgid "Wuchia Observatory"
 msgstr ""
 
 # mail/mail-mt.c:901
 # mail/mail-mt.c:901
 # my-evolution/Locations.h:2497
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2494
 msgid "Wyoming"
 msgstr "怀俄明州"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 # my-evolution/Locations.h:2498
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2495
 msgid "Xiamen"
 msgstr "厦门"
 
 # my-evolution/Locations.h:2499
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2496
 msgid "Yacuiba"
 msgstr ""
 
 # my-evolution/Locations.h:2500
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2497
 msgid "Yakima"
 msgstr "雅吉瓦"
 
 # my-evolution/Locations.h:2501
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2498
 msgid "Yakushima"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:5
 # calendar/zones.h:176
 # my-evolution/Locations.h:2502
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2499
 #, fuzzy
 msgid "Yakutat"
 msgstr "美洲萨摩亚"
 
 # my-evolution/Locations.h:2503
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2500
 msgid "Yakutsk"
 msgstr "雅库茨克"
 
 # my-evolution/Locations.h:2504
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2501
 msgid "Yamagata Airport"
 msgstr ""
 
 # my-evolution/Locations.h:2505
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2502
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
 # my-evolution/Locations.h:2506
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2503
 msgid "Yankton"
 msgstr ""
 
 # shell/importer/intelligent.c:196
 # shell/importer/intelligent.c:196
 # my-evolution/Locations.h:2507
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2504
 #, fuzzy
 msgid "Yao Airport"
 msgstr "不要导入"
 
 # my-evolution/Locations.h:2508
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2505
 msgid "Yechon Ab"
 msgstr ""
 
 # my-evolution/Locations.h:2509
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2506
 msgid "Yekaterinburg"
 msgstr ""
 
 # my-evolution/Locations.h:2510
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2507
 msgid "Yellowknife"
 msgstr "耶洛奈夫"
 
 # my-evolution/Locations.h:2511
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2508
 msgid "Yellowstone"
 msgstr "黄石国家公园"
 
 # shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 # shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 # my-evolution/Locations.h:2513
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2510
 msgid "Yenbo"
 msgstr "延布"
 
 # my-evolution/Locations.h:2514
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2511
 msgid "Yeoju Range"
 msgstr ""
 
 # my-evolution/Locations.h:2515
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2512
 msgid "Yeonpyeungdo"
 msgstr ""
 
 # my-evolution/Locations.h:2516
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2513
 msgid "Yeovilton"
 msgstr ""
 
 # my-evolution/Locations.h:2517
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2514
 msgid "Yokosuka Fwf"
 msgstr "横须贺 Fwf"
 
 # my-evolution/Locations.h:2518
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2515
 msgid "Yokota Ab"
 msgstr ""
 
 # my-evolution/Locations.h:2519
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2516
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
 # my-evolution/Locations.h:2520
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2517
 msgid "Yoro"
 msgstr ""
 
 # my-evolution/Locations.h:2521
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2518
 msgid "Yosu"
 msgstr ""
 
 # my-evolution/Locations.h:2522
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2519
 msgid "Youngstown"
 msgstr "扬斯敦"
 
 # my-evolution/Locations.h:2523
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2520
 msgid "Ypsilanti"
 msgstr ""
 
 # my-evolution/Locations.h:2525
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2522
 msgid "Yukon"
 msgstr "育空"
 
 # my-evolution/Locations.h:2526
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2523
 msgid "Yuma MCAS"
 msgstr "尤马 MCAS"
 
 # my-evolution/Locations.h:2527
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2524
 msgid "Yurimaguas"
 msgstr ""
 
 # my-evolution/Locations.h:2528
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2525
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
 # my-evolution/Locations.h:2529
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2526
 msgid "Zacatecas"
 msgstr "萨卡特卡斯"
 
@@ -37915,23 +38397,23 @@ msgstr "萨卡特卡斯"
 # calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 # my-evolution/Locations.h:2530
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2527
 msgid "Zadar"
 msgstr "扎达尔"
 
 # calendar/zones.h:331
 # my-evolution/Locations.h:2531
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
 msgid "Zagreb"
 msgstr "萨格勒布"
 
 # my-evolution/Locations.h:2532
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2529
 msgid "Zakinthos"
 msgstr ""
 
 # my-evolution/Locations.h:2533
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2530
 msgid "Zama Airfield"
 msgstr ""
 
@@ -37946,7 +38428,7 @@ msgstr ""
 # calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
 # camel/camel-service.c:610 camel/camel-service.c:646
 # my-evolution/Locations.h:2534
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2531
 #, fuzzy
 msgid "Zanesville"
 msgstr "已经取消"
@@ -37954,124 +38436,109 @@ msgstr "已经取消"
 # addressbook/gui/contact-editor/fulladdr.glade.h:165
 # addressbook/gui/contact-editor/fulladdr.glade.h:165
 # my-evolution/Locations.h:2535
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2532
 msgid "Zaragoza"
 msgstr "萨拉戈萨"
 
 # my-evolution/Locations.h:2536
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2533
 msgid "Zell Am See"
 msgstr ""
 
 # my-evolution/Locations.h:2537
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2534
 msgid "Zuni Pueblo"
 msgstr "祖尼 普维布洛"
 
 # calendar/zones.h:333
 # my-evolution/Locations.h:2538
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2535
 msgid "Zurich"
 msgstr "苏黎世"
 
 # my-evolution/component-factory.c:44
 # my-evolution/component-factory.c:44
 # my-evolution/component-factory.c:44
-#: 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:340 my-evolution/e-summary-calendar.c:358
 # my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 # my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
-#: 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:341
 # my-evolution/e-summary-calendar.c:341
 # my-evolution/e-summary-calendar.c:341
-#: 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:377
 # my-evolution/e-summary-calendar.c:377
 # my-evolution/e-summary-calendar.c:375
-#: my-evolution/e-summary-calendar.c:418
+#: my-evolution/e-summary-calendar.c:405
 msgid "%k:%M %d %B"
 msgstr "%B %d %k:%M"
 
 # my-evolution/e-summary-calendar.c:379
 # my-evolution/e-summary-calendar.c:379
 # my-evolution/e-summary-calendar.c:377
-#: 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 "%B %d %l:%M"
 
 # mail/mail-config.glade.h:119
 # mail/mail-config.glade.h:119
 # my-evolution/e-summary-calendar.c:395
-#: my-evolution/e-summary-calendar.c:438
+#: my-evolution/e-summary-calendar.c:425
 msgid "No description"
 msgstr "无描述"
 
 # my-evolution/e-summary-mail.c:129
 # my-evolution/e-summary-mail.c:129
 # my-evolution/e-summary-mail.c:129
-#: my-evolution/e-summary-mail.c:153
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "邮件概要"
 
 # shell/e-local-storage.c:636
 # shell/e-local-storage.c:636
 # shell/e-local-storage.c:636
-#: 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 "本地文件夹"
 
-# my-evolution/e-summary-preferences.c:80
-# my-evolution/e-summary-weather.c:661
-# my-evolution/e-summary-preferences.c:80
-# my-evolution/e-summary-weather.c:661
-# my-evolution/e-summary-preferences.c:81
-# my-evolution/e-summary-weather.c:606
-#. 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:444
 # my-evolution/e-summary-preferences.c:444
 # my-evolution/e-summary-preferences.c:445
-#: 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:465
 # my-evolution/e-summary-preferences.c:465
 # my-evolution/e-summary-preferences.c:466
-#: 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:944
 # my-evolution/e-summary-preferences.c:944
 # my-evolution/e-summary-preferences.c:946
-#: 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:952
 # my-evolution/e-summary-preferences.c:952
 # my-evolution/e-summary-preferences.c:954
-#: 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"
 
@@ -38080,19 +38547,19 @@ msgstr "输入您希望添加的新闻来源的 URL"
 # my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 # my-evolution/e-summary-rdf.c:415
 # my-evolution/e-summary-rdf.c:300
-#: 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:528
 # my-evolution/e-summary-rdf.c:528
 # my-evolution/e-summary-rdf.c:443
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr "新闻来源"
 
 # my-evolution/Locations.h:1354
-#: my-evolution/e-summary-shown.c:519
+#: my-evolution/e-summary-shown.c:518
 #, fuzzy
 msgid "All"
 msgstr "麦卡伦"
@@ -38101,7 +38568,7 @@ msgstr "麦卡伦"
 # calendar/gui/dialogs/recurrence-page.glade.h:1
 # calendar/gui/dialogs/recurrence-page.glade.h:1
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:531
+#: my-evolution/e-summary-shown.c:530
 #, fuzzy
 msgid "Add"
 msgstr "添加(_D)"
@@ -38109,7 +38576,7 @@ msgstr "添加(_D)"
 # my-evolution/metar.c:157
 # my-evolution/metar.c:157
 # my-evolution/metar.c:157
-#: 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 "雪"
@@ -38117,39 +38584,53 @@ msgstr "雪"
 # my-evolution/e-summary-tasks.c:248
 # my-evolution/e-summary-tasks.c:248
 # my-evolution/e-summary-tasks.c:241
-#: my-evolution/e-summary-tasks.c:328
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "没有任务"
 
 # my-evolution/e-summary-tasks.c:287
 # my-evolution/e-summary-tasks.c:287
 # my-evolution/e-summary-tasks.c:281
-#: my-evolution/e-summary-tasks.c:372
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(没有描述)"
 
 # my-evolution/e-summary-weather.c:71
 # my-evolution/e-summary-weather.c:71
 # my-evolution/e-summary-weather.c:70
-#: 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:559
 # my-evolution/e-summary-weather.c:559
 # my-evolution/e-summary-weather.c:504
-#: my-evolution/e-summary-weather.c:489
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr "天气"
 
+# my-evolution/e-summary-preferences.c:80
+# my-evolution/e-summary-weather.c:661
+# my-evolution/e-summary-preferences.c:80
+# my-evolution/e-summary-weather.c:661
+# my-evolution/e-summary-preferences.c:81
+# my-evolution/e-summary-weather.c:606
+#. 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:193
 # my-evolution/e-summary.c:193
 # my-evolution/e-summary.c:190
-#: my-evolution/e-summary.c:188
+#: my-evolution/e-summary.c:198
 msgid "%A, %B %e %Y"
 msgstr "%Y %B %e %A"
 
@@ -38158,241 +38639,234 @@ msgstr "%Y %B %e %A"
 # importers/elm-importer.c:98 importers/netscape-importer.c:109
 # importers/pine-importer.c:103
 # my-evolution/e-summary.c:475
-#: my-evolution/e-summary.c:504
+#: my-evolution/e-summary.c:523
 msgid "Please wait..."
 msgstr "请等待..."
 
 # my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
 # my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
 # my-evolution/e-summary.c:566 ui/my-evolution.xml.h:3
-#: 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:626
 # my-evolution/e-summary.c:626
 # my-evolution/e-summary.c:612
-#: my-evolution/e-summary.c:640
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "打印概要失败"
 
-# my-evolution/main.c:66
-# my-evolution/main.c:66
-# my-evolution/main.c:65
-#: my-evolution/main.c:68
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "实施概要组件无法初始化 Bonobo。\n"
-
 # my-evolution/metar.c:29
 # my-evolution/metar.c:29
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 msgid " F"
 msgstr " 华氏度"
 
 # my-evolution/metar.c:29
 # my-evolution/metar.c:29
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 msgid " C"
 msgstr " 摄氏度"
 
 # addressbook/printing/e-contact-print.glade.h:8
 # my-evolution/metar.c:33
 # my-evolution/metar.c:33
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "knots"
 msgstr "节"
 
 # my-evolution/metar.c:33
 # my-evolution/metar.c:33
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "kph"
 msgstr "kph"
 
 # mail/mail-ops.c:895
 # my-evolution/metar.c:38
 # my-evolution/metar.c:38
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "inHg"
 msgstr "英寸汞柱"
 
 # my-evolution/metar.c:38
 # my-evolution/metar.c:38
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "mmHg"
 msgstr "毫米汞柱"
 
 # mail/mail-callbacks.c:2262
 # my-evolution/metar.c:41
 # my-evolution/metar.c:41
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "miles"
 msgstr "英里"
 
 # mail/mail-callbacks.c:2262
 # my-evolution/metar.c:41
 # my-evolution/metar.c:41
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "kilometers"
 msgstr "公里"
 
 # my-evolution/metar.c:44
 # my-evolution/metar.c:44
 # my-evolution/metar.c:44
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Clear sky"
 msgstr "晴空"
 
 # my-evolution/metar.c:45
 # my-evolution/metar.c:45
 # my-evolution/metar.c:45
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Broken clouds"
 msgstr "碎云"
 
 # my-evolution/metar.c:46
 # my-evolution/metar.c:46
 # my-evolution/metar.c:46
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Scattered clouds"
 msgstr "散云"
 
 # my-evolution/metar.c:47
 # my-evolution/metar.c:47
 # my-evolution/metar.c:47
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Few clouds"
 msgstr "少云"
 
 # my-evolution/metar.c:48
 # my-evolution/metar.c:48
 # my-evolution/metar.c:48
-#: 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:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 # my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
-#: 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:63
 # my-evolution/metar.c:63
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Variable"
 msgstr "不定风"
 
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North"
 msgstr "北"
 
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North - NorthEast"
 msgstr "北 - 东北"
 
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Northeast"
 msgstr "东北"
 
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - NorthEast"
 msgstr "东 - 东北"
 
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East"
 msgstr "东"
 
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East - Southeast"
 msgstr "东 - 东南"
 
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southeast"
 msgstr "东南"
 
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southeast"
 msgstr "南 - 东南"
 
 # my-evolution/metar.c:66
 # my-evolution/metar.c:66
 # my-evolution/metar.c:66
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South"
 msgstr "南"
 
 # my-evolution/metar.c:66
 # my-evolution/metar.c:66
 # my-evolution/metar.c:66
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South - Southwest"
 msgstr "南 - 西南"
 
 # my-evolution/metar.c:66
 # my-evolution/metar.c:66
 # my-evolution/metar.c:66
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Southwest"
 msgstr "西南"
 
 # my-evolution/metar.c:66
 # my-evolution/metar.c:66
 # my-evolution/metar.c:66
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Southwest"
 msgstr "西 - 西南"
 
 # my-evolution/metar.c:67
 # my-evolution/metar.c:67
 # my-evolution/metar.c:67
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West"
 msgstr "西"
 
 # my-evolution/metar.c:67
 # my-evolution/metar.c:67
 # my-evolution/metar.c:67
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West - Northwest"
 msgstr "西 - 西北"
 
 # my-evolution/metar.c:67
 # my-evolution/metar.c:67
 # my-evolution/metar.c:67
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "Northwest"
 msgstr "西北"
 
 # my-evolution/metar.c:67
 # my-evolution/metar.c:67
 # my-evolution/metar.c:67
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "North - Northwest"
 msgstr "北 - 西北"
 
@@ -38400,91 +38874,91 @@ msgstr "北 - 西北"
 # my-evolution/metar.c:127
 # my-evolution/metar.c:127
 #. DRIZZLE
-#: my-evolution/metar.c:127
+#: my-evolution/metar.c:128
 msgid "Drizzle"
 msgstr "细雨"
 
 # my-evolution/metar.c:128
 # my-evolution/metar.c:128
 # my-evolution/metar.c:128
-#: 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:129
 # my-evolution/metar.c:129
-#: my-evolution/metar.c:129
+#: my-evolution/metar.c:130
 msgid "Light drizzle"
 msgstr "小细雨"
 
 # my-evolution/metar.c:130
 # my-evolution/metar.c:130
 # my-evolution/metar.c:130
-#: my-evolution/metar.c:130
+#: my-evolution/metar.c:131
 msgid "Moderate drizzle"
 msgstr "中细雨"
 
 # my-evolution/metar.c:131
 # my-evolution/metar.c:131
 # my-evolution/metar.c:131
-#: my-evolution/metar.c:131
+#: my-evolution/metar.c:132
 msgid "Heavy drizzle"
 msgstr "大细雨"
 
 # my-evolution/metar.c:132
 # my-evolution/metar.c:132
 # my-evolution/metar.c:132
-#: my-evolution/metar.c:132
+#: my-evolution/metar.c:133
 msgid "Shallow drizzle"
 msgstr "微量细雨"
 
 # my-evolution/metar.c:133
 # my-evolution/metar.c:133
 # my-evolution/metar.c:133
-#: my-evolution/metar.c:133
+#: my-evolution/metar.c:134
 msgid "Patches of drizzle"
 msgstr "局部地区性细雨"
 
 # my-evolution/metar.c:134
 # my-evolution/metar.c:134
 # my-evolution/metar.c:134
-#: 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:135 my-evolution/metar.c:150
 # my-evolution/metar.c:135 my-evolution/metar.c:150
-#: 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:136
 # my-evolution/metar.c:136
-#: my-evolution/metar.c:136
+#: my-evolution/metar.c:137
 msgid "Windy drizzle"
 msgstr "有风细雨"
 
 # my-evolution/metar.c:137
 # my-evolution/metar.c:137
 # my-evolution/metar.c:137
-#: my-evolution/metar.c:137
+#: my-evolution/metar.c:138
 msgid "Showers"
 msgstr "骤雨"
 
 # my-evolution/metar.c:138
 # my-evolution/metar.c:138
 # my-evolution/metar.c:138
-#: my-evolution/metar.c:138
+#: my-evolution/metar.c:139
 msgid "Drifting drizzle"
 msgstr "微风细雨"
 
 # my-evolution/metar.c:139
 # my-evolution/metar.c:139
 # my-evolution/metar.c:139
-#: my-evolution/metar.c:139
+#: my-evolution/metar.c:140
 msgid "Freezing drizzle"
 msgstr "冰冻细雨"
 
@@ -38492,84 +38966,84 @@ msgstr "冰冻细雨"
 # my-evolution/metar.c:142
 # my-evolution/metar.c:142
 #. RAIN
-#: my-evolution/metar.c:142
+#: my-evolution/metar.c:143
 msgid "Rain"
 msgstr "雨"
 
 # my-evolution/metar.c:143
 # my-evolution/metar.c:143
 # my-evolution/metar.c:143
-#: 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:144
 # my-evolution/metar.c:144
-#: my-evolution/metar.c:144
+#: my-evolution/metar.c:145
 msgid "Light rain"
 msgstr "小雨"
 
 # my-evolution/metar.c:145
 # my-evolution/metar.c:145
 # my-evolution/metar.c:145
-#: my-evolution/metar.c:145
+#: my-evolution/metar.c:146
 msgid "Moderate rain"
 msgstr "中雨"
 
 # my-evolution/metar.c:146
 # my-evolution/metar.c:146
 # my-evolution/metar.c:146
-#: my-evolution/metar.c:146
+#: my-evolution/metar.c:147
 msgid "Heavy rain"
 msgstr "大雨"
 
 # my-evolution/metar.c:147
 # my-evolution/metar.c:147
 # my-evolution/metar.c:147
-#: my-evolution/metar.c:147
+#: my-evolution/metar.c:148
 msgid "Shallow rain"
 msgstr "微量雨"
 
 # my-evolution/metar.c:148
 # my-evolution/metar.c:148
 # my-evolution/metar.c:148
-#: my-evolution/metar.c:148
+#: my-evolution/metar.c:149
 msgid "Patches of rain"
 msgstr "局部地区性有雨"
 
 # my-evolution/metar.c:149
 # my-evolution/metar.c:149
 # my-evolution/metar.c:149
-#: my-evolution/metar.c:149
+#: my-evolution/metar.c:150
 msgid "Partial rainfall"
 msgstr "部分有雨"
 
 # my-evolution/metar.c:151
 # my-evolution/metar.c:151
 # my-evolution/metar.c:151
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:152
 msgid "Blowing rainfall"
 msgstr "大风雨"
 
 # my-evolution/metar.c:152
 # my-evolution/metar.c:152
 # my-evolution/metar.c:152
-#: my-evolution/metar.c:152
+#: my-evolution/metar.c:153
 msgid "Rain showers"
 msgstr "骤雨"
 
 # my-evolution/metar.c:153
 # my-evolution/metar.c:153
 # my-evolution/metar.c:153
-#: my-evolution/metar.c:153
+#: my-evolution/metar.c:154
 msgid "Drifting rain"
 msgstr "风雨"
 
 # my-evolution/metar.c:154
 # my-evolution/metar.c:154
 # my-evolution/metar.c:154
-#: my-evolution/metar.c:154
+#: my-evolution/metar.c:155
 msgid "Freezing rain"
 msgstr "冻雨"
 
@@ -38577,91 +39051,91 @@ msgstr "冻雨"
 # my-evolution/metar.c:157
 # my-evolution/metar.c:157
 #. SNOW
-#: my-evolution/metar.c:157
+#: my-evolution/metar.c:158
 msgid "Snow"
 msgstr "雪"
 
 # my-evolution/metar.c:158
 # my-evolution/metar.c:158
 # my-evolution/metar.c:158
-#: 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:159
 # my-evolution/metar.c:159
-#: my-evolution/metar.c:159
+#: my-evolution/metar.c:160
 msgid "Light snow"
 msgstr "小雪"
 
 # my-evolution/metar.c:160
 # my-evolution/metar.c:160
 # my-evolution/metar.c:160
-#: my-evolution/metar.c:160
+#: my-evolution/metar.c:161
 msgid "Moderate snow"
 msgstr "中雪"
 
 # my-evolution/metar.c:161
 # my-evolution/metar.c:161
 # my-evolution/metar.c:161
-#: my-evolution/metar.c:161
+#: my-evolution/metar.c:162
 msgid "Heavy snow"
 msgstr "大雪"
 
 # my-evolution/metar.c:162
 # my-evolution/metar.c:162
 # my-evolution/metar.c:162
-#: my-evolution/metar.c:162
+#: my-evolution/metar.c:163
 msgid "Shallow snow"
 msgstr "微雪"
 
 # my-evolution/metar.c:163
 # my-evolution/metar.c:163
 # my-evolution/metar.c:163
-#: my-evolution/metar.c:163
+#: my-evolution/metar.c:164
 msgid "Patches of snow"
 msgstr "局部地区性有雪"
 
 # my-evolution/metar.c:164
 # my-evolution/metar.c:164
 # my-evolution/metar.c:164
-#: 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:165 my-evolution/metar.c:180
 # my-evolution/metar.c:165 my-evolution/metar.c:180
-#: 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:166
 # my-evolution/metar.c:166
-#: my-evolution/metar.c:166
+#: my-evolution/metar.c:167
 msgid "Blowing snowfall"
 msgstr "风雪"
 
 # my-evolution/metar.c:167
 # my-evolution/metar.c:167
 # my-evolution/metar.c:167
-#: my-evolution/metar.c:167
+#: my-evolution/metar.c:168
 msgid "Snow showers"
 msgstr "骤雪"
 
 # my-evolution/metar.c:168
 # my-evolution/metar.c:168
 # my-evolution/metar.c:168
-#: my-evolution/metar.c:168
+#: my-evolution/metar.c:169
 msgid "Drifting snow"
 msgstr "微风加雪"
 
 # my-evolution/metar.c:169
 # my-evolution/metar.c:169
 # my-evolution/metar.c:169
-#: my-evolution/metar.c:169
+#: my-evolution/metar.c:170
 msgid "Freezing snow"
 msgstr "冻雪"
 
@@ -38669,84 +39143,84 @@ msgstr "冻雪"
 # my-evolution/metar.c:172
 # my-evolution/metar.c:172
 #. 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:173
 # my-evolution/metar.c:173
-#: 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:174
 # my-evolution/metar.c:174
-#: my-evolution/metar.c:174
+#: my-evolution/metar.c:175
 msgid "Light snow grains"
 msgstr "小冰雪"
 
 # my-evolution/metar.c:175
 # my-evolution/metar.c:175
 # my-evolution/metar.c:175
-#: my-evolution/metar.c:175
+#: my-evolution/metar.c:176
 msgid "Moderate snow grains"
 msgstr "中冰雪"
 
 # my-evolution/metar.c:176
 # my-evolution/metar.c:176
 # my-evolution/metar.c:176
-#: my-evolution/metar.c:176
+#: my-evolution/metar.c:177
 msgid "Heavy snow grains"
 msgstr "大冰雪"
 
 # my-evolution/metar.c:177
 # my-evolution/metar.c:177
 # my-evolution/metar.c:177
-#: my-evolution/metar.c:177
+#: my-evolution/metar.c:178
 msgid "Shallow snow grains"
 msgstr "微量冰雪"
 
 # my-evolution/metar.c:178
 # my-evolution/metar.c:178
 # my-evolution/metar.c:178
-#: 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:179
 # my-evolution/metar.c:179
-#: my-evolution/metar.c:179
+#: my-evolution/metar.c:180
 msgid "Partial snow grains"
 msgstr "部分有冰雪"
 
 # my-evolution/metar.c:181
 # my-evolution/metar.c:181
 # my-evolution/metar.c:181
-#: my-evolution/metar.c:181
+#: my-evolution/metar.c:182
 msgid "Blowing snow grains"
 msgstr "有风的冰雪"
 
 # my-evolution/metar.c:182
 # my-evolution/metar.c:182
 # my-evolution/metar.c:182
-#: my-evolution/metar.c:182
+#: my-evolution/metar.c:183
 msgid "Snow grain showers"
 msgstr "骤降冰雪"
 
 # my-evolution/metar.c:183
 # my-evolution/metar.c:183
 # my-evolution/metar.c:183
-#: my-evolution/metar.c:183
+#: my-evolution/metar.c:184
 msgid "Drifting snow grains"
 msgstr "微风加冰雪"
 
 # my-evolution/metar.c:184
 # my-evolution/metar.c:184
 # my-evolution/metar.c:184
-#: my-evolution/metar.c:184
+#: my-evolution/metar.c:185
 msgid "Freezing snow grains"
 msgstr "冻冰雪"
 
@@ -38754,84 +39228,84 @@ msgstr "冻冰雪"
 # my-evolution/metar.c:187
 # my-evolution/metar.c:187
 #. 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:188
 # my-evolution/metar.c:188
-#: 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:189
 # my-evolution/metar.c:189
-#: my-evolution/metar.c:189
+#: my-evolution/metar.c:190
 msgid "Few ice crystals"
 msgstr "小冰晶"
 
 # my-evolution/metar.c:190
 # my-evolution/metar.c:190
 # my-evolution/metar.c:190
-#: my-evolution/metar.c:190
+#: my-evolution/metar.c:191
 msgid "Moderate ice crystals"
 msgstr "中冰晶"
 
 # my-evolution/metar.c:191
 # my-evolution/metar.c:191
 # my-evolution/metar.c:191
-#: my-evolution/metar.c:191
+#: my-evolution/metar.c:192
 msgid "Heavy ice crystals"
 msgstr "大冰晶"
 
 # my-evolution/metar.c:193
 # my-evolution/metar.c:193
 # my-evolution/metar.c:193
-#: 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:194
 # my-evolution/metar.c:194
-#: my-evolution/metar.c:194
+#: my-evolution/metar.c:195
 msgid "Partial ice crystals"
 msgstr "部分有冰晶"
 
 # my-evolution/metar.c:195
 # my-evolution/metar.c:195
 # my-evolution/metar.c:195
-#: my-evolution/metar.c:195
+#: my-evolution/metar.c:196
 msgid "Ice crystal storm"
 msgstr "冰晶暴"
 
 # my-evolution/metar.c:196
 # my-evolution/metar.c:196
 # my-evolution/metar.c:196
-#: my-evolution/metar.c:196
+#: my-evolution/metar.c:197
 msgid "Blowing ice crystals"
 msgstr "有风冰晶"
 
 # my-evolution/metar.c:197
 # my-evolution/metar.c:197
 # my-evolution/metar.c:197
-#: 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:198
 # my-evolution/metar.c:198
-#: my-evolution/metar.c:198
+#: my-evolution/metar.c:199
 msgid "Drifting ice crystals"
 msgstr "微风冰晶"
 
 # my-evolution/metar.c:199
 # my-evolution/metar.c:199
 # my-evolution/metar.c:199
-#: my-evolution/metar.c:199
+#: my-evolution/metar.c:200
 msgid "Freezing ice crystals"
 msgstr "冻冰晶"
 
@@ -38839,175 +39313,175 @@ msgstr "冻冰晶"
 # my-evolution/metar.c:202
 # my-evolution/metar.c:202
 #. 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:203
 # my-evolution/metar.c:203
-#: 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:204
 # my-evolution/metar.c:204
-#: my-evolution/metar.c:204
+#: my-evolution/metar.c:205
 msgid "Few ice pellets"
 msgstr "小冰粒"
 
 # my-evolution/metar.c:205
 # my-evolution/metar.c:205
 # my-evolution/metar.c:205
-#: my-evolution/metar.c:205
+#: my-evolution/metar.c:206
 msgid "Moderate ice pellets"
 msgstr "中冰粒"
 
 # my-evolution/metar.c:206
 # my-evolution/metar.c:206
 # my-evolution/metar.c:206
-#: my-evolution/metar.c:206
+#: my-evolution/metar.c:207
 msgid "Heavy ice pellets"
 msgstr "大冰粒"
 
 # my-evolution/metar.c:207
 # my-evolution/metar.c:207
 # my-evolution/metar.c:207
-#: my-evolution/metar.c:207
+#: my-evolution/metar.c:208
 msgid "Shallow ice pellets"
 msgstr "微量冰粒"
 
 # my-evolution/metar.c:208
 # my-evolution/metar.c:208
 # my-evolution/metar.c:208
-#: 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:209
 # my-evolution/metar.c:209
-#: my-evolution/metar.c:209
+#: my-evolution/metar.c:210
 msgid "Partial ice pellets"
 msgstr "部分有冰粒"
 
 # my-evolution/metar.c:210
 # my-evolution/metar.c:210
 # my-evolution/metar.c:210
-#: my-evolution/metar.c:210
+#: my-evolution/metar.c:211
 msgid "Ice pellet storm"
 msgstr "冰粒暴"
 
 # my-evolution/metar.c:211
 # my-evolution/metar.c:211
 # my-evolution/metar.c:211
-#: my-evolution/metar.c:211
+#: my-evolution/metar.c:212
 msgid "Blowing ice pellets"
 msgstr "有风冰粒"
 
 # my-evolution/metar.c:212
 # my-evolution/metar.c:212
 # my-evolution/metar.c:212
-#: 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:213
 # my-evolution/metar.c:213
-#: my-evolution/metar.c:213
+#: my-evolution/metar.c:214
 msgid "Drifting ice pellets"
 msgstr "微风冰粒"
 
 # my-evolution/metar.c:214
 # my-evolution/metar.c:214
 # my-evolution/metar.c:214
-#: my-evolution/metar.c:214
+#: my-evolution/metar.c:215
 msgid "Freezing ice pellets"
 msgstr "冻冰粒"
 
 # my-evolution/metar.c:218
 # my-evolution/metar.c:218
 # my-evolution/metar.c:218
-#: 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:219 my-evolution/metar.c:234
 # my-evolution/metar.c:219 my-evolution/metar.c:234
-#: 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:220
 # my-evolution/metar.c:220
-#: my-evolution/metar.c:220
+#: my-evolution/metar.c:221
 msgid "Moderate hail"
 msgstr "中冰雹"
 
 # my-evolution/metar.c:221
 # my-evolution/metar.c:221
 # my-evolution/metar.c:221
-#: my-evolution/metar.c:221
+#: my-evolution/metar.c:222
 msgid "Heavy hail"
 msgstr "大冰雹"
 
 # my-evolution/metar.c:222
 # my-evolution/metar.c:222
 # my-evolution/metar.c:222
-#: my-evolution/metar.c:222
+#: my-evolution/metar.c:223
 msgid "Shallow hail"
 msgstr "微量冰雹"
 
 # my-evolution/metar.c:223
 # my-evolution/metar.c:223
 # my-evolution/metar.c:223
-#: my-evolution/metar.c:223
+#: my-evolution/metar.c:224
 msgid "Patches of hail"
 msgstr "局部地区性冰雹"
 
 # my-evolution/metar.c:224
 # my-evolution/metar.c:224
 # my-evolution/metar.c:224
-#: my-evolution/metar.c:224
+#: my-evolution/metar.c:225
 msgid "Partial hail"
 msgstr "部分有冰雹"
 
 # my-evolution/metar.c:225
 # my-evolution/metar.c:225
 # my-evolution/metar.c:225
-#: my-evolution/metar.c:225
+#: my-evolution/metar.c:226
 msgid "Hailstorm"
 msgstr "冰雹暴"
 
 # my-evolution/metar.c:226
 # my-evolution/metar.c:226
 # my-evolution/metar.c:226
-#: my-evolution/metar.c:226
+#: my-evolution/metar.c:227
 msgid "Blowing hail"
 msgstr "有风冰雹"
 
 # my-evolution/metar.c:227
 # my-evolution/metar.c:227
 # my-evolution/metar.c:227
-#: my-evolution/metar.c:227
+#: my-evolution/metar.c:228
 msgid "Hail showers"
 msgstr "骤降冰雹"
 
 # my-evolution/metar.c:228
 # my-evolution/metar.c:228
 # my-evolution/metar.c:228
-#: my-evolution/metar.c:228
+#: my-evolution/metar.c:229
 msgid "Drifting hail"
 msgstr "微风冰雹"
 
 # my-evolution/metar.c:229
 # my-evolution/metar.c:229
 # my-evolution/metar.c:229
-#: my-evolution/metar.c:229
+#: my-evolution/metar.c:230
 msgid "Freezing hail"
 msgstr "冻冰雹"
 
@@ -39015,84 +39489,84 @@ msgstr "冻冰雹"
 # my-evolution/metar.c:232
 # my-evolution/metar.c:232
 #. 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:233
 # my-evolution/metar.c:233
-#: 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:235
 # my-evolution/metar.c:235
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:236
 msgid "Moderate small hail"
 msgstr "中量小冰雹"
 
 # my-evolution/metar.c:236
 # my-evolution/metar.c:236
 # my-evolution/metar.c:236
-#: my-evolution/metar.c:236
+#: my-evolution/metar.c:237
 msgid "Heavy small hail"
 msgstr "大量小冰雹"
 
 # my-evolution/metar.c:237
 # my-evolution/metar.c:237
 # my-evolution/metar.c:237
-#: my-evolution/metar.c:237
+#: my-evolution/metar.c:238
 msgid "Shallow small hail"
 msgstr "微量小冰雹"
 
 # my-evolution/metar.c:238
 # my-evolution/metar.c:238
 # my-evolution/metar.c:238
-#: 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:239
 # my-evolution/metar.c:239
-#: my-evolution/metar.c:239
+#: my-evolution/metar.c:240
 msgid "Partial small hail"
 msgstr "部分有小冰雹"
 
 # my-evolution/metar.c:240
 # my-evolution/metar.c:240
 # my-evolution/metar.c:240
-#: my-evolution/metar.c:240
+#: my-evolution/metar.c:241
 msgid "Small hailstorm"
 msgstr "小冰雹暴"
 
 # my-evolution/metar.c:241
 # my-evolution/metar.c:241
 # my-evolution/metar.c:241
-#: my-evolution/metar.c:241
+#: my-evolution/metar.c:242
 msgid "Blowing small hail"
 msgstr "有风小冰雹"
 
 # my-evolution/metar.c:242
 # my-evolution/metar.c:242
 # my-evolution/metar.c:242
-#: 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:243
 # my-evolution/metar.c:243
-#: my-evolution/metar.c:243
+#: my-evolution/metar.c:244
 msgid "Drifting small hail"
 msgstr "微风小冰雹"
 
 # my-evolution/metar.c:244
 # my-evolution/metar.c:244
 # my-evolution/metar.c:244
-#: my-evolution/metar.c:244
+#: my-evolution/metar.c:245
 msgid "Freezing small hail"
 msgstr "结冻小冰雹"
 
@@ -39100,91 +39574,91 @@ msgstr "结冻小冰雹"
 # my-evolution/metar.c:247
 # my-evolution/metar.c:247
 #. PRECIPITATION
-#: my-evolution/metar.c:247
+#: my-evolution/metar.c:248
 msgid "Unknown precipitation"
 msgstr "未知的降水"
 
 # my-evolution/metar.c:248
 # my-evolution/metar.c:248
 # my-evolution/metar.c:248
-#: 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:249
 # my-evolution/metar.c:249
-#: my-evolution/metar.c:249
+#: my-evolution/metar.c:250
 msgid "Light precipitation"
 msgstr "少量降水"
 
 # my-evolution/metar.c:250
 # my-evolution/metar.c:250
 # my-evolution/metar.c:250
-#: my-evolution/metar.c:250
+#: my-evolution/metar.c:251
 msgid "Moderate precipitation"
 msgstr "中量降水"
 
 # my-evolution/metar.c:251
 # my-evolution/metar.c:251
 # my-evolution/metar.c:251
-#: my-evolution/metar.c:251
+#: my-evolution/metar.c:252
 msgid "Heavy precipitation"
 msgstr "大量降水"
 
 # my-evolution/metar.c:252
 # my-evolution/metar.c:252
 # my-evolution/metar.c:252
-#: my-evolution/metar.c:252
+#: my-evolution/metar.c:253
 msgid "Shallow precipitation"
 msgstr "微量降水"
 
 # my-evolution/metar.c:253
 # my-evolution/metar.c:253
 # my-evolution/metar.c:253
-#: my-evolution/metar.c:253
+#: my-evolution/metar.c:254
 msgid "Patches of precipitation"
 msgstr "局部地区性降水"
 
 # my-evolution/metar.c:254
 # my-evolution/metar.c:254
 # my-evolution/metar.c:254
-#: my-evolution/metar.c:254
+#: my-evolution/metar.c:255
 msgid "Partial precipitation"
 msgstr "部分降水"
 
 # my-evolution/metar.c:255
 # my-evolution/metar.c:255
 # my-evolution/metar.c:255
-#: my-evolution/metar.c:255
+#: my-evolution/metar.c:256
 msgid "Unknown thunderstorm"
 msgstr "未知的雷暴"
 
 # my-evolution/metar.c:256
 # my-evolution/metar.c:256
 # my-evolution/metar.c:256
-#: my-evolution/metar.c:256
+#: my-evolution/metar.c:257
 msgid "Blowing precipitation"
 msgstr "有风雷暴"
 
 # my-evolution/metar.c:257
 # my-evolution/metar.c:257
 # my-evolution/metar.c:257
-#: my-evolution/metar.c:257
+#: my-evolution/metar.c:258
 msgid "Showers, type unknown"
 msgstr "骤雨，未知类型"
 
 # my-evolution/metar.c:258
 # my-evolution/metar.c:258
 # my-evolution/metar.c:258
-#: my-evolution/metar.c:258
+#: my-evolution/metar.c:259
 msgid "Drifting precipitation"
 msgstr "微风降水"
 
 # my-evolution/metar.c:259
 # my-evolution/metar.c:259
 # my-evolution/metar.c:259
-#: my-evolution/metar.c:259
+#: my-evolution/metar.c:260
 msgid "Freezing precipitation"
 msgstr "结冻降水"
 
@@ -39192,77 +39666,77 @@ msgstr "结冻降水"
 # my-evolution/metar.c:262
 # my-evolution/metar.c:262
 #. MIST
-#: my-evolution/metar.c:262
+#: my-evolution/metar.c:263
 msgid "Mist"
 msgstr "霭"
 
 # my-evolution/metar.c:263
 # my-evolution/metar.c:263
 # my-evolution/metar.c:263
-#: 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:264
 # my-evolution/metar.c:264
-#: my-evolution/metar.c:264
+#: my-evolution/metar.c:265
 msgid "Light mist"
 msgstr "轻度霭"
 
 # my-evolution/metar.c:265
 # my-evolution/metar.c:265
 # my-evolution/metar.c:265
-#: my-evolution/metar.c:265
+#: my-evolution/metar.c:266
 msgid "Moderate mist"
 msgstr "中度霭"
 
 # my-evolution/metar.c:266
 # my-evolution/metar.c:266
 # my-evolution/metar.c:266
-#: my-evolution/metar.c:266
+#: my-evolution/metar.c:267
 msgid "Thick mist"
 msgstr "重度霭"
 
 # my-evolution/metar.c:267
 # my-evolution/metar.c:267
 # my-evolution/metar.c:267
-#: my-evolution/metar.c:267
+#: my-evolution/metar.c:268
 msgid "Shallow mist"
 msgstr "微量霭"
 
 # my-evolution/metar.c:268
 # my-evolution/metar.c:268
 # my-evolution/metar.c:268
-#: my-evolution/metar.c:268
+#: my-evolution/metar.c:269
 msgid "Patches of mist"
 msgstr "局部地区性霭"
 
 # my-evolution/metar.c:269
 # my-evolution/metar.c:269
 # my-evolution/metar.c:269
-#: my-evolution/metar.c:269
+#: my-evolution/metar.c:270
 msgid "Partial mist"
 msgstr "部分霭"
 
 # my-evolution/metar.c:271
 # my-evolution/metar.c:271
 # my-evolution/metar.c:271
-#: my-evolution/metar.c:271
+#: my-evolution/metar.c:272
 msgid "Mist with wind"
 msgstr "有风的霭"
 
 # my-evolution/metar.c:273
 # my-evolution/metar.c:273
 # my-evolution/metar.c:273
-#: my-evolution/metar.c:273
+#: my-evolution/metar.c:274
 msgid "Drifting mist"
 msgstr "微风的霭"
 
 # my-evolution/metar.c:274
 # my-evolution/metar.c:274
 # my-evolution/metar.c:274
-#: my-evolution/metar.c:274
+#: my-evolution/metar.c:275
 msgid "Freezing mist"
 msgstr "冻霭"
 
@@ -39270,77 +39744,77 @@ msgstr "冻霭"
 # my-evolution/metar.c:277
 # my-evolution/metar.c:277
 #. FOG
-#: my-evolution/metar.c:277
+#: my-evolution/metar.c:278
 msgid "Fog"
 msgstr "雾"
 
 # my-evolution/metar.c:278
 # my-evolution/metar.c:278
 # my-evolution/metar.c:278
-#: 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:279
 # my-evolution/metar.c:279
-#: my-evolution/metar.c:279
+#: my-evolution/metar.c:280
 msgid "Light fog"
 msgstr "轻雾"
 
 # my-evolution/metar.c:280
 # my-evolution/metar.c:280
 # my-evolution/metar.c:280
-#: my-evolution/metar.c:280
+#: my-evolution/metar.c:281
 msgid "Moderate fog"
 msgstr "中雾"
 
 # my-evolution/metar.c:281
 # my-evolution/metar.c:281
 # my-evolution/metar.c:281
-#: my-evolution/metar.c:281
+#: my-evolution/metar.c:282
 msgid "Thick fog"
 msgstr "厚雾"
 
 # my-evolution/metar.c:282
 # my-evolution/metar.c:282
 # my-evolution/metar.c:282
-#: my-evolution/metar.c:282
+#: my-evolution/metar.c:283
 msgid "Shallow fog"
 msgstr "微雾"
 
 # my-evolution/metar.c:283
 # my-evolution/metar.c:283
 # my-evolution/metar.c:283
-#: my-evolution/metar.c:283
+#: my-evolution/metar.c:284
 msgid "Patches of fog"
 msgstr "局部地区性雾"
 
 # my-evolution/metar.c:284
 # my-evolution/metar.c:284
 # my-evolution/metar.c:284
-#: my-evolution/metar.c:284
+#: my-evolution/metar.c:285
 msgid "Partial fog"
 msgstr "部分有雾"
 
 # my-evolution/metar.c:286
 # my-evolution/metar.c:286
 # my-evolution/metar.c:286
-#: my-evolution/metar.c:286
+#: my-evolution/metar.c:287
 msgid "Fog with wind"
 msgstr "有风的雾"
 
 # my-evolution/metar.c:288
 # my-evolution/metar.c:288
 # my-evolution/metar.c:288
-#: my-evolution/metar.c:288
+#: my-evolution/metar.c:289
 msgid "Drifting fog"
 msgstr "微风雾"
 
 # my-evolution/metar.c:289
 # my-evolution/metar.c:289
 # my-evolution/metar.c:289
-#: my-evolution/metar.c:289
+#: my-evolution/metar.c:290
 msgid "Freezing fog"
 msgstr "冻雾"
 
@@ -39348,77 +39822,77 @@ msgstr "冻雾"
 # my-evolution/metar.c:292
 # my-evolution/metar.c:292
 #. SMOKE
-#: my-evolution/metar.c:292
+#: my-evolution/metar.c:293
 msgid "Smoke"
 msgstr "烟霞"
 
 # my-evolution/metar.c:293
 # my-evolution/metar.c:293
 # my-evolution/metar.c:293
-#: 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:294
 # my-evolution/metar.c:294
-#: my-evolution/metar.c:294
+#: my-evolution/metar.c:295
 msgid "Thin smoke"
 msgstr "小烟霞"
 
 # my-evolution/metar.c:295
 # my-evolution/metar.c:295
 # my-evolution/metar.c:295
-#: my-evolution/metar.c:295
+#: my-evolution/metar.c:296
 msgid "Moderate smoke"
 msgstr "中烟霞"
 
 # my-evolution/metar.c:296
 # my-evolution/metar.c:296
 # my-evolution/metar.c:296
-#: my-evolution/metar.c:296
+#: my-evolution/metar.c:297
 msgid "Thick smoke"
 msgstr "大烟霞"
 
 # my-evolution/metar.c:297
 # my-evolution/metar.c:297
 # my-evolution/metar.c:297
-#: my-evolution/metar.c:297
+#: my-evolution/metar.c:298
 msgid "Shallow smoke"
 msgstr "微烟霞"
 
 # my-evolution/metar.c:298
 # my-evolution/metar.c:298
 # my-evolution/metar.c:298
-#: my-evolution/metar.c:298
+#: my-evolution/metar.c:299
 msgid "Patches of smoke"
 msgstr "局部地区性烟霞"
 
 # my-evolution/metar.c:299
 # my-evolution/metar.c:299
 # my-evolution/metar.c:299
-#: my-evolution/metar.c:299
+#: my-evolution/metar.c:300
 msgid "Partial smoke"
 msgstr "部分烟霞"
 
 # my-evolution/metar.c:300
 # my-evolution/metar.c:300
 # my-evolution/metar.c:300
-#: my-evolution/metar.c:300
+#: my-evolution/metar.c:301
 msgid "Thunderous smoke"
 msgstr "雷烟霞"
 
 # my-evolution/metar.c:301
 # my-evolution/metar.c:301
 # my-evolution/metar.c:301
-#: my-evolution/metar.c:301
+#: my-evolution/metar.c:302
 msgid "Smoke with wind"
 msgstr "有风烟霞"
 
 # my-evolution/metar.c:303
 # my-evolution/metar.c:303
 # my-evolution/metar.c:303
-#: my-evolution/metar.c:303
+#: my-evolution/metar.c:304
 msgid "Drifting smoke"
 msgstr "微风烟霞"
 
@@ -39426,84 +39900,84 @@ msgstr "微风烟霞"
 # my-evolution/metar.c:307
 # my-evolution/metar.c:307
 #. 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:308
 # my-evolution/metar.c:308
-#: 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:310
 # my-evolution/metar.c:310
-#: my-evolution/metar.c:310
+#: my-evolution/metar.c:311
 msgid "Moderate volcanic ash"
 msgstr "中度火山灰"
 
 # my-evolution/metar.c:311
 # my-evolution/metar.c:311
 # my-evolution/metar.c:311
-#: my-evolution/metar.c:311
+#: my-evolution/metar.c:312
 msgid "Thick volcanic ash"
 msgstr "重度火山灰"
 
 # my-evolution/metar.c:312
 # my-evolution/metar.c:312
 # my-evolution/metar.c:312
-#: my-evolution/metar.c:312
+#: my-evolution/metar.c:313
 msgid "Shallow volcanic ash"
 msgstr "微量火山灰"
 
 # my-evolution/metar.c:313
 # my-evolution/metar.c:313
 # my-evolution/metar.c:313
-#: 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:314
 # my-evolution/metar.c:314
-#: my-evolution/metar.c:314
+#: my-evolution/metar.c:315
 msgid "Partial volcanic ash"
 msgstr "部分有火山灰"
 
 # my-evolution/metar.c:315
 # my-evolution/metar.c:315
 # my-evolution/metar.c:315
-#: my-evolution/metar.c:315
+#: my-evolution/metar.c:316
 msgid "Thunderous volcanic ash"
 msgstr "有雷火山灰"
 
 # my-evolution/metar.c:316
 # my-evolution/metar.c:316
 # my-evolution/metar.c:316
-#: my-evolution/metar.c:316
+#: my-evolution/metar.c:317
 msgid "Blowing volcanic ash"
 msgstr "有风火山灰"
 
 # my-evolution/metar.c:317
 # my-evolution/metar.c:317
 # my-evolution/metar.c:317
-#: 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:318
 # my-evolution/metar.c:318
-#: my-evolution/metar.c:318
+#: my-evolution/metar.c:319
 msgid "Drifting volcanic ash"
 msgstr "微风火山灰"
 
 # my-evolution/metar.c:319
 # my-evolution/metar.c:319
 # my-evolution/metar.c:319
-#: my-evolution/metar.c:319
+#: my-evolution/metar.c:320
 msgid "Freezing volcanic ash"
 msgstr "冻火山灰"
 
@@ -39511,63 +39985,63 @@ msgstr "冻火山灰"
 # my-evolution/metar.c:322
 # my-evolution/metar.c:322
 #. SAND
-#: my-evolution/metar.c:322
+#: my-evolution/metar.c:323
 msgid "Sand"
 msgstr "沙尘"
 
 # my-evolution/metar.c:323
 # my-evolution/metar.c:323
 # my-evolution/metar.c:323
-#: 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:324
 # my-evolution/metar.c:324
-#: my-evolution/metar.c:324
+#: my-evolution/metar.c:325
 msgid "Light sand"
 msgstr "轻沙尘"
 
 # my-evolution/metar.c:325
 # my-evolution/metar.c:325
 # my-evolution/metar.c:325
-#: my-evolution/metar.c:325
+#: my-evolution/metar.c:326
 msgid "Moderate sand"
 msgstr "中沙尘"
 
 # my-evolution/metar.c:326
 # my-evolution/metar.c:326
 # my-evolution/metar.c:326
-#: my-evolution/metar.c:326
+#: my-evolution/metar.c:327
 msgid "Heavy sand"
 msgstr "重沙尘"
 
 # my-evolution/metar.c:328
 # my-evolution/metar.c:328
 # my-evolution/metar.c:328
-#: my-evolution/metar.c:328
+#: my-evolution/metar.c:329
 msgid "Patches of sand"
 msgstr "局部地区性有沙尘"
 
 # my-evolution/metar.c:329
 # my-evolution/metar.c:329
 # my-evolution/metar.c:329
-#: my-evolution/metar.c:329
+#: my-evolution/metar.c:330
 msgid "Partial sand"
 msgstr "部分有沙尘"
 
 # my-evolution/metar.c:331
 # my-evolution/metar.c:331
 # my-evolution/metar.c:331
-#: my-evolution/metar.c:331
+#: my-evolution/metar.c:332
 msgid "Blowing sand"
 msgstr "有风沙尘"
 
 # my-evolution/metar.c:333
 # my-evolution/metar.c:333
 # my-evolution/metar.c:333
-#: my-evolution/metar.c:333
+#: my-evolution/metar.c:334
 msgid "Drifting sand"
 msgstr "微风沙尘"
 
@@ -39575,77 +40049,77 @@ msgstr "微风沙尘"
 # my-evolution/metar.c:337
 # my-evolution/metar.c:337
 #. HAZE
-#: my-evolution/metar.c:337
+#: my-evolution/metar.c:338
 msgid "Haze"
 msgstr "灰尘"
 
 # my-evolution/metar.c:338
 # my-evolution/metar.c:338
 # my-evolution/metar.c:338
-#: 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:339
 # my-evolution/metar.c:339
-#: my-evolution/metar.c:339
+#: my-evolution/metar.c:340
 msgid "Light haze"
 msgstr "轻灰尘"
 
 # my-evolution/metar.c:340
 # my-evolution/metar.c:340
 # my-evolution/metar.c:340
-#: my-evolution/metar.c:340
+#: my-evolution/metar.c:341
 msgid "Moderate haze"
 msgstr "中灰尘"
 
 # my-evolution/metar.c:341
 # my-evolution/metar.c:341
 # my-evolution/metar.c:341
-#: my-evolution/metar.c:341
+#: my-evolution/metar.c:342
 msgid "Thick haze"
 msgstr "重灰尘"
 
 # my-evolution/metar.c:342
 # my-evolution/metar.c:342
 # my-evolution/metar.c:342
-#: my-evolution/metar.c:342
+#: my-evolution/metar.c:343
 msgid "Shallow haze"
 msgstr "微量灰尘"
 
 # my-evolution/metar.c:343
 # my-evolution/metar.c:343
 # my-evolution/metar.c:343
-#: my-evolution/metar.c:343
+#: my-evolution/metar.c:344
 msgid "Patches of haze"
 msgstr "局部地区性灰尘"
 
 # my-evolution/metar.c:344
 # my-evolution/metar.c:344
 # my-evolution/metar.c:344
-#: my-evolution/metar.c:344
+#: my-evolution/metar.c:345
 msgid "Partial haze"
 msgstr "部分有灰尘"
 
 # my-evolution/metar.c:346
 # my-evolution/metar.c:346
 # my-evolution/metar.c:346
-#: my-evolution/metar.c:346
+#: my-evolution/metar.c:347
 msgid "Haze with wind"
 msgstr "有风灰尘"
 
 # my-evolution/metar.c:348
 # my-evolution/metar.c:348
 # my-evolution/metar.c:348
-#: my-evolution/metar.c:348
+#: my-evolution/metar.c:349
 msgid "Drifting haze"
 msgstr "微风灰尘"
 
 # my-evolution/metar.c:349
 # my-evolution/metar.c:349
 # my-evolution/metar.c:349
-#: my-evolution/metar.c:349
+#: my-evolution/metar.c:350
 msgid "Freezing haze"
 msgstr "冻灰尘"
 
@@ -39653,77 +40127,77 @@ msgstr "冻灰尘"
 # my-evolution/metar.c:352
 # my-evolution/metar.c:352
 #. SPRAY
-#: my-evolution/metar.c:352
+#: my-evolution/metar.c:353
 msgid "Spray"
 msgstr "冰雾"
 
 # my-evolution/metar.c:353
 # my-evolution/metar.c:353
 # my-evolution/metar.c:353
-#: 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:354
 # my-evolution/metar.c:354
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
 msgid "Light spray"
 msgstr "轻度冰雾"
 
 # my-evolution/metar.c:355
 # my-evolution/metar.c:355
 # my-evolution/metar.c:355
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
 msgid "Moderate spray"
 msgstr "中度冰雾"
 
 # my-evolution/metar.c:356
 # my-evolution/metar.c:356
 # my-evolution/metar.c:356
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
 msgid "Heavy spray"
 msgstr "重度冰雾"
 
 # my-evolution/metar.c:357
 # my-evolution/metar.c:357
 # my-evolution/metar.c:357
-#: my-evolution/metar.c:357
+#: my-evolution/metar.c:358
 msgid "Shallow spray"
 msgstr "微量冰雾"
 
 # my-evolution/metar.c:358
 # my-evolution/metar.c:358
 # my-evolution/metar.c:358
-#: my-evolution/metar.c:358
+#: my-evolution/metar.c:359
 msgid "Patches of spray"
 msgstr "局部地区性冰雾"
 
 # my-evolution/metar.c:359
 # my-evolution/metar.c:359
 # my-evolution/metar.c:359
-#: my-evolution/metar.c:359
+#: my-evolution/metar.c:360
 msgid "Partial spray"
 msgstr "部分有冰雾"
 
 # my-evolution/metar.c:361
 # my-evolution/metar.c:361
 # my-evolution/metar.c:361
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
 msgid "Blowing spray"
 msgstr "有风冰雾"
 
 # my-evolution/metar.c:363
 # my-evolution/metar.c:363
 # my-evolution/metar.c:363
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
 msgid "Drifting spray"
 msgstr "微风冰雾"
 
 # my-evolution/metar.c:364
 # my-evolution/metar.c:364
 # my-evolution/metar.c:364
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
 msgid "Freezing spray"
 msgstr "冻冰雾"
 
@@ -39731,63 +40205,63 @@ msgstr "冻冰雾"
 # my-evolution/metar.c:367
 # my-evolution/metar.c:367
 #. DUST
-#: my-evolution/metar.c:367
+#: my-evolution/metar.c:368
 msgid "Dust"
 msgstr "粉尘"
 
 # my-evolution/metar.c:368
 # my-evolution/metar.c:368
 # my-evolution/metar.c:368
-#: 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:369
 # my-evolution/metar.c:369
-#: my-evolution/metar.c:369
+#: my-evolution/metar.c:370
 msgid "Light dust"
 msgstr "轻度粉尘"
 
 # my-evolution/metar.c:370
 # my-evolution/metar.c:370
 # my-evolution/metar.c:370
-#: my-evolution/metar.c:370
+#: my-evolution/metar.c:371
 msgid "Moderate dust"
 msgstr "中度粉尘"
 
 # my-evolution/metar.c:371
 # my-evolution/metar.c:371
 # my-evolution/metar.c:371
-#: my-evolution/metar.c:371
+#: my-evolution/metar.c:372
 msgid "Heavy dust"
 msgstr "重度粉尘"
 
 # my-evolution/metar.c:373
 # my-evolution/metar.c:373
 # my-evolution/metar.c:373
-#: my-evolution/metar.c:373
+#: my-evolution/metar.c:374
 msgid "Patches of dust"
 msgstr "局部地区性粉尘"
 
 # my-evolution/metar.c:374
 # my-evolution/metar.c:374
 # my-evolution/metar.c:374
-#: my-evolution/metar.c:374
+#: my-evolution/metar.c:375
 msgid "Partial dust"
 msgstr "部分有粉尘"
 
 # my-evolution/metar.c:376
 # my-evolution/metar.c:376
 # my-evolution/metar.c:376
-#: my-evolution/metar.c:376
+#: my-evolution/metar.c:377
 msgid "Blowing dust"
 msgstr "有风粉尘"
 
 # my-evolution/metar.c:378
 # my-evolution/metar.c:378
 # my-evolution/metar.c:378
-#: my-evolution/metar.c:378
+#: my-evolution/metar.c:379
 msgid "Drifting dust"
 msgstr "微风粉尘"
 
@@ -39795,70 +40269,70 @@ msgstr "微风粉尘"
 # my-evolution/metar.c:382
 # my-evolution/metar.c:382
 #. SQUALL
-#: my-evolution/metar.c:382
+#: my-evolution/metar.c:383
 msgid "Squall"
 msgstr "暴风"
 
 # my-evolution/metar.c:383
 # my-evolution/metar.c:383
 # my-evolution/metar.c:383
-#: 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:384
 # my-evolution/metar.c:384
-#: my-evolution/metar.c:384
+#: my-evolution/metar.c:385
 msgid "Light squall"
 msgstr "轻度暴风"
 
 # my-evolution/metar.c:385
 # my-evolution/metar.c:385
 # my-evolution/metar.c:385
-#: my-evolution/metar.c:385
+#: my-evolution/metar.c:386
 msgid "Moderate squall"
 msgstr "中度暴风"
 
 # my-evolution/metar.c:386
 # my-evolution/metar.c:386
 # my-evolution/metar.c:386
-#: my-evolution/metar.c:386
+#: my-evolution/metar.c:387
 msgid "Heavy squall"
 msgstr "重度暴风"
 
 # my-evolution/metar.c:389
 # my-evolution/metar.c:389
 # my-evolution/metar.c:389
-#: my-evolution/metar.c:389
+#: my-evolution/metar.c:390
 msgid "Partial squall"
 msgstr "局部地区性暴风"
 
 # my-evolution/metar.c:390
 # my-evolution/metar.c:390
 # my-evolution/metar.c:390
-#: my-evolution/metar.c:390
+#: my-evolution/metar.c:391
 msgid "Thunderous squall"
 msgstr "雷暴风"
 
 # my-evolution/metar.c:391
 # my-evolution/metar.c:391
 # my-evolution/metar.c:391
-#: my-evolution/metar.c:391
+#: my-evolution/metar.c:392
 msgid "Blowing squall"
 msgstr "暴风"
 
 # my-evolution/metar.c:393
 # my-evolution/metar.c:393
 # my-evolution/metar.c:393
-#: my-evolution/metar.c:393
+#: my-evolution/metar.c:394
 msgid "Drifting squall"
 msgstr "微暴风"
 
 # my-evolution/metar.c:394
 # my-evolution/metar.c:394
 # my-evolution/metar.c:394
-#: my-evolution/metar.c:394
+#: my-evolution/metar.c:395
 msgid "Freezing squall"
 msgstr "冻暴风"
 
@@ -39866,77 +40340,77 @@ msgstr "冻暴风"
 # my-evolution/metar.c:397
 # my-evolution/metar.c:397
 #. SANDSTORM
-#: my-evolution/metar.c:397
+#: my-evolution/metar.c:398
 msgid "Sandstorm"
 msgstr "沙暴"
 
 # my-evolution/metar.c:398
 # my-evolution/metar.c:398
 # my-evolution/metar.c:398
-#: 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:399
 # my-evolution/metar.c:399
-#: my-evolution/metar.c:399
+#: my-evolution/metar.c:400
 msgid "Light standstorm"
 msgstr "轻度沙暴"
 
 # my-evolution/metar.c:400
 # my-evolution/metar.c:400
 # my-evolution/metar.c:400
-#: my-evolution/metar.c:400
+#: my-evolution/metar.c:401
 msgid "Moderate sandstorm"
 msgstr "中度沙暴"
 
 # my-evolution/metar.c:401
 # my-evolution/metar.c:401
 # my-evolution/metar.c:401
-#: my-evolution/metar.c:401
+#: my-evolution/metar.c:402
 msgid "Heavy sandstorm"
 msgstr "重度沙暴"
 
 # my-evolution/metar.c:402
 # my-evolution/metar.c:402
 # my-evolution/metar.c:402
-#: my-evolution/metar.c:402
+#: my-evolution/metar.c:403
 msgid "Shallow sandstorm"
 msgstr "微量沙暴"
 
 # my-evolution/metar.c:404
 # my-evolution/metar.c:404
 # my-evolution/metar.c:404
-#: my-evolution/metar.c:404
+#: my-evolution/metar.c:405
 msgid "Partial sandstorm"
 msgstr "局部地区性沙暴"
 
 # my-evolution/metar.c:405
 # my-evolution/metar.c:405
 # my-evolution/metar.c:405
-#: my-evolution/metar.c:405
+#: my-evolution/metar.c:406
 msgid "Thunderous sandstorm"
 msgstr "雷沙暴"
 
 # my-evolution/metar.c:406
 # my-evolution/metar.c:406
 # my-evolution/metar.c:406
-#: my-evolution/metar.c:406
+#: my-evolution/metar.c:407
 msgid "Blowing sandstorm"
 msgstr "有风沙暴"
 
 # my-evolution/metar.c:408
 # my-evolution/metar.c:408
 # my-evolution/metar.c:408
-#: my-evolution/metar.c:408
+#: my-evolution/metar.c:409
 msgid "Drifting sandstorm"
 msgstr "微风沙暴"
 
 # my-evolution/metar.c:409
 # my-evolution/metar.c:409
 # my-evolution/metar.c:409
-#: my-evolution/metar.c:409
+#: my-evolution/metar.c:410
 msgid "Freezing sandstorm"
 msgstr "冻沙暴"
 
@@ -39944,77 +40418,77 @@ msgstr "冻沙暴"
 # my-evolution/metar.c:412
 # my-evolution/metar.c:412
 #. DUSTSTORM
-#: my-evolution/metar.c:412
+#: my-evolution/metar.c:413
 msgid "Duststorm"
 msgstr "尘暴"
 
 # my-evolution/metar.c:413
 # my-evolution/metar.c:413
 # my-evolution/metar.c:413
-#: 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:414
 # my-evolution/metar.c:414
-#: my-evolution/metar.c:414
+#: my-evolution/metar.c:415
 msgid "Light duststorm"
 msgstr "轻度尘暴"
 
 # my-evolution/metar.c:415
 # my-evolution/metar.c:415
 # my-evolution/metar.c:415
-#: my-evolution/metar.c:415
+#: my-evolution/metar.c:416
 msgid "Moderate duststorm"
 msgstr "中度尘暴"
 
 # my-evolution/metar.c:416
 # my-evolution/metar.c:416
 # my-evolution/metar.c:416
-#: my-evolution/metar.c:416
+#: my-evolution/metar.c:417
 msgid "Heavy duststorm"
 msgstr "重度尘暴"
 
 # my-evolution/metar.c:417
 # my-evolution/metar.c:417
 # my-evolution/metar.c:417
-#: my-evolution/metar.c:417
+#: my-evolution/metar.c:418
 msgid "Shallow duststorm"
 msgstr "微量尘暴"
 
 # my-evolution/metar.c:419
 # my-evolution/metar.c:419
 # my-evolution/metar.c:419
-#: my-evolution/metar.c:419
+#: my-evolution/metar.c:420
 msgid "Partial duststorm"
 msgstr "局部地区性尘暴"
 
 # my-evolution/metar.c:420
 # my-evolution/metar.c:420
 # my-evolution/metar.c:420
-#: my-evolution/metar.c:420
+#: my-evolution/metar.c:421
 msgid "Thunderous duststorm"
 msgstr "雷尘暴"
 
 # my-evolution/metar.c:421
 # my-evolution/metar.c:421
 # my-evolution/metar.c:421
-#: my-evolution/metar.c:421
+#: my-evolution/metar.c:422
 msgid "Blowing duststorm"
 msgstr "有风尘暴"
 
 # my-evolution/metar.c:423
 # my-evolution/metar.c:423
 # my-evolution/metar.c:423
-#: my-evolution/metar.c:423
+#: my-evolution/metar.c:424
 msgid "Drifting duststorm"
 msgstr "微风尘暴"
 
 # my-evolution/metar.c:424
 # my-evolution/metar.c:424
 # my-evolution/metar.c:424
-#: my-evolution/metar.c:424
+#: my-evolution/metar.c:425
 msgid "Freezing duststorm"
 msgstr "冻尘暴"
 
@@ -40022,70 +40496,70 @@ msgstr "冻尘暴"
 # my-evolution/metar.c:427
 # my-evolution/metar.c:427
 #. 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:428
 # my-evolution/metar.c:428
-#: 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:429
 # my-evolution/metar.c:429
-#: my-evolution/metar.c:429
+#: my-evolution/metar.c:430
 msgid "Light funnel cloud"
 msgstr "小型漏斗云"
 
 # my-evolution/metar.c:430
 # my-evolution/metar.c:430
 # my-evolution/metar.c:430
-#: my-evolution/metar.c:430
+#: my-evolution/metar.c:431
 msgid "Moderate funnel cloud"
 msgstr "中型漏斗云"
 
 # my-evolution/metar.c:431
 # my-evolution/metar.c:431
 # my-evolution/metar.c:431
-#: my-evolution/metar.c:431
+#: my-evolution/metar.c:432
 msgid "Thick funnel cloud"
 msgstr "大型漏斗云"
 
 # my-evolution/metar.c:432
 # my-evolution/metar.c:432
 # my-evolution/metar.c:432
-#: my-evolution/metar.c:432
+#: my-evolution/metar.c:433
 msgid "Shallow funnel cloud"
 msgstr "微型漏斗云"
 
 # my-evolution/metar.c:433
 # my-evolution/metar.c:433
 # my-evolution/metar.c:433
-#: 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:434
 # my-evolution/metar.c:434
-#: my-evolution/metar.c:434
+#: my-evolution/metar.c:435
 msgid "Partial funnel clouds"
 msgstr "部分漏斗云"
 
 # my-evolution/metar.c:436
 # my-evolution/metar.c:436
 # my-evolution/metar.c:436
-#: 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:438
 # my-evolution/metar.c:438
-#: my-evolution/metar.c:438
+#: my-evolution/metar.c:439
 msgid "Drifting funnel cloud"
 msgstr "微风漏斗云"
 
@@ -40093,56 +40567,56 @@ msgstr "微风漏斗云"
 # my-evolution/metar.c:442 my-evolution/metar.c:451
 # my-evolution/metar.c:442 my-evolution/metar.c:451
 #. 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:443
 # my-evolution/metar.c:443
-#: 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:445
 # my-evolution/metar.c:445
-#: my-evolution/metar.c:445
+#: my-evolution/metar.c:446
 msgid "Moderate tornado"
 msgstr "中型龙卷风"
 
 # my-evolution/metar.c:446
 # my-evolution/metar.c:446
 # my-evolution/metar.c:446
-#: my-evolution/metar.c:446
+#: my-evolution/metar.c:447
 msgid "Raging tornado"
 msgstr "猛烈的龙卷风"
 
 # my-evolution/metar.c:449
 # my-evolution/metar.c:449
 # my-evolution/metar.c:449
-#: my-evolution/metar.c:449
+#: my-evolution/metar.c:450
 msgid "Partial tornado"
 msgstr "局部地区性龙卷风"
 
 # my-evolution/metar.c:450
 # my-evolution/metar.c:450
 # my-evolution/metar.c:450
-#: my-evolution/metar.c:450
+#: my-evolution/metar.c:451
 msgid "Thunderous tornado"
 msgstr "雷暴龙卷风"
 
 # my-evolution/metar.c:453
 # my-evolution/metar.c:453
 # my-evolution/metar.c:453
-#: my-evolution/metar.c:453
+#: my-evolution/metar.c:454
 msgid "Drifting tornado"
 msgstr "阵龙卷风"
 
 # my-evolution/metar.c:454
 # my-evolution/metar.c:454
 # my-evolution/metar.c:454
-#: my-evolution/metar.c:454
+#: my-evolution/metar.c:455
 msgid "Freezing tornado"
 msgstr "冻龙卷风"
 
@@ -40150,70 +40624,70 @@ msgstr "冻龙卷风"
 # my-evolution/metar.c:457
 # my-evolution/metar.c:457
 #. 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:458
 # my-evolution/metar.c:458
-#: 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:459
 # my-evolution/metar.c:459
-#: my-evolution/metar.c:459
+#: my-evolution/metar.c:460
 msgid "Light dust whirls"
 msgstr "小型尘卷风"
 
 # my-evolution/metar.c:460
 # my-evolution/metar.c:460
 # my-evolution/metar.c:460
-#: my-evolution/metar.c:460
+#: my-evolution/metar.c:461
 msgid "Moderate dust whirls"
 msgstr "中型尘卷风"
 
 # my-evolution/metar.c:461
 # my-evolution/metar.c:461
 # my-evolution/metar.c:461
-#: my-evolution/metar.c:461
+#: my-evolution/metar.c:462
 msgid "Heavy dust whirls"
 msgstr "大型尘卷风"
 
 # my-evolution/metar.c:462
 # my-evolution/metar.c:462
 # my-evolution/metar.c:462
-#: my-evolution/metar.c:462
+#: my-evolution/metar.c:463
 msgid "Shallow dust whirls"
 msgstr "微型尘卷风"
 
 # my-evolution/metar.c:463
 # my-evolution/metar.c:463
 # my-evolution/metar.c:463
-#: 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:464
 # my-evolution/metar.c:464
-#: my-evolution/metar.c:464
+#: my-evolution/metar.c:465
 msgid "Partial dust whirls"
 msgstr "部分有尘卷风"
 
 # my-evolution/metar.c:466
 # my-evolution/metar.c:466
 # my-evolution/metar.c:466
-#: my-evolution/metar.c:466
+#: my-evolution/metar.c:467
 msgid "Blowing dust whirls"
 msgstr "尘卷风"
 
 # my-evolution/metar.c:468
 # my-evolution/metar.c:468
 # my-evolution/metar.c:468
-#: my-evolution/metar.c:468
+#: my-evolution/metar.c:469
 msgid "Drifting dust whirls"
 msgstr "阵尘卷风"
 
@@ -40380,46 +40854,51 @@ msgstr "调度(_S)"
 msgid "_Weather"
 msgstr "天气(_W)"
 
-#: 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:1
+# shell/GNOME_Evolution_Shell.oaf.in.h:1
+# shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution shell。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution 任务控制车间"
+
 # mail/mail-accounts.c:783 mail/mail-config.glade.h:42
 # mail/mail-accounts.c:798 mail/mail-config.glade.h:42
 # mail/mail-accounts.c:824 mail/mail-config.glade.h:49
-#: 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:1
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "The Evolution shell."
-msgstr "Evolution shell。"
-
 # shell/e-activity-handler.c:200
 # shell/e-activity-handler.c:200
 # shell/e-activity-handler.c:200
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr "显示细节"
 
 # shell/e-activity-handler.c:202
 # shell/e-activity-handler.c:202
 # shell/e-activity-handler.c:202
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
 msgid "Cancel Operation"
 msgstr "取消操作"
 
 # shell/e-storage-set-view.c:658
 # shell/e-storage-set-view.c:658
 # shell/e-storage-set-view.c:658
-#: shell/e-folder-dnd-bridge.c:53
+#: shell/e-folder-dnd-bridge.c:55
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -40431,7 +40910,7 @@ msgstr ""
 # mail/mail-display.c:354
 # mail/mail-display.c:353
 # mail/mail-display.c:354
-#: 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 中打开..."
@@ -40442,7 +40921,7 @@ msgstr "在 %s 中打开..."
 # shell/e-storage-set-view.etspec.h:1
 # mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 # shell/e-storage-set-view.etspec.h:1
-#: shell/e-folder-list.c:312
+#: shell/e-folder-list.c:338
 #, fuzzy
 msgid "Add a Folder"
 msgstr "文件夹"
@@ -40450,22 +40929,22 @@ msgstr "文件夹"
 # mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 # mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 # mail/mail-config.glade.h:36 shell/e-local-storage.c:173
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
 msgid "Drafts"
 msgstr "草稿"
 
 # shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 # shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 # shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-#: 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:175
 # shell/e-local-storage.c:175
 # shell/e-local-storage.c:175
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:181
 msgid "Outbox"
 msgstr "发件箱"
 
@@ -40475,46 +40954,21 @@ msgstr "发件箱"
 # shell/e-local-storage.c:176
 # mail/mail-config.glade.h:82 mail/message-list.etspec.h:7
 # shell/e-local-storage.c:176
-#: shell/e-local-storage.c:181
+#: shell/e-local-storage.c:182
 msgid "Sent"
 msgstr "已发送"
 
-# shell/e-setup.c:124
-# shell/e-setup.c:124
-# shell/e-setup.c:124
-#: shell/e-setup.c:126
-msgid "Evolution installation"
-msgstr "安装 Evolution"
-
-# shell/e-setup.c:128
-# shell/e-setup.c:128
-# shell/e-setup.c:128
-#: shell/e-setup.c:130
-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:129
-# shell/e-setup.c:129
-# shell/e-setup.c:129
-#: shell/e-setup.c:131
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr "请点击“确认”以安装文件，或者点击“取消”以便退出。"
-
 # shell/e-setup.c:169
 # shell/e-setup.c:169
 # shell/e-setup.c:169
-#: shell/e-setup.c:171
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "无法正确地更新文件"
 
 # shell/e-setup.c:192
 # shell/e-setup.c:192
 # shell/e-setup.c:192
-#: shell/e-setup.c:194
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -40528,7 +40982,7 @@ msgstr ""
 # shell/e-setup.c:207
 # shell/e-setup.c:207
 # shell/e-setup.c:207
-#: shell/e-setup.c:209
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -40537,50 +40991,10 @@ msgstr ""
 "在把文件复制到“%s”\n"
 "时发生错误。"
 
-# camel/camel-session.c:532
-# shell/e-setup.c:280
-# shell/e-setup.c:280
-#: shell/e-setup.c:282
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Evolution 无法创建目录\n"
-"%s：\n"
-"%s"
-
-# shell/e-setup.c:298
-# shell/e-setup.c:298
-#: 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:304
-# shell/e-setup.c:304
-#: 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:281
 # shell/e-setup.c:327
 # shell/e-setup.c:327
-#: shell/e-setup.c:329
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -40590,27 +41004,10 @@ msgstr ""
 "文件“%s”不是目录。\n"
 "请移动它以便安装 Evolution 用户文件。"
 
-# shell/e-setup.c:295
-# shell/e-setup.c:341
-# shell/e-setup.c:341
-#: 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 找到了\n"
-"老式的实施概要目录。\n"
-"在运行 Evolution \n"
-"之前，要删掉它。\n"
-"您希望我删掉该目录吗？"
-
 # shell/e-setup.c:320
 # shell/e-setup.c:366
 # shell/e-setup.c:366
-#: shell/e-setup.c:368
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -40630,7 +41027,7 @@ msgstr "制作团队"
 # calendar/gui/e-calendar-table.etspec.h:8
 # calendar/gui/e-calendar-table.etspec.h:8
 # calendar/gui/e-calendar-table.etspec.h:8
-#: shell/e-shell-config-autocompletion.c:106
+#: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
 msgstr "完成日期"
@@ -40638,14 +41035,14 @@ msgstr "完成日期"
 # shell/e-shell-importer.c:1014
 # shell/e-shell-importer.c:1014
 # shell/e-shell-importer.c:1027
-#: shell/e-shell-config-default-folders.c:133
+#: shell/e-shell-config-default-folders.c:149
 #, fuzzy
 msgid "Select Default Folder"
 msgstr "选择文件夹"
 
 # mail/mail-config.glade.h:83
 # mail/mail-config.glade.h:83
-#: shell/e-shell-config-folder-settings.c:71
+#: shell/e-shell-config-folder-settings.c:70
 #, fuzzy
 msgid "Default Folders"
 msgstr "特殊文件夹"
@@ -40653,7 +41050,7 @@ msgstr "特殊文件夹"
 # mail/mail-ops.c:86
 # mail/mail-ops.c:87
 # mail/mail-ops.c:87
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
 #, fuzzy
 msgid "Offline Folders"
 msgstr "正在过滤文件夹"
@@ -40661,7 +41058,7 @@ msgstr "正在过滤文件夹"
 # shell/e-local-storage.c:636
 # shell/e-local-storage.c:636
 # shell/e-local-storage.c:636
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 #, fuzzy
 msgid "Autocompletion Folders"
 msgstr "本地文件夹"
@@ -40680,7 +41077,7 @@ msgstr "无法检查文件夹： %s： %s"
 # shell/e-shell-folder-commands.c:488
 # shell/e-shell-folder-commands.c:488
 # shell/e-shell-folder-commands.c:488
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
 #, fuzzy, c-format
 msgid "Cannot move folder: %s"
 msgstr ""
@@ -40690,28 +41087,28 @@ msgstr ""
 # shell/e-shell-folder-commands.c:176
 # shell/e-shell-folder-commands.c:176
 # shell/e-shell-folder-commands.c:176
-#: 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:178
 # shell/e-shell-folder-commands.c:178
 # shell/e-shell-folder-commands.c:178
-#: 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:192
 # shell/e-shell-folder-commands.c:192
 # shell/e-shell-folder-commands.c:192
-#: 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:307
 # shell/e-shell-folder-commands.c:307
 # shell/e-shell-folder-commands.c:307
-#: 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”复制进去："
@@ -40719,14 +41116,14 @@ msgstr "给出一个文件夹以便将文件夹“%s”复制进去："
 # shell/e-shell-folder-commands.c:312
 # shell/e-shell-folder-commands.c:312
 # shell/e-shell-folder-commands.c:312
-#: shell/e-shell-folder-commands.c:325
+#: shell/e-shell-folder-commands.c:323
 msgid "Copy folder"
 msgstr "复制文件夹"
 
 # shell/e-shell-folder-commands.c:354
 # shell/e-shell-folder-commands.c:354
 # shell/e-shell-folder-commands.c:354
-#: 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”移动进去："
@@ -40734,14 +41131,14 @@ msgstr "给出一个文件夹以便将文件夹“%s”移动进去："
 # shell/e-shell-folder-commands.c:359
 # shell/e-shell-folder-commands.c:359
 # shell/e-shell-folder-commands.c:359
-#: shell/e-shell-folder-commands.c:369
+#: shell/e-shell-folder-commands.c:367
 msgid "Move folder"
 msgstr "移动文件夹"
 
 # shell/e-shell-folder-commands.c:385
 # shell/e-shell-folder-commands.c:385
 # shell/e-shell-folder-commands.c:385
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -40750,28 +41147,28 @@ msgstr ""
 "无法删除文件夹：\n"
 "%s"
 
-# shell/e-shell-folder-commands.c:401
-# shell/e-shell-folder-commands.c:401
-# shell/e-shell-folder-commands.c:401
-#: shell/e-shell-folder-commands.c:406
-#, c-format
-msgid "Delete \"%s\""
-msgstr "删除“%s”"
-
 # shell/e-shell-folder-commands.c:385
 # shell/e-shell-folder-commands.c:385
 # shell/e-shell-folder-commands.c:385
-#: 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:401
+# shell/e-shell-folder-commands.c:401
+# shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:412
+#, c-format
+msgid "Delete \"%s\""
+msgstr "删除“%s”"
+
 # shell/e-shell-folder-commands.c:488
 # shell/e-shell-folder-commands.c:488
 # shell/e-shell-folder-commands.c:488
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -40783,7 +41180,7 @@ msgstr ""
 # shell/e-shell-folder-commands.c:537
 # shell/e-shell-folder-commands.c:537
 # shell/e-shell-folder-commands.c:537
-#: shell/e-shell-folder-commands.c:535
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "把文件夹“%s”重命名为："
@@ -40791,7 +41188,7 @@ msgstr "把文件夹“%s”重命名为："
 # shell/e-shell-folder-commands.c:544
 # shell/e-shell-folder-commands.c:544
 # shell/e-shell-folder-commands.c:544
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr "重命名文件夹"
 
@@ -40801,20 +41198,20 @@ msgstr "重命名文件夹"
 # shell/e-shell-folder-creation-dialog.c:148
 # shell/e-shell-folder-commands.c:554
 # shell/e-shell-folder-creation-dialog.c:168
-#: 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:488
 # shell/e-shell-folder-commands.c:488
 # shell/e-shell-folder-commands.c:488
-#: shell/e-shell-folder-commands.c:589
+#: shell/e-shell-folder-commands.c:586
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -40826,7 +41223,7 @@ msgstr ""
 # shell/e-shell-folder-creation-dialog.c:111
 # shell/e-shell-folder-creation-dialog.c:111
 # shell/e-shell-folder-creation-dialog.c:125
-#: 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"
@@ -40838,36 +41235,29 @@ msgstr ""
 # ui/evolution.xml.h:7
 # ui/evolution.xml.h:7
 # ui/evolution.xml.h:7
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:308
 #, fuzzy
 msgid "Create New Folder"
 msgstr "创建新文件夹(_N)..."
 
-# shell/e-shell-folder-selection-dialog.c:376
-# shell/e-shell-folder-selection-dialog.c:376
-# shell/e-shell-folder-selection-dialog.c:376
-#: shell/e-shell-folder-selection-dialog.c:393
-msgid "New..."
-msgstr "正在新建..."
-
 # shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 # shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 # shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
-#: 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:142
 # shell/e-shell-importer.c:142
-#: 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:145
 # shell/e-shell-importer.c:145
-#: 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"
@@ -40882,14 +41272,14 @@ msgstr ""
 # shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
 # shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
 # shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
-#: 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:263 shell/e-shell-importer.c:294
 # shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 # shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
-#: 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"
@@ -40901,7 +41291,7 @@ msgstr ""
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:834
-#: shell/e-shell-importer.c:355
+#: shell/e-shell-importer.c:351
 #, fuzzy
 msgid "Select importer"
 msgstr "选择文件夹"
@@ -40909,7 +41299,7 @@ msgstr "选择文件夹"
 # shell/e-shell-importer.c:397
 # shell/e-shell-importer.c:397
 # shell/e-shell-importer.c:409
-#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "文件 %s 不存在"
@@ -40918,15 +41308,15 @@ msgstr "文件 %s 不存在"
 # shell/e-shell-about-box.c:40
 # shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
 # shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
-#: 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:424
 # shell/e-shell-importer.c:424
 # shell/e-shell-importer.c:435
-#: 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"
@@ -40938,14 +41328,14 @@ msgstr ""
 # shell/e-shell-importer.c:434
 # shell/e-shell-importer.c:434
 # shell/e-shell-importer.c:445
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "正在导入"
 
 # shell/e-shell-importer.c:442
 # shell/e-shell-importer.c:442
 # shell/e-shell-importer.c:453
-#: shell/e-shell-importer.c:522
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -40957,7 +41347,7 @@ msgstr ""
 # shell/e-shell-importer.c:455
 # shell/e-shell-importer.c:455
 # shell/e-shell-importer.c:466
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "启动 %s 错误"
@@ -40965,7 +41355,7 @@ msgstr "启动 %s 错误"
 # shell/e-shell-importer.c:474
 # shell/e-shell-importer.c:474
 # shell/e-shell-importer.c:485
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "装入 %s 错误"
@@ -40973,7 +41363,7 @@ msgstr "装入 %s 错误"
 # shell/e-shell-importer.c:491
 # shell/e-shell-importer.c:491
 # shell/e-shell-importer.c:502
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -40985,49 +41375,49 @@ msgstr ""
 # shell/e-shell-importer.c:561
 # shell/e-shell-importer.c:561
 # shell/e-shell-importer.c:572
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "自动"
 
 # shell/e-shell-importer.c:612
 # shell/e-shell-importer.c:612
 # shell/e-shell-importer.c:623
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "文件名："
 
 # shell/e-shell-importer.c:617
 # shell/e-shell-importer.c:617
 # shell/e-shell-importer.c:628
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "选择一个文件"
 
 # shell/e-shell-importer.c:627
 # shell/e-shell-importer.c:627
 # shell/e-shell-importer.c:638
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "文件类型："
 
 # shell/e-shell-importer.c:652
 # shell/e-shell-importer.c:652
 # shell/e-shell-importer.c:663
-#: 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:656
 # shell/e-shell-importer.c:656
 # shell/e-shell-importer.c:667
-#: shell/e-shell-importer.c:720
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "导入单个文件"
 
 # shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:628
 # shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:628
 # shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
-#: 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"
@@ -41038,14 +41428,14 @@ msgstr ""
 # shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
 # shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
 # shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
-#: 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:848 shell/e-shell-startup-wizard.c:754
 # shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:754
 # shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
-#: 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："
@@ -41053,35 +41443,35 @@ msgstr "从 %s："
 # shell/e-shell-importer.c:1014
 # shell/e-shell-importer.c:1014
 # shell/e-shell-importer.c:1027
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "选择文件夹"
 
 # shell/e-shell-importer.c:1015
 # shell/e-shell-importer.c:1015
 # shell/e-shell-importer.c:1028
-#: 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:1127 shell/importer/intelligent.c:193
 # shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
 # shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
-#: 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:572
 # shell/e-shell-offline-handler.c:572
 # shell/e-shell-offline-handler.c:572
-#: shell/e-shell-offline-handler.c:582
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "正在关闭连接..."
 
 # mail/mail-mt.c:254
 # mail/mail-mt.c:254
 # mail/mail-mt.c:254
-#: shell/e-shell-offline-sync.c:161
+#: shell/e-shell-offline-sync.c:163
 #, fuzzy, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
@@ -41093,13 +41483,13 @@ msgstr ""
 # camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
 # camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:881
 # camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
-#: 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 "正在同步“%s” (%d / %d) ..."
@@ -41107,21 +41497,32 @@ msgstr "正在同步“%s” (%d / %d) ..."
 # shell/e-shell-about-box.c:40
 # shell/e-shell-about-box.c:40
 # shell/e-shell-about-box.c:40
-#: shell/e-shell-settings-dialog.c:326
+#: shell/e-shell-settings-dialog.c:345
 msgid "Evolution Settings"
 msgstr "Evolution 设置"
 
+# mail/subscribe-dialog.c:1581
+# mail/subscribe-dialog.c:1581
+# mail/subscribe-dialog.c:1581
+#. 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 "请选择服务器。"
+
 # mail/mail-ops.c:1234
 # mail/mail-ops.c:1236
 # mail/mail-ops.c:1279
-#: shell/e-shell-shared-folder-picker-dialog.c:357
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 msgid "Opening Folder"
 msgstr "正在打开文件夹"
 
 # mail/mail-ops.c:1234
 # mail/mail-ops.c:1236
 # mail/mail-ops.c:1279
-#: 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”"
@@ -41129,7 +41530,7 @@ msgstr "正在打开文件夹“%s”"
 # mail/mail-display.c:354
 # mail/mail-display.c:353
 # mail/mail-display.c:354
-#: shell/e-shell-shared-folder-picker-dialog.c:369
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, c-format
 msgid "in \"%s\" ..."
 msgstr "在“%s”中..."
@@ -41137,7 +41538,7 @@ msgstr "在“%s”中..."
 # camel/providers/local/camel-mbox-summary.c:650
 # camel/providers/local/camel-mbox-summary.c:650
 # camel/providers/local/camel-mbox-summary.c:650
-#: shell/e-shell-shared-folder-picker-dialog.c:455
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, c-format
 msgid "Could not open shared folder: %s."
 msgstr "无法打开共享文件夹：%s。"
@@ -41145,122 +41546,113 @@ msgstr "无法打开共享文件夹：%s。"
 # shell/e-shell-folder-creation-dialog.c:111
 # shell/e-shell-folder-creation-dialog.c:111
 # shell/e-shell-folder-creation-dialog.c:125
-#: 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
-# shell/e-shell-startup-wizard.c:159
-# shell/e-shell-startup-wizard.c:159
-#: shell/e-shell-startup-wizard.c:159
-#, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-"无法启动 Evolution 邮件助手界面\n"
-"(%s)"
-
-# shell/e-shell-startup-wizard.c:169
-# shell/e-shell-startup-wizard.c:169
-# shell/e-shell-startup-wizard.c:169
-#: shell/e-shell-startup-wizard.c:169
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "无法启动 Evolution 邮件助手界面\n"
-
 # widgets/misc/e-charset-picker.c:101
 # widgets/misc/e-charset-picker.c:101
 # shell/e-shell-user-creatable-items-handler.c:495
 # shell/e-shell-user-creatable-items-handler.c:540
 # widgets/misc/e-charset-picker.c:104
-#: 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:114
 # shell/e-shell-utils.c:114
-#: 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:121
 # shell/e-shell-utils.c:121
-#: 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:127
-# shell/e-shell-utils.c:127
-#: shell/e-shell-utils.c:127
-msgid "Folder name cannot contain slashes."
-msgstr "文件夹名不能含有斜线。"
+# shell/e-shell-utils.c:121
+# shell/e-shell-utils.c:121
+# shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:129
+#, fuzzy
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "文件夹名不能含有回车符。"
+
+# shell/e-shell-utils.c:121
+# shell/e-shell-utils.c:121
+# shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "文件夹名不能含有回车符。"
 
 # shell/e-shell-utils.c:133
 # shell/e-shell-utils.c:133
 # shell/e-shell-utils.c:133
-#: 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:577
 # shell/e-shell-view-menu.c:577
 # shell/e-shell-view-menu.c:577
-#: 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:585
 # shell/e-shell-view-menu.c:585
 # shell/e-shell-view-menu.c:585
-#: 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:165
-# shell/e-shell-view-menu.c:165
-# shell/e-shell-view-menu.c:165
-#: shell/e-shell-view-menu.c:196
-msgid "Bug buddy was not found in your $PATH."
-msgstr "在您的 $PATH 中找不到 Bug buddy。"
+# shell/e-shell-view-menu.c:173
+# shell/e-shell-view-menu.c:173
+# shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:193
+#, fuzzy
+msgid "Bug buddy is not installed."
+msgstr "无法运行 Bug buddy。"
 
 # shell/e-shell-view-menu.c:173
 # shell/e-shell-view-menu.c:173
 # shell/e-shell-view-menu.c:173
-#: 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:215
 # shell/e-shell-view-menu.c:215
 # shell/e-shell-view-menu.c:215
-#: shell/e-shell-view-menu.c:248
+#: shell/e-shell-view-menu.c:247
 msgid "About Ximian Evolution"
 msgstr "关于 Ximian Evolution"
 
 # shell/e-shell-view-menu.c:424
 # shell/e-shell-view-menu.c:424
 # shell/e-shell-view-menu.c:424
-#: 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:425
 # shell/e-shell-view-menu.c:425
 # shell/e-shell-view-menu.c:425
-#: 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:545
 # shell/e-shell-view-menu.c:545
 # shell/e-shell-view-menu.c:545
-#: shell/e-shell-view-menu.c:625
+#: shell/e-shell-view-menu.c:617
 #, fuzzy
 msgid "Create New Shortcut"
 msgstr "创建新快捷方式"
@@ -41268,42 +41660,42 @@ msgstr "创建新快捷方式"
 # shell/e-shell-view-menu.c:546
 # shell/e-shell-view-menu.c:546
 # shell/e-shell-view-menu.c:546
-#: 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:688
 # shell/e-shell-view-menu.c:688
 # shell/e-shell-view-menu.c:688
-#: shell/e-shell-view-menu.c:788
+#: shell/e-shell-view-menu.c:769
 msgid "_Work Online"
 msgstr "在线工作(_W)"
 
 # shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
 # shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
 # shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
-#: 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 "离线工作(_W)"
 
 # shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
 # shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
 # shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
-#: 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:214
 # shell/e-shell-view.c:214
 # shell/e-shell-view.c:215
-#: shell/e-shell-view.c:226
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "(未显示文件夹)"
 
 # shell/e-shell-view.c:1585
 # shell/e-shell-view.c:1585
 # shell/e-shell-view.c:1598
-#: shell/e-shell-view.c:1861
+#: shell/e-shell-view.c:2045
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -41311,14 +41703,14 @@ msgstr "%s (%d)"
 # shell/e-shell-view.c:1587
 # shell/e-shell-view.c:1587
 # shell/e-shell-view.c:1600
-#: shell/e-shell-view.c:1863
+#: shell/e-shell-view.c:2047
 msgid "(None)"
 msgstr "(无)"
 
 # shell/e-shell-view.c:1634
 # shell/e-shell-view.c:1634
 # shell/e-shell-view.c:1647
-#: 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 目前在线。 点击该按钮则离线工作。"
@@ -41326,14 +41718,14 @@ msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
 # shell/e-shell-view.c:1641
 # shell/e-shell-view.c:1641
 # shell/e-shell-view.c:1654
-#: 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 正在离线过程中。"
 
 # shell/e-shell-view.c:1647
 # shell/e-shell-view.c:1647
 # shell/e-shell-view.c:1660
-#: 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 "Ximian Evolution 目前离线。 点击该按钮则在线工作。"
@@ -41356,7 +41748,7 @@ msgstr ""
 # shell/e-shell.c:651
 # shell/e-shell.c:651
 # shell/e-shell.c:651
-#: shell/e-shell.c:739
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "无法设置本地存储 -- %s"
@@ -41364,7 +41756,7 @@ msgstr "无法设置本地存储 -- %s"
 # shell/e-shell.c:1659
 # shell/e-shell.c:1659
 # shell/e-shell.c:1660
-#: shell/e-shell.c:1877
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -41378,166 +41770,157 @@ msgstr ""
 # shell/e-shell.c:1886
 # shell/e-shell.c:1886
 # shell/e-shell.c:1887
-#: shell/e-shell.c:2178
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "无效参数"
 
 # shell/e-shell.c:1888
 # shell/e-shell.c:1888
 # shell/e-shell.c:1889
-#: shell/e-shell.c:2180
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "无法注册到 OAF"
 
 # shell/e-shell.c:1890
 # shell/e-shell.c:1890
 # shell/e-shell.c:1891
-#: shell/e-shell.c:2182
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "找不到配置数据库"
 
 # shell/e-shell.c:1892 shell/e-storage.c:500
 # shell/e-shell.c:1892 shell/e-storage.c:500
 # shell/e-shell.c:1893 shell/e-storage.c:500
-#: 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:74
 # shell/e-shortcuts-view.c:74
 # shell/e-shortcuts-view.c:74
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:80
 msgid "Create new shortcut group"
 msgstr "创建新快捷方式组"
 
 # shell/e-shortcuts-view.c:75
 # shell/e-shortcuts-view.c:75
 # shell/e-shortcuts-view.c:75
-#: shell/e-shortcuts-view.c:77
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
 msgstr "组名："
 
 # shell/e-shortcuts-view.c:175
 # shell/e-shortcuts-view.c:175
 # shell/e-shortcuts-view.c:175
-#: 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:180
-# shell/e-shortcuts-view.c:180
-# shell/e-shortcuts-view.c:180
-#: shell/e-shortcuts-view.c:178
-msgid "Don't remove"
-msgstr "不删除"
-
 # shell/e-shortcuts-view.c:209
 # shell/e-shortcuts-view.c:209
 # shell/e-shortcuts-view.c:209
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr "重命名快捷方式组"
 
 # shell/e-shortcuts-view.c:210
 # shell/e-shortcuts-view.c:210
 # shell/e-shortcuts-view.c:210
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr "把选中的快捷方式组重命名为："
 
 # shell/e-shortcuts-view.c:224
 # shell/e-shortcuts-view.c:224
 # shell/e-shortcuts-view.c:224
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "小图标(_S)"
 
 # shell/e-shortcuts-view.c:225
 # shell/e-shortcuts-view.c:225
 # shell/e-shortcuts-view.c:225
-#: 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:227
 # shell/e-shortcuts-view.c:227
 # shell/e-shortcuts-view.c:227
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr "大图标(_L)"
 
 # shell/e-shortcuts-view.c:228
 # shell/e-shortcuts-view.c:228
 # shell/e-shortcuts-view.c:228
-#: 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:239
 # shell/e-shortcuts-view.c:239
 # shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr "新组(_N)..."
 
 # shell/e-shortcuts-view.c:240
 # shell/e-shortcuts-view.c:240
 # shell/e-shortcuts-view.c:240
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr "创建新快捷方式组"
 
 # shell/e-shortcuts-view.c:242
 # shell/e-shortcuts-view.c:242
 # shell/e-shortcuts-view.c:242
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
 msgstr "删除该组(_R)..."
 
 # shell/e-shortcuts-view.c:243
 # shell/e-shortcuts-view.c:243
 # shell/e-shortcuts-view.c:243
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr "删除该快捷方式组"
 
 # shell/e-shortcuts-view.c:245
 # shell/e-shortcuts-view.c:245
 # shell/e-shortcuts-view.c:245
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
 msgstr "重命名该组(_N)..."
 
 # shell/e-shortcuts-view.c:246
 # shell/e-shortcuts-view.c:246
 # shell/e-shortcuts-view.c:246
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr "重命名该快捷方式组"
 
 # shell/e-shortcuts-view.c:251
 # shell/e-shortcuts-view.c:251
 # shell/e-shortcuts-view.c:251
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr "隐藏快捷方式栏(_H)"
 
 # shell/e-shortcuts-view.c:252
 # shell/e-shortcuts-view.c:252
 # shell/e-shortcuts-view.c:252
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr "隐藏快捷方式栏"
 
 # shell/e-shell-view-menu.c:545
 # shell/e-shell-view-menu.c:545
 # shell/e-shell-view-menu.c:545
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:281
 #, fuzzy
 msgid "Create _Default Shortcuts"
 msgstr "创建新快捷方式"
@@ -41545,7 +41928,7 @@ msgstr "创建新快捷方式"
 # shell/e-shell-view-menu.c:545
 # shell/e-shell-view-menu.c:545
 # shell/e-shell-view-menu.c:545
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:282
 #, fuzzy
 msgid "Create Default Shortcuts"
 msgstr "创建新快捷方式"
@@ -41553,77 +41936,77 @@ msgstr "创建新快捷方式"
 # shell/e-shortcuts-view.c:371
 # shell/e-shortcuts-view.c:371
 # shell/e-shortcuts-view.c:371
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr "重命名快捷方式"
 
 # shell/e-shortcuts-view.c:372
 # shell/e-shortcuts-view.c:372
 # shell/e-shortcuts-view.c:372
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr "把快捷方式重命名为："
 
 # shell/e-shortcuts-view.c:384
 # shell/e-shortcuts-view.c:384
 # shell/e-shortcuts-view.c:384
-#: 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:386 ui/evolution.xml.h:19
 # shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 # shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
-#: 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 "在新窗口中打开(_W)"
 
 # shell/e-shortcuts-view.c:386
 # shell/e-shortcuts-view.c:386
 # shell/e-shortcuts-view.c:386
-#: 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:389
 # shell/e-shortcuts-view.c:389
 # shell/e-shortcuts-view.c:389
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 # shell/e-shortcuts-view.c:389
 # shell/e-shortcuts-view.c:389
 # shell/e-shortcuts-view.c:389
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr "重命名该快捷方式"
 
 # shell/e-shortcuts-view.c:391
 # shell/e-shortcuts-view.c:391
 # shell/e-shortcuts-view.c:391
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Re_move"
 msgstr "删除(_M)"
 
 # shell/e-shortcuts-view.c:391
 # shell/e-shortcuts-view.c:391
 # shell/e-shortcuts-view.c:391
-#: 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:640
 # shell/e-shortcuts.c:640
 # shell/e-shortcuts.c:640
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr "保存快捷方式错误。"
 
 # shell/e-shortcuts.c:1043
 # shell/e-shortcuts.c:1043
 # shell/e-shortcuts.c:1043
-#: shell/e-shortcuts.c:1080
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr "快捷方式"
 
@@ -41640,102 +42023,102 @@ msgstr "主席"
 # shell/e-storage.c:498
 # shell/e-storage.c:498
 # shell/e-storage.c:498
-#: shell/e-storage.c:569
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "无错误"
 
 # shell/e-storage.c:502
 # shell/e-storage.c:502
 # shell/e-storage.c:502
-#: shell/e-storage.c:573
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr "已经有一个同名文件夹存在"
 
 # shell/e-storage.c:504
 # shell/e-storage.c:504
 # shell/e-storage.c:504
-#: shell/e-storage.c:575
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr "指定的文件夹类型无效"
 
 # shell/e-storage.c:506
 # shell/e-storage.c:506
 # shell/e-storage.c:506
-#: shell/e-storage.c:577
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "输入输出错误"
 
 # shell/e-storage.c:508
 # shell/e-storage.c:508
 # shell/e-storage.c:508
-#: shell/e-storage.c:579
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr "没有足够的空间创建文件夹"
 
 # shell/e-storage.c:510
 # shell/e-storage.c:510
 # shell/e-storage.c:510
-#: shell/e-storage.c:581
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr "文件夹不为空"
 
 # shell/e-storage.c:512
 # shell/e-storage.c:512
 # shell/e-storage.c:512
-#: shell/e-storage.c:583
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr "找不到指定的文件夹"
 
 # shell/e-storage.c:514
 # shell/e-storage.c:514
 # shell/e-storage.c:514
-#: shell/e-storage.c:585
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr "在该存储中没有实现该功能"
 
 # shell/e-storage.c:518
 # shell/e-storage.c:518
 # shell/e-storage.c:518
-#: shell/e-storage.c:589
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr "不支持的操作"
 
 # shell/e-storage.c:520
 # shell/e-storage.c:520
 # shell/e-storage.c:520
-#: 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:522
 # shell/e-storage.c:522
 # shell/e-storage.c:522
-#: shell/e-storage.c:593
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr "无法修改或删除指定的文件夹"
 
 # shell/e-storage.c:524
 # shell/e-storage.c:524
 # shell/e-storage.c:524
-#: 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:526
 # shell/e-storage.c:526
 # shell/e-storage.c:526
-#: 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:191
 # shell/e-task-widget.c:191
-#: shell/e-task-widget.c:191
+#: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
@@ -41743,12 +42126,12 @@ msgstr "%s (...)"
 # shell/e-task-widget.c:196
 # shell/e-task-widget.c:196
 # shell/e-task-widget.c:196
-#: 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 "<点击这里以便选择文件夹>"
 
@@ -41801,140 +42184,134 @@ msgstr ""
 # shell/evolution-shell-component.c:1009
 # shell/evolution-shell-component.c:1009
 # shell/evolution-shell-component.c:1022
-#: shell/evolution-shell-component.c:1145
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "CORBA 错误"
 
 # shell/evolution-shell-component.c:1011
 # shell/evolution-shell-component.c:1011
 # shell/evolution-shell-component.c:1024
-#: shell/evolution-shell-component.c:1147
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "被中断"
 
 # shell/evolution-shell-component.c:1013
 # shell/evolution-shell-component.c:1013
 # shell/evolution-shell-component.c:1026
-#: shell/evolution-shell-component.c:1149
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "无效参数"
 
 # shell/evolution-shell-component.c:1015
 # shell/evolution-shell-component.c:1015
 # shell/evolution-shell-component.c:1028
-#: shell/evolution-shell-component.c:1151
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "已经有所有者了"
 
 # shell/evolution-shell-component.c:1017
 # shell/evolution-shell-component.c:1017
 # shell/evolution-shell-component.c:1030
-#: shell/evolution-shell-component.c:1153
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "无所有者"
 
 # shell/evolution-shell-component.c:1019
 # shell/evolution-shell-component.c:1019
 # shell/evolution-shell-component.c:1032
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "没找到"
 
 # shell/evolution-shell-component.c:1021
 # shell/evolution-shell-component.c:1021
 # shell/evolution-shell-component.c:1034
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "不支持的类型"
 
 # shell/evolution-shell-component.c:1023
 # shell/evolution-shell-component.c:1023
 # shell/evolution-shell-component.c:1036
-#: shell/evolution-shell-component.c:1159
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "不支持的方案"
 
 # shell/evolution-shell-component.c:1025
 # shell/evolution-shell-component.c:1025
 # shell/evolution-shell-component.c:1038
-#: shell/evolution-shell-component.c:1161
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "不支持的操作"
 
 # shell/evolution-shell-component.c:1027
 # shell/evolution-shell-component.c:1027
 # shell/evolution-shell-component.c:1040
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "内部错误"
 
 # shell/evolution-shell-component.c:1031
 # shell/evolution-shell-component.c:1031
 # shell/evolution-shell-component.c:1044
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "存在"
 
 # shell/evolution-shell-component.c:1033
 # shell/evolution-shell-component.c:1033
 # shell/evolution-shell-component.c:1046
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "无效 URI"
 
 # shell/evolution-shell-component.c:1037
 # shell/evolution-shell-component.c:1037
 # shell/evolution-shell-component.c:1050
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "含有子文件夹"
 
 # shell/evolution-shell-component.c:1039
 # shell/evolution-shell-component.c:1039
 # shell/evolution-shell-component.c:1052
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "没有剩余空间"
 
 # shell/evolution-shell-component.c:1041
 # shell/evolution-shell-component.c:1041
 # shell/evolution-shell-component.c:1054
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "原所有者已死"
 
 # shell/e-shell-importer.c:627
 # shell/e-shell-importer.c:627
 # shell/evolution-test-component.c:41
-#: 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
-# shell/glade/e-active-connection-dialog.glade.h:1
-# shell/glade/e-active-connection-dialog.glade.h:1
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr "活跃连接"
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: 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:2
 # shell/glade/e-active-connection-dialog.glade.h:2
-#: 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
-# shell/glade/e-active-connection-dialog.glade.h:3
-# shell/glade/e-active-connection-dialog.glade.h:3
-#: 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:4
 # shell/glade/e-active-connection-dialog.glade.h:4
-#: 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 "下列连接正处于活跃状态："
 
@@ -41985,21 +42362,21 @@ msgstr "任务"
 # shell/glade/e-shell-folder-creation-dialog.glade.h:1
 # shell/glade/e-shell-folder-creation-dialog.glade.h:1
 # shell/glade/e-shell-folder-creation-dialog.glade.h:1
-#: 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:2
 # shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#: 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:3
 # shell/glade/e-shell-folder-creation-dialog.glade.h:3
-#: 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 "指定在那里创建文件夹："
 
@@ -42038,41 +42415,42 @@ msgstr "用户名(_U)："
 # shell/glade/evolution-startup-wizard.glade.h:3
 # shell/glade/evolution-startup-wizard.glade.h:3
 # shell/glade/evolution-startup-wizard.glade.h:3
-#: 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:5
 # shell/glade/evolution-startup-wizard.glade.h:5
-#: 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:8
 # shell/glade/evolution-startup-wizard.glade.h:8
-#: 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:9
 # shell/glade/evolution-startup-wizard.glade.h:9
-#: 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:10
 # shell/glade/evolution-startup-wizard.glade.h:10
-#: 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"
@@ -42083,13 +42461,13 @@ msgstr ""
 # shell/glade/evolution-startup-wizard.glade.h:15
 # shell/glade/evolution-startup-wizard.glade.h:15
 # shell/glade/evolution-startup-wizard.glade.h:15
-#: 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\n"
 " 所需的全部信息。\n"
@@ -42154,56 +42532,57 @@ msgstr ""
 # shell/importer/intelligent.c:190
 # shell/importer/intelligent.c:190
 # shell/importer/intelligent.c:190
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
 msgid "Importers"
 msgstr "导入器"
 
 # shell/importer/intelligent.c:196
 # shell/importer/intelligent.c:196
 # shell/importer/intelligent.c:196
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "不要导入"
 
 # shell/importer/intelligent.c:198
 # shell/importer/intelligent.c:198
 # shell/importer/intelligent.c:198
-#: 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:208
 # shell/importer/intelligent.c:208
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution 可以从下列文件中导入数据："
 
 # data/evolution.desktop.in.h:1 shell/main.c:83
 # shell/main.c:83
 # shell/main.c:83
-#: shell/main.c:96
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr "Evolution"
 
 # shell/main.c:89
 # shell/main.c:89
 # shell/main.c:89
-#: 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"
@@ -42216,7 +42595,7 @@ msgstr ""
 # ui/evolution.xml.h:31
 # data/evolution.desktop.in.h:2
 # data/evolution.desktop.in.h:2
-#: shell/main.c:250
+#: shell/main.c:290
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -42226,7 +42605,7 @@ msgstr "Ximian Evolution"
 # shell/importer/intelligent.c:198
 # shell/importer/intelligent.c:198
 # shell/importer/intelligent.c:198
-#: shell/main.c:259
+#: shell/main.c:298
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "不要再问我"
@@ -42234,14 +42613,14 @@ msgstr "不要再问我"
 # shell/main.c:210
 # shell/main.c:210
 # shell/main.c:210
-#: shell/main.c:394
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "无法访问 Ximian Evolution shell。"
 
 # shell/main.c:219
 # shell/main.c:219
 # shell/main.c:219
-#: shell/main.c:403
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "无法初始化 Ximian Evolution shell： %s"
@@ -42249,14 +42628,14 @@ msgstr "无法初始化 Ximian Evolution shell： %s"
 # shell/main.c:289
 # shell/main.c:289
 # shell/main.c:289
-#: shell/main.c:485
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "禁用启动屏幕"
 
 # importers/netscape-importer.c:897
 # importers/netscape-importer.c:897
 # importers/netscape-importer.c:897
-#: shell/main.c:487
+#: shell/main.c:530
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "开始导入"
@@ -42264,23 +42643,31 @@ msgstr "开始导入"
 # shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
 # shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
 # shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
-#: shell/main.c:489
+#: shell/main.c:532
 #, fuzzy
 msgid "Start in online mode"
 msgstr "启动智能导入器"
 
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# notes/GNOME_Evolution_Notes.oaf.in.h:3
+#: shell/main.c:535
+#, fuzzy
+msgid "Forcibly shut down all evolution components"
+msgstr "Evolution 便签组件车间。"
+
 # shell/main.c:290
 # shell/main.c:290
 # shell/main.c:290
-#: shell/main.c:491
+#: 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 "强制更新来自 Evolution 1.0.x 的配置文件"
 
-#: shell/main.c:511
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -42289,13 +42676,6 @@ msgstr ""
 "%s：不能同时使用 --online 和 --offline。\n"
 "  详情请使用 %s --help。\n"
 
-# shell/main.c:332
-# shell/main.c:332
-# shell/main.c:332
-#: shell/main.c:542
-msgid "Cannot initialize the Bonobo component system."
-msgstr "无法初始化 Bonobo 成员系统。"
-
 # tools/evolution-addressbook-export.c:36
 # tools/evolution-addressbook-import.c:46
 # tools/evolution-addressbook-export.c:36
@@ -42303,8 +42683,7 @@ msgstr "无法初始化 Bonobo 成员系统。"
 # tools/evolution-addressbook-abuse.c:80
 # tools/evolution-addressbook-export.c:36
 # tools/evolution-addressbook-import.c:46
-#: 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 "装入默认地址簿错误。"
@@ -42313,25 +42692,70 @@ msgstr "装入默认地址簿错误。"
 # tools/evolution-addressbook-import.c:67
 # tools/evolution-addressbook-abuse.c:111
 # tools/evolution-addressbook-import.c:67
-#: 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
-# tools/evolution-addressbook-export.c:46
-# tools/evolution-addressbook-export.c:46
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "输出文件"
-
 # tools/evolution-addressbook-import.c:80
 # tools/evolution-addressbook-import.c:80
 # tools/evolution-addressbook-import.c:80
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "没有提供文件名。"
 
+# composer/e-msg-composer-attachment-bar.c:531
+# composer/e-msg-composer-attachment-bar.c:537
+# composer/e-msg-composer-attachment-bar.c:537
+#: 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 ""
+
+# calendar/gui/cal-search-bar.c:57
+# calendar/gui/cal-search-bar.c:57
+# calendar/gui/cal-search-bar.c:57
+#: 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 ""
+
+# ui/evolution-mail-list.xml.h:4
+# ui/evolution-mail-list.xml.h:4
+# ui/evolution-mail-list.xml.h:4
+#: tools/evolution-launch-composer.c:329
+#, fuzzy
+msgid "Default subject for the message."
+msgstr "剪切选中的邮件"
+
+# camel/providers/local/camel-mbox-summary.c:650
+# camel/providers/local/camel-mbox-summary.c:650
+# camel/providers/local/camel-mbox-summary.c:650
+#. 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-mail-message.xml.h:7
 # ui/evolution-mail-message.xml.h:7
 # ui/evolution-mail-message.xml.h:7
@@ -42500,7 +42924,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)"
 
@@ -42712,7 +43136,7 @@ msgstr "打印该项"
 # ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
 # ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
 #: 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 "保存"
 
@@ -42778,7 +43202,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)"
 
@@ -43226,7 +43650,7 @@ msgstr "删除(_E)"
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
-#: 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)"
 
@@ -43678,7 +44102,7 @@ msgstr "任务回复"
 # camel/providers/imap/camel-imap-provider.c:45
 #: 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
@@ -43961,7 +44385,7 @@ msgstr "重命名(_R)..."
 # ui/my-evolution.xml.h:9
 # ui/evolution-mail-message.xml.h:108 ui/evolution.xml.h:49
 # ui/my-evolution.xml.h:9
-#: 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)"
 
@@ -43994,7 +44418,7 @@ 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)"
 
@@ -44005,7 +44429,7 @@ msgstr "关闭(_C)"
 # ui/evolution-mail-messagedisplay.xml.h:8
 # ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 #: 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)"
 
@@ -44016,6 +44440,16 @@ msgstr "查看(_V)"
 msgid "Attach"
 msgstr "附加"
 
+# composer/e-msg-composer-select-file.c:228
+# ui/evolution-message-composer.xml.h:2
+# composer/e-msg-composer-select-file.c:290
+# ui/evolution-message-composer.xml.h:2
+# composer/e-msg-composer-select-file.c:291
+# ui/evolution-message-composer.xml.h:2
+#: 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
 # ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 # ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
@@ -44321,7 +44755,7 @@ msgstr "保存项并关闭对话框"
 # ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 # ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 # ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
-#: 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)"
 
@@ -44628,18 +45062,10 @@ msgstr "在另一个窗口中打开该文件夹"
 msgid "Pi_lot Settings..."
 msgstr "Pilot 设置(_L)..."
 
-# ui/evolution.xml.h:45
-# ui/evolution.xml.h:45
-# ui/evolution.xml.h:45
-#: ui/evolution.xml.h:27
-#, fuzzy
-msgid "Pilot Con_duit Settings..."
-msgstr "Pilot 设置(_P)..."
-
 # ui/evolution.xml.h:7
 # ui/evolution.xml.h:7
 # ui/evolution.xml.h:7
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "Remove a folder added with \"Open Other User's Folder\""
 msgstr "创建新文件夹(_N)..."
@@ -44647,14 +45073,14 @@ msgstr "创建新文件夹(_N)..."
 # ui/evolution-mail-global.xml.h:13
 # ui/evolution-mail-global.xml.h:13
 # ui/evolution-mail-global.xml.h:13
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Send / Receive"
 msgstr "发送 / 接收"
 
 # ui/evolution-mail-global.xml.h:14
 # ui/evolution-mail-global.xml.h:14
 # ui/evolution-mail-global.xml.h:14
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "发送编队的邮件并检索新邮件"
@@ -44662,15 +45088,7 @@ msgstr "发送编队的邮件并检索新邮件"
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:48
-#: ui/evolution.xml.h:31
-#, fuzzy
-msgid "Set up Pilot conduit configuration"
-msgstr "邮件配置"
-
-# mail/mail-config.glade.h:41
-# mail/mail-config.glade.h:41
-# mail/mail-config.glade.h:48
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "邮件配置"
@@ -44678,98 +45096,98 @@ msgstr "邮件配置"
 # ui/evolution.xml.h:21
 # ui/evolution.xml.h:21
 # ui/evolution.xml.h:21
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Show information about Ximian Evolution"
 msgstr "显示关于 Ximian Evolution 的信息"
 
 # ui/evolution.xml.h:22
 # ui/evolution.xml.h:22
 # ui/evolution.xml.h:22
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "提交错误报告"
 
 # ui/evolution.xml.h:23
 # ui/evolution.xml.h:23
 # ui/evolution.xml.h:23
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "提交错误报告(_B)"
 
 # ui/evolution.xml.h:24
 # ui/evolution.xml.h:24
 # ui/evolution.xml.h:24
-#: 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:25
 # ui/evolution.xml.h:25
 # ui/evolution.xml.h:25
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Toggle"
 msgstr "反转"
 
 # ui/evolution.xml.h:26
 # ui/evolution.xml.h:26
 # ui/evolution.xml.h:26
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr "是否显示文件夹栏"
 
 # ui/evolution.xml.h:27
 # ui/evolution.xml.h:27
 # ui/evolution.xml.h:27
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "Toggle whether to show the shortcut bar"
 msgstr "是否显示快捷方式栏"
 
 # ui/evolution.xml.h:28
 # ui/evolution.xml.h:28
 # ui/evolution.xml.h:28
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "Toggle whether we are working offline."
 msgstr "我们是否离线工作。"
 
 # ui/evolution.xml.h:29
 # ui/evolution.xml.h:29
 # ui/evolution.xml.h:29
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "查看选中的文件夹"
 
 # ui/evolution.xml.h:31
 # ui/evolution.xml.h:31
 # ui/evolution.xml.h:31
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution 常见问题(_F)"
 
 # ui/evolution.xml.h:32
 # ui/evolution.xml.h:32
 # ui/evolution.xml.h:32
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 msgid "_About Ximian Evolution..."
 msgstr "关于 Ximian Evolution(_A)..."
 
 # ui/evolution.xml.h:34
 # ui/evolution.xml.h:34
 # ui/evolution.xml.h:34
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Copy..."
 msgstr "复制(_C)..."
 
 # ui/evolution.xml.h:38
 # ui/evolution.xml.h:38
 # ui/evolution.xml.h:38
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "文件夹工具栏(_F)"
 
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Folder..."
 msgstr "文件夹(_F)"
@@ -44777,42 +45195,42 @@ msgstr "文件夹(_F)"
 # ui/evolution.xml.h:39
 # ui/evolution.xml.h:39
 # ui/evolution.xml.h:39
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Go to Folder..."
 msgstr "转到文件夹(_G)..."
 
 # ui/evolution.xml.h:41
 # ui/evolution.xml.h:41
 # ui/evolution.xml.h:41
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Import..."
 msgstr "正在导入(_I)..."
 
 # ui/evolution.xml.h:42
 # ui/evolution.xml.h:42
 # ui/evolution.xml.h:42
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Move..."
 msgstr "移动(_M)..."
 
 # ui/evolution.xml.h:43
 # ui/evolution.xml.h:43
 # ui/evolution.xml.h:43
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_New"
 msgstr "新建(_N)"
 
 # ui/evolution.xml.h:44
 # ui/evolution.xml.h:44
 # ui/evolution.xml.h:44
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
 msgid "_New Folder"
 msgstr "新建文件夹(_N)"
 
 # ui/evolution.xml.h:7
 # ui/evolution.xml.h:7
 # ui/evolution.xml.h:7
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Remove Other User's Folder"
 msgstr "创建新文件夹(_N)..."
@@ -44820,28 +45238,28 @@ msgstr "创建新文件夹(_N)..."
 # ui/evolution.xml.h:46
 # ui/evolution.xml.h:46
 # ui/evolution.xml.h:46
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "重命名(_R)..."
 
 # ui/evolution-mail-global.xml.h:23
 # ui/evolution-mail-global.xml.h:23
 # ui/evolution-mail-global.xml.h:23
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Send / Receive"
 msgstr "发送和接收(_S)"
 
 # ui/evolution.xml.h:48
 # ui/evolution.xml.h:48
 # ui/evolution.xml.h:48
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "快捷方式栏(_S)"
 
 # ui/evolution.xml.h:47
 # ui/evolution.xml.h:47
 # ui/evolution.xml.h:47
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
 #, fuzzy
 msgid "_Shortcut..."
 msgstr "快捷方式(_S)"
@@ -44981,9 +45399,8 @@ msgstr "任务(_T)"
 
 # widgets/e-timezone-dialog/e-timezone-dialog.c:207
 # widgets/e-timezone-dialog/e-timezone-dialog.c:700
-#. 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 ""
 
@@ -45023,7 +45440,7 @@ msgstr ""
 # widgets/menus/gal-view-menus.c:195
 # widgets/menus/gal-view-menus.c:195
 # widgets/menus/gal-view-menus.c:195
-#: widgets/menus/gal-view-menus.c:295
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr "当前视图(_C)"
 
@@ -45031,19 +45448,19 @@ msgstr "当前视图(_C)"
 # widgets/menus/gal-view-menus.c:195
 # widgets/menus/gal-view-menus.c:195
 #. 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 "当前视图(_C)"
 
-#: 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:222
 # widgets/menus/gal-view-menus.c:222
 # widgets/menus/gal-view-menus.c:222
-#: widgets/menus/gal-view-menus.c:379
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr "定义视图"
 
@@ -45060,28 +45477,28 @@ msgstr "123456-"
 # widgets/misc/e-calendar-item.c:1070
 # widgets/misc/e-calendar-item.c:1070
 #. 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:234 widgets/misc/e-dateedit.c:438
 # widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
-#: 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:242 widgets/misc/e-dateedit.c:444
 # widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
-#: 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:797
 # widgets/misc/e-cell-date-edit.c:797
-#: 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"
@@ -45096,110 +45513,110 @@ msgstr "百分比值必需在 0 到 100之间，含 0 和 100"
 # widgets/misc/e-charset-picker.c:58
 # widgets/misc/e-charset-picker.c:58
 # widgets/misc/e-charset-picker.c:59
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "波罗的语"
 
 # widgets/misc/e-charset-picker.c:59
 # widgets/misc/e-charset-picker.c:59
 # widgets/misc/e-charset-picker.c:60
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "中欧"
 
 # widgets/misc/e-charset-picker.c:60
 # widgets/misc/e-charset-picker.c:60
 # widgets/misc/e-charset-picker.c:61
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "中文"
 
 # widgets/misc/e-charset-picker.c:61
 # widgets/misc/e-charset-picker.c:61
 # widgets/misc/e-charset-picker.c:62
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "西里尔语"
 
 # widgets/misc/e-charset-picker.c:62
 # widgets/misc/e-charset-picker.c:62
 # widgets/misc/e-charset-picker.c:63
-#: 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:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr "希伯来语"
 
 # widgets/misc/e-charset-picker.c:63
 # widgets/misc/e-charset-picker.c:63
 # widgets/misc/e-charset-picker.c:65
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr "日文"
 
 # widgets/misc/e-charset-picker.c:64
 # widgets/misc/e-charset-picker.c:64
 # widgets/misc/e-charset-picker.c:66
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "韩语"
 
 # widgets/misc/e-charset-picker.c:65
 # widgets/misc/e-charset-picker.c:65
 # widgets/misc/e-charset-picker.c:67
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "土耳其语"
 
 # widgets/misc/e-charset-picker.c:66
 # widgets/misc/e-charset-picker.c:66
 # widgets/misc/e-charset-picker.c:68
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr "Unicode"
 
 # widgets/misc/e-charset-picker.c:67
 # widgets/misc/e-charset-picker.c:67
 # widgets/misc/e-charset-picker.c:69
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
 msgstr "西欧"
 
 # widgets/misc/e-charset-picker.c:84
 # widgets/misc/e-charset-picker.c:84
 # widgets/misc/e-charset-picker.c:86
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "繁体"
 
 # widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 # widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 # widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
-#: 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:90
 # widgets/misc/e-charset-picker.c:90
 # widgets/misc/e-charset-picker.c:92
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "乌克兰语"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # widgets/misc/e-charset-picker.c:95
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:97
 msgid "Visual"
 msgstr "可视"
 
 # widgets/misc/e-charset-picker.c:159
 # widgets/misc/e-charset-picker.c:159
 # widgets/misc/e-charset-picker.c:162
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "未知的字符集：%s"
@@ -45207,21 +45624,21 @@ msgstr "未知的字符集：%s"
 # widgets/misc/e-charset-picker.c:201
 # widgets/misc/e-charset-picker.c:201
 # widgets/misc/e-charset-picker.c:204
-#: 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:276
 # widgets/misc/e-charset-picker.c:276
 # widgets/misc/e-charset-picker.c:279
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "其它..."
 
 # widgets/misc/e-charset-picker.c:395
 # widgets/misc/e-charset-picker.c:395
 # widgets/misc/e-charset-picker.c:398
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr "字符编码"
 
@@ -45235,14 +45652,15 @@ msgstr "..."
 # widgets/misc/e-filter-bar.c:152
 # widgets/misc/e-filter-bar.c:153
 # widgets/misc/e-filter-bar.c:153
-#: widgets/misc/e-filter-bar.c:189
+#: widgets/misc/e-filter-bar.c:183
 msgid "Search Editor"
 msgstr "搜索编辑器"
 
 # widgets/misc/e-filter-bar.c:168
 # widgets/misc/e-filter-bar.c:169
 # widgets/misc/e-filter-bar.c:169
-#: widgets/misc/e-filter-bar.c:211
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
 msgid "Save Search"
 msgstr "保存搜索"
 
@@ -45275,7 +45693,7 @@ msgstr "高级..."
 # widgets/misc/e-messagebox.c:152
 # widgets/misc/e-messagebox.c:152
 # widgets/misc/e-messagebox.c:152
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
 msgid "Information"
 msgstr "信息"
 
@@ -45285,36 +45703,35 @@ msgstr "信息"
 # executive-summary/test-service/rdf-summary.c:549
 # executive-summary/test-service/rdf-summary.c:594
 # widgets/misc/e-messagebox.c:166
-#: 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:173
 # widgets/misc/e-messagebox.c:173
-#: 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:180
 # widgets/misc/e-messagebox.c:180
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
 msgid "Message"
 msgstr "邮件"
 
-# widgets/misc/e-messagebox.c:224
-# widgets/misc/e-messagebox.c:224
-# widgets/misc/e-messagebox.c:224
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
-msgstr "不再显示该邮件。"
+# mail/mail-search-dialogue.c:113
+# mail/mail-search-dialogue.c:113
+# mail/mail-search-dialogue.c:113
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "搜索(_S)"
 
 # widgets/misc/e-search-bar.c:460
 # widgets/misc/e-search-bar.c:460
 # widgets/misc/e-search-bar.c:460
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:537
 #, fuzzy
 msgid "_Find Now"
 msgstr "立即查找"
@@ -45323,36 +45740,1007 @@ msgstr "立即查找"
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 # widgets/misc/e-filter-bar.h:95
 # widgets/misc/e-filter-bar.h:95
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
 #, fuzzy
 msgid "_Clear"
 msgstr "清除"
 
+#: 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 "测试"
+
 # calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 # widgets/misc/e-filter-bar.h:95
 # widgets/misc/e-filter-bar.h:95
-#: widgets/misc/e-search-bar.c:895
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "清除"
 
 # widgets/misc/e-search-bar.c:460
 # widgets/misc/e-search-bar.c:460
 # widgets/misc/e-search-bar.c:460
-#: widgets/misc/e-search-bar.c:897
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "立即查找"
 
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Evolution 地址簿小卡片显示器"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: 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 日历实施概要组件。"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Evolution 地址簿小卡片显示器"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Evolution 导入 LDIF 文件车间。"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "把 LDIF 文件导入 Evolution。"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Evolution 导入 VCard 车间。"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "将 VCard 文件导入 Evolution"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+# 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
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+# 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
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+# notes/GNOME_Evolution_Notes.oaf.in.h:1
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "显示地址簿的 Bonobo 控制示例。"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "显示 Evolution 地址簿小卡片的控制。"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "处理联系人的 Evolution 成员。"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#~ msgid "Factory for the Addressbook Minicard control"
+#~ msgstr "地址簿小卡片控制车间"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#~ msgid "Factory for the Addressbook's address displayer"
+#~ msgstr "地址簿地址显示器车间"
+
+#~ msgid ""
+#~ "Factory for the configuration controls for the Evolution Addressbook."
+#~ msgstr "关于 Evolution 地址本的配置控制车间"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#~ msgid "Factory for the sample Addressbook control"
+#~ msgstr "示例地址簿控制车间"
+
+#~ msgid "1234"
+#~ msgstr "1234"
+
+# calendar/gui/e-calendar-table.c:435
+# calendar/gui/e-calendar-table.c:435
+# calendar/gui/e-calendar-table.c:436
+#~ msgid "380"
+#~ msgstr "380"
+
+#~ msgid "666"
+#~ msgstr "666"
+
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#~ msgid "<- _Remove"
+#~ msgstr "<- 删除(_R)"
+
+# addressbook/printing/e-contact-print.glade.h:23
+# addressbook/printing/e-contact-print.glade.h:23
+# addressbook/printing/e-contact-print.glade.h:23
+#~ msgid "<< Fewer Options"
+#~ msgstr "<< 简洁选项"
+
+#~ msgid "Add (or Edit) Attribute Mappings"
+#~ msgstr "增加 (或编辑) 属性映射"
+
+#~ msgid "Associated LDAP Attribute"
+#~ msgstr "相关的 LDAP 属性"
+
+#~ msgid "Attribute"
+#~ msgstr "属性"
+
+#~ msgid "Corresponding Evolution Attribute"
+#~ msgstr "对应的 Evolution 属性"
+
+# calendar/gui/e-meeting-time-sel.c:431
+# calendar/gui/e-meeting-time-sel.c:434
+# calendar/gui/e-meeting-time-sel.c:434
+#~ msgid "DN Customization"
+#~ msgstr "定制已识别姓名"
+
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#~ msgid "Evolution Attribute"
+#~ msgstr "Evolution 属性"
+
+#~ msgid "LDAP Attribute"
+#~ msgstr "LDAP 属性"
+
+# addressbook/printing/e-contact-print.glade.h:21
+# addressbook/printing/e-contact-print.glade.h:21
+# addressbook/printing/e-contact-print.glade.h:21
+#~ msgid "Mappings"
+#~ msgstr "正在映射"
+
+#~ msgid "Objectclasses"
+#~ msgstr "对象类"
+
+#~ msgid "Objectclasses Used in Evolution:"
+#~ msgstr "在 Evolution 中使用的对象类："
+
+#~ msgid "Objectclasses Used on Server:"
+#~ msgstr "用在服务器上的对象类："
+
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/mail-config.glade.h:30
+#~ msgid "R_estore Defaults"
+#~ msgstr "恢复默认值(_E)"
+
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/mail-config.glade.h:30
+#~ msgid "Re_store Defaults"
+#~ msgstr "恢复默认值(_S)"
+
+# ui/evolution-addressbook.xml.h:21
+# ui/evolution-addressbook.xml.h:21
+# ui/evolution-addressbook.xml.h:21
+#~ msgid "Select"
+#~ msgstr "选择"
+
+# addressbook/gui/component/addressbook-config.glade.h:24
+# 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:7
+# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:24
+# 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:7
+# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:31
+# 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:7
+# mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
+#~ msgid "_Add ->"
+#~ msgstr "添加(_A) ->"
+
+#~ msgid "_Add Mapping"
+#~ msgstr "添加映射(_A)"
+
+#~ msgid "_Add to DN"
+#~ msgstr "添加到已识别的名字(_A)"
+
+# calendar/gui/e-calendar-table.etspec.h:3
+# calendar/gui/e-calendar-table.etspec.h:3
+# calendar/gui/e-calendar-table.etspec.h:3
+#~ msgid "_Always"
+#~ msgstr "总是(_A)"
+
+# ui/evolution-message-composer.xml.h:46
+# ui/evolution-message-composer.xml.h:46
+# ui/evolution-message-composer.xml.h:46
+#~ msgid "_Delete Mapping"
+#~ msgstr "删除映射(_D)"
+
+# addressbook/gui/component/addressbook-config.glade.h:12
+#~ msgid "_Distinguished Name (DN):"
+#~ msgstr "已识别姓名 (DN)(_D)："
+
+#~ msgid "_Don't use SSL/TLS"
+#~ msgstr "不使用 SSL/TLS(_D)"
+
+# calendar/gui/alarm-notify/alarm-notify.glade.h:4
+# calendar/gui/alarm-notify/alarm-notify.glade.h:4
+# calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#~ msgid "_Edit Mapping"
+#~ msgstr "编辑映射(_E)"
+
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#~ msgid "_Evolution attribute:"
+#~ msgstr "Evolution 属性(_E)："
+
+#~ msgid "_If necessary "
+#~ msgstr "如果必要(_I) "
+
+#~ msgid "_LDAP attribute:"
+#~ msgstr "LDAP 属性(_L)："
+
+#~ msgid "_LDAP attributes:"
+#~ msgstr "LDAP 属性(_L)："
+
+# calendar/gui/e-meeting-time-sel.c:467
+# calendar/gui/e-meeting-time-sel.c:470
+# calendar/gui/e-meeting-time-sel.c:470
+#~ msgid "_More Options >>"
+#~ msgstr "更多选项(_M) >>"
+
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/mail-config.glade.h:30
+#~ msgid "_Restore Defaults"
+#~ msgstr "恢复默认值(_R)"
+
+# mail/mail-config.c:326
+# mail/mail-config.c:329
+# mail/mail-config.c:354
+#, fuzzy
+#~ msgid "account-druid"
+#~ msgstr "帐号 %d"
+
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#~ msgid "account-editor"
+#~ msgstr "账号编辑器"
+
+#~ msgid "dn-customization-tab"
+#~ msgstr "已识别姓名-定制-页"
+
+#~ msgid "mappings-tab"
+#~ msgstr "映射-页"
+
+#~ msgid "objectclasses-tab"
+#~ msgstr "对象类-页"
+
+# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+# 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:405
+# addressbook/gui/component/select-names/e-select-names-popup.c:405
+# 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
+# addressbook/gui/component/select-names/e-select-names-popup.c:423
+# 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
+# addressbook/gui/component/select-names/e-select-names-popup.c:440
+# addressbook/gui/component/select-names/e-select-names-popup.c:440
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d 未显示)"
+
+# addressbook/gui/contact-editor/contact-editor.glade.h:7
+# addressbook/gui/contact-editor/contact-editor.glade.h:7
+# addressbook/gui/contact-editor/contact-editor.glade.h:7
+#~ msgid "C_ontacts..."
+#~ msgstr "联系人(_O)..."
+
+# addressbook/gui/contact-editor/contact-editor.glade.h:25
+# addressbook/gui/contact-editor/contact-editor.glade.h:25
+# addressbook/gui/contact-editor/contact-editor.glade.h:25
+#~ msgid "Phone Types"
+#~ msgstr "电话类型"
+
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+#~ msgid "Delete Contact?"
+#~ msgstr "删除联系人？"
+
+#~ msgid "Confirm Overwrite"
+#~ msgstr "覆盖确认"
+
+# mail/mail-config.glade.h:28
+# mail/mail-config.glade.h:28
+# addressbook/gui/widgets/e-addressbook-util.c:202
+#~ msgid "Display Cards?"
+#~ msgstr "显示卡片？"
+
+# mail/mail-config.glade.h:28
+# mail/mail-config.glade.h:28
+# addressbook/gui/widgets/e-addressbook-util.c:203
+#~ msgid "Display Cards"
+#~ msgstr "显示卡片"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+# 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
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "显示日历的示例 Bonobo 控制。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "关于 Evolution 日历的配置控制。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "处理日历的 Evolution 组件。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#~ msgid "Factory for the Evolution Tasks control"
+#~ msgstr "Evolution 任务控制车间"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#~ msgid "Factory for the calendar iTip view control"
+#~ msgstr "日历 iTip 视图控制车间"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr "日历控制示例车间"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr "日历组件编辑器对话框集中车间"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#~ msgid "Factory to create a component editor factory"
+#~ msgstr "创建组件编辑车间的车间"
+
+# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+#~ msgid "Alarm notification service"
+#~ msgstr "提醒服务"
+
+# calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
+# calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
+# calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "无法初始化 GNOME"
+
+# calendar/gui/dialogs/alarm-options.glade.h:6
+# calendar/gui/dialogs/alarm-options.glade.h:6
+# calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+#~ msgid ""
+#~ "Evolution does not yet support email notification for reminders.  You "
+#~ "will not be able to edit the options for this reminder."
+#~ msgstr ""
+#~ "这是电子邮件提示器，但 Evolution 尚不支持这类提示器。您无法为该提示器编辑"
+#~ "选项。"
+
+# 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:33
+# addressbook/conduit/address-conduit.c:1533
+# addressbook/gui/component/addressbook-factory.c:50
+# calendar/conduits/calendar/calendar-conduit.c:1449
+# calendar/conduits/todo/todo-conduit.c:1130
+# calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+# tools/evolution-addressbook-export.c:60
+# tools/evolution-addressbook-import.c:86
+# 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:33
+# addressbook/conduit/address-conduit.c:1538
+# addressbook/gui/component/addressbook-factory.c:50
+# calendar/conduits/calendar/calendar-conduit.c:1546
+# calendar/conduits/todo/todo-conduit.c:1130
+# calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+# tools/evolution-addressbook-export.c:60
+# tools/evolution-addressbook-import.c:86
+# 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:33
+# addressbook/conduit/address-conduit.c:1721
+# addressbook/gui/component/addressbook-factory.c:50
+# calendar/conduits/calendar/calendar-conduit.c:1727
+# calendar/conduits/todo/todo-conduit.c:1316
+# calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+# tools/evolution-addressbook-abuse.c:132
+# tools/evolution-addressbook-export.c:60
+# tools/evolution-addressbook-import.c:86
+#~ msgid "Could not activate Bonobo"
+#~ msgstr "无法激活 Bonobo"
+
+# calendar/gui/main.c:91
+# calendar/gui/main.c:91
+# calendar/gui/main.c:91
+#~ msgid "Could not create the component editor factory"
+#~ msgstr "无法创建组件编辑器车间"
+
+# calendar/gui/print.c:2386
+# calendar/gui/print.c:2386
+# calendar/gui/print.c:2386
+#~ msgid "Print Calendar"
+#~ msgstr "打印日历"
+
+# calendar/gui/tasks-control-factory.c:75
+# calendar/gui/tasks-control-factory.c:75
+# 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-migrate.c:105
+# calendar/gui/tasks-migrate.c:105
+# 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
+# calendar/gui/tasks-migrate.c:108
+# 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
+# calendar/gui/tasks-migrate.c:120
+# calendar/gui/tasks-migrate.c:120
+#~ 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
+# calendar/gui/tasks-migrate.c:133
+# calendar/gui/tasks-migrate.c:133
+#~ 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”的方法；不会从日志文件夹迁移项目到任务文件夹。"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+# calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "将 iCalendar 文件导入 Evolution 的车间"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+# calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "将 iCalendar 文件导入 Evolution"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+# calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "将 vCalendar 文件导入 Evolution"
+
+# camel/providers/local/camel-mbox-folder.c:347
+# camel/providers/local/camel-mbox-folder.c:379
+# camel/providers/local/camel-mbox-folder.c:391
+# camel/providers/local/camel-spool-folder.c:595
+# camel/providers/local/camel-spool-folder.c:627
+# camel/providers/local/camel-spool-folder.c:639
+# camel/providers/local/camel-mbox-folder.c:347
+# camel/providers/local/camel-mbox-folder.c:379
+# camel/providers/local/camel-mbox-folder.c:391
+# camel/providers/local/camel-spool-folder.c:595
+# camel/providers/local/camel-spool-folder.c:627
+# camel/providers/local/camel-spool-folder.c:639
+# camel/providers/local/camel-mbox-folder.c:347
+# camel/providers/local/camel-mbox-folder.c:379
+# camel/providers/local/camel-mbox-folder.c:391
+# camel/providers/local/camel-spool-folder.c:595
+# camel/providers/local/camel-spool-folder.c:627
+# camel/providers/local/camel-spool-folder.c:639
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr "无法从注册表获取存储列表：%s"
+
+# mail/component-factory.c:129
+# mail/component-factory.c:129
+# mail/component-factory.c:129
+#~ msgid "Can't call getFolderAtPath on storage: %s"
+#~ msgstr "无法对存储调用 getFolderAtPath：%s"
+
+# composer/e-msg-composer.c:952
+# composer/e-msg-composer.c:956
+# composer/e-msg-composer.c:921
+#~ msgid "Warning!"
+#~ msgstr "警告！"
+
+# composer/evolution-composer.c:367
+# composer/evolution-composer.c:367
+# composer/evolution-composer.c:367
+#~ 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:382
+# composer/evolution-composer.c:382
+# composer/evolution-composer.c:382
+#, 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 "添加条件"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Evolution 撰写器车间。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Evolution 任务控制车间"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Evolution 撰写器车间。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Evolution 撰写器车间。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:1
+# mail/GNOME_Evolution_Mail.oaf.in.h:1
+# mail/GNOME_Evolution_Mail.oaf.in.h:1 notes/GNOME_Evolution_Notes.oaf.in.h:2
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Evolution 处理邮件组件。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:5
+# mail/GNOME_Evolution_Mail.oaf.in.h:5
+# mail/GNOME_Evolution_Mail.oaf.in.h:5
+#~ msgid "Evolution mail folder factory component."
+#~ msgstr "Evolution 邮件文件夹车间组件。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr "Evolution 撰写器车间。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:7
+# mail/GNOME_Evolution_Mail.oaf.in.h:7
+# mail/GNOME_Evolution_Mail.oaf.in.h:7
+#~ msgid "Factory for the Mail Summary component."
+#~ msgstr "邮件概要组件车间。"
+
+# composer/e-msg-composer.c:1412
+# composer/e-msg-composer.c:1329
+# composer/e-msg-composer.c:1295
+#~ msgid "Warning: Unsent Messages"
+#~ msgstr "警告： 未发送的邮件"
+
+# mail/component-factory.c:975
+# mail/component-factory.c:975
+# mail/component-factory.c:980
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "无法初始化 Evolution 的邮件组件。"
+
+# mail/component-factory.c:984
+# mail/component-factory.c:984
+# mail/component-factory.c:989
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "无法初始化 Evolution 的邮件配置组件。"
+
+# mail/component-factory.c:990
+# mail/component-factory.c:990
+# mail/component-factory.c:995
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "无法初始化 Evolution 的文件夹信息组件。"
+
+# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "将邮件箱导入 Evolution 的车间"
+
+# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "将邮件箱文件导入到 Evolution"
+
+# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+# 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.oaf.in.h:2
+# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+# 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/mail-accounts.c:300
+# mail/mail-accounts.c:300
+# mail/mail-accounts.c:300
+#~ msgid "Really delete account?"
+#~ msgstr "确实删除帐号？"
+
+# ui/evolution-mail-message.xml.h:21
+# ui/evolution-mail-message.xml.h:21
+# ui/evolution-mail-message.xml.h:21
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "转入下一个含有未读消息的文件夹？"
+
+#~ msgid ""
+#~ "There are no more new messages in this folder.\n"
+#~ "Would you like to go to the next folder?"
+#~ msgstr ""
+#~ "本文件夹里没有更多新消息了。\n"
+#~ "您愿意转入下一个文件夹？"
+
+# mail/mail-callbacks.c:2492
+# mail/mail-callbacks.c:2569
+#~ msgid "US-Letter"
+#~ msgstr "美国信纸"
+
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1036
+#~ msgid "Add Signature"
+#~ msgstr "添加签名"
+
+# mail/mail-config.c:326
+# mail/mail-config.c:329
+# mail/mail-config.c:354
+#~ msgid "Account %d"
+#~ msgstr "帐号 %d"
+
+#~ msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+#~ msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+
+#~ msgid "Spell Checking Language"
+#~ msgstr "拼写检查语言"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "固定宽度(_F)："
+
+# my-evolution/metar.c:63
+# my-evolution/metar.c:63
+# my-evolution/metar.c:63
+#~ msgid "_Variable-width:"
+#~ msgstr "可变宽度(_V)："
+
+# mail/subscribe-dialog.glade.h:2
+# mail/subscribe-dialog.glade.h:2
+# mail/subscribe-dialog.glade.h:2
+#~ msgid "All folders"
+#~ msgstr "所有文件夹"
+
+# calendar/gui/goto-dialog.glade.h:1
+# calendar/gui/goto-dialog.glade.h:1
+# calendar/gui/goto-dialog.glade.h:1
+#, fuzzy
+#~ msgid "Apri file"
+#~ msgstr "四月"
+
+# mail/subscribe-dialog.glade.h:3
+# mail/subscribe-dialog.glade.h:3
+# mail/subscribe-dialog.glade.h:3
+#~ msgid "Display Options"
+#~ msgstr "显示选项"
+
+# mail/subscribe-dialog.glade.h:4
+# mail/subscribe-dialog.glade.h:4
+# mail/subscribe-dialog.glade.h:4
+#~ msgid "Folders whose names begin with:"
+#~ msgstr "名称以之开头的文件夹："
+
+# shell/e-shell-importer.c:617
+# shell/e-shell-importer.c:617
+# shell/e-shell-importer.c:628
+#, fuzzy
+#~ msgid "Salve file"
+#~ msgstr "选择一个文件"
+
+# my-evolution/component-factory.c:44
+# my-evolution/component-factory.c:44
+# my-evolution/component-factory.c:44
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "含有 Evolution 概要的文件夹"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+# executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+#~ msgid "Factory for the Evolution Summary component."
+#~ msgstr "Evolution 实施概要组件车间。"
+
+# addressbook/gui/contact-editor/fulladdr.glade.h:133
+# addressbook/gui/contact-editor/fulladdr.glade.h:133
+# my-evolution/Locations.h:1326
+#, fuzzy
+#~ msgid "Marquette"
+#~ msgstr "马提尼可岛"
+
+# my-evolution/main.c:66
+# my-evolution/main.c:66
+# my-evolution/main.c:65
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "实施概要组件无法初始化 Bonobo。\n"
+
+# shell/e-setup.c:124
+# shell/e-setup.c:124
+# shell/e-setup.c:124
+#~ msgid "Evolution installation"
+#~ msgstr "安装 Evolution"
+
+# shell/e-setup.c:128
+# shell/e-setup.c:128
+# shell/e-setup.c:128
+#~ 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:129
+# shell/e-setup.c:129
+# shell/e-setup.c:129
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr "请点击“确认”以安装文件，或者点击“取消”以便退出。"
+
+# camel/camel-session.c:532
+# shell/e-setup.c:280
+# shell/e-setup.c:280
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Evolution 无法创建目录\n"
+#~ "%s：\n"
+#~ "%s"
+
+# shell/e-setup.c:298
+# shell/e-setup.c:298
+#~ 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:304
+# shell/e-setup.c:304
+#~ 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:295
+# shell/e-setup.c:341
+# shell/e-setup.c:341
+#~ 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"
+#~ "在运行 Evolution \n"
+#~ "之前，要删掉它。\n"
+#~ "您希望我删掉该目录吗？"
+
+# shell/e-shell-folder-selection-dialog.c:376
+# shell/e-shell-folder-selection-dialog.c:376
+# shell/e-shell-folder-selection-dialog.c:376
+#~ msgid "New..."
+#~ msgstr "正在新建..."
+
+# shell/e-shell-startup-wizard.c:159
+# shell/e-shell-startup-wizard.c:159
+# shell/e-shell-startup-wizard.c:159
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "无法启动 Evolution 邮件助手界面\n"
+#~ "(%s)"
+
+# shell/e-shell-startup-wizard.c:169
+# shell/e-shell-startup-wizard.c:169
+# shell/e-shell-startup-wizard.c:169
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr "无法启动 Evolution 邮件助手界面\n"
+
+# shell/e-shell-utils.c:127
+# shell/e-shell-utils.c:127
+# shell/e-shell-utils.c:127
+#~ msgid "Folder name cannot contain slashes."
+#~ msgstr "文件夹名不能含有斜线。"
+
+# shell/e-shell-view-menu.c:165
+# shell/e-shell-view-menu.c:165
+# shell/e-shell-view-menu.c:165
+#~ msgid "Bug buddy was not found in your $PATH."
+#~ msgstr "在您的 $PATH 中找不到 Bug buddy。"
+
+# shell/e-shortcuts-view.c:180
+# shell/e-shortcuts-view.c:180
+# shell/e-shortcuts-view.c:180
+#~ msgid "Don't remove"
+#~ msgstr "不删除"
+
+# shell/glade/e-active-connection-dialog.glade.h:1
+# shell/glade/e-active-connection-dialog.glade.h:1
+# shell/glade/e-active-connection-dialog.glade.h:1
+#~ msgid "Active connections"
+#~ msgstr "活跃连接"
+
+# shell/glade/e-active-connection-dialog.glade.h:3
+# shell/glade/e-active-connection-dialog.glade.h:3
+# shell/glade/e-active-connection-dialog.glade.h:3
+#~ msgid "Host"
+#~ msgstr "主机"
+
+# shell/main.c:332
+# shell/main.c:332
+# shell/main.c:332
+#~ msgid "Cannot initialize the Bonobo component system."
+#~ msgstr "无法初始化 Bonobo 成员系统。"
+
+# tools/evolution-addressbook-export.c:46
+# tools/evolution-addressbook-export.c:46
+# tools/evolution-addressbook-export.c:46
+#~ msgid "Output File"
+#~ msgstr "输出文件"
+
+# ui/evolution.xml.h:45
+# ui/evolution.xml.h:45
+# ui/evolution.xml.h:45
+#, fuzzy
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "Pilot 设置(_P)..."
+
+# mail/mail-config.glade.h:41
+# mail/mail-config.glade.h:41
+# mail/mail-config.glade.h:48
+#, fuzzy
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "邮件配置"
+
 # wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
 # wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
 # wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
 # wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
 # wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
 # wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "个人地址簿服务器"
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "个人地址簿服务器"
 
 # wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
 # wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
@@ -45360,31 +46748,26 @@ msgstr "个人地址簿服务器"
 # wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
 # wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
 # wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "个人日历服务器；日历工厂"
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "个人日历服务器；日历工厂"
 
 # wombat/wombat.c:200
 # wombat/wombat.c:200
 # wombat/wombat.c:200
-#: wombat/wombat.c:199
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs()： 无法初始化 GNOME-VFS"
+#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
+#~ msgstr "setup_vfs()： 无法初始化 GNOME-VFS"
 
 # wombat/wombat.c:212
 # wombat/wombat.c:212
 # wombat/wombat.c:212
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba()： 无法初始化 GNOME"
+#~ msgid "init_corba(): could not initialize GNOME"
+#~ msgstr "init_corba()： 无法初始化 GNOME"
 
 # wombat/wombat.c:225
 # wombat/wombat.c:225
 # wombat/wombat.c:225
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo()： 无法初始化 Bonobo"
+#~ msgid "init_bonobo(): could not initialize Bonobo"
+#~ msgstr "init_bonobo()： 无法初始化 Bonobo"
 
 # mail/mail-local.c:1416
 # mail/mail-local.c:1416
@@ -45446,12 +46829,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "Copy selected messages"
 #~ msgstr "复制选中的邮件"
 
-# ui/evolution-mail-list.xml.h:4
-# ui/evolution-mail-list.xml.h:4
-# ui/evolution-mail-list.xml.h:4
-#~ msgid "Cut selected messages"
-#~ msgstr "剪切选中的邮件"
-
 # my-evolution/my-evolution.glade.h:1
 # my-evolution/my-evolution.glade.h:1
 # my-evolution/my-evolution.glade.h:1
@@ -45528,12 +46905,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ "导入没有就绪。\n"
 #~ "请 5 秒中以后再试。"
 
-# shell/importer/import.glade.h:3
-# shell/importer/import.glade.h:3
-# shell/importer/import.glade.h:3
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Evolution 导入器助手"
-
 # calendar/gui/dialogs/recurrence-page.glade.h:11
 # calendar/gui/dialogs/recurrence-page.glade.h:11
 # calendar/gui/dialogs/recurrence-page.glade.h:11
@@ -45797,12 +47168,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "Command"
 #~ msgstr "公司"
 
-# mail/mail-account-editor-news.c:160
-# mail/mail-account-editor-news.c:160
-# mail/mail-account-editor-news.c:160
-#~ msgid "Evolution News Editor"
-#~ msgstr "Evolution 新闻编辑器"
-
 # mail/mail-accounts.c:532 mail/mail-accounts.c:536
 # mail/mail-accounts.c:532 mail/mail-accounts.c:536
 # mail/mail-accounts.c:532 mail/mail-accounts.c:536
@@ -45828,12 +47193,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "News Servers"
 #~ msgstr "新闻来源(_N)"
 
-# mail/mail-config.glade.h:80
-# mail/mail-config.glade.h:80
-# mail/mail-config.glade.h:89
-#~ msgid "Source"
-#~ msgstr "来源"
-
 # mail/mail-config.glade.h:81
 # mail/mail-config.glade.h:81
 # mail/mail-config.glade.h:90
@@ -45951,12 +47310,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "New Contact _List"
 #~ msgstr "新建联系人列表(_L)"
 
-# addressbook/gui/component/addressbook-config.c:186
-# addressbook/gui/component/addressbook-config.c:186
-# addressbook/gui/component/addressbook-config.c:223
-#~ msgid "Edit Addressbook"
-#~ msgstr "编辑地址簿"
-
 # camel/providers/smtp/camel-smtp-transport.c:222
 # camel/providers/smtp/camel-smtp-transport.c:222
 # addressbook/gui/component/addressbook-config.glade.h:3
@@ -46057,12 +47410,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "Show contacts matching the following criteria:"
 #~ msgstr "显示符合以下条件的联系人："
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr "Evolution 日历实施概要组件。"
-
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
@@ -46769,12 +48116,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "Regions"
 #~ msgstr "区域"
 
-# my-evolution/my-evolution.glade.h:3
-# my-evolution/my-evolution.glade.h:3
-# my-evolution/my-evolution.glade.h:3
-#~ msgid "Al_l stations:"
-#~ msgstr "所有站点(_L)："
-
 # my-evolution/my-evolution.glade.h:4
 # my-evolution/my-evolution.glade.h:4
 # my-evolution/my-evolution.glade.h:4
@@ -46799,12 +48140,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "_Displayed feeds:"
 #~ msgstr "已显示的来源："
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# notes/GNOME_Evolution_Notes.oaf.in.h:3
-#~ msgid "Factory for the Evolution notes component."
-#~ msgstr "Evolution 便签组件车间。"
-
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 # notes/GNOME_Evolution_Notes.oaf.in.h:4
@@ -46829,12 +48164,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "(No name)"
 #~ msgstr "(未命名)"
 
-# ui/evolution-addressbook.xml.h:12
-# ui/evolution-addressbook.xml.h:12
-# ui/evolution-addressbook.xml.h:12
-#~ msgid "New List"
-#~ msgstr "新列表"
-
 # ui/evolution-calendar.xml.h:2
 # ui/evolution-calendar.xml.h:2
 # ui/evolution-calendar.xml.h:2
@@ -47443,4 +48772,3 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 # my-evolution/e-summary-weather.c:348
 #~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
 #~ msgstr "<dd><b>无法联络的天气服务器</b></dd>"
-

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 627dca6150..3500119d63 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.3.1.99\n"
-"POT-Creation-Date: 2003-03-23 11:21+0800\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
 "PO-Revision-Date: 2003-03-23 11:33+0800\n"
 "Last-Translator: Chao-Hsiung Liao <pesder.liao@msa.hinet.net>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -15,36 +15,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr "匯入 LDIF 檔案到 Evolution 的元件工廠。"
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution 郵件編輯器。"
 
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "匯入 LDIF 檔案到 Evolution。"
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
 
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "匯入 VCard 檔案到 Evolution 的元件工廠。"
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution 郵件編輯器。"
 
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "匯入 VCard 檔案到 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/gui/widgets/e-addressbook-view.c:699
 #: 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 "歸檔為"
 
 # addressbook/gui/component/addressbook-config.glade.h:5
 #: 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,14 +60,14 @@ msgstr "名稱"
 
 # addressbook/gui/widgets/e-addressbook-view.c:701
 #: 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 "電子郵件"
 
 # addressbook/contact-editor/e-contact-editor.c:1257
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1773
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
 msgid "Primary"
 msgstr "首要的"
 
@@ -74,8 +80,8 @@ msgstr "首要的"
 # addressbook/gui/widgets/e-addressbook-view.c:733
 #: 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:1758
+#: 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 "助理"
@@ -85,8 +91,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:1759
-#: addressbook/gui/contact-editor/e-contact-editor.c:1830
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Business"
 msgstr "商務電話"
 
@@ -98,13 +104,13 @@ msgstr "商務電話"
 
 # addressbook/contact-editor/e-contact-editor.c:1246
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1762
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Callback"
 msgstr "回撥電話"
 
 # addressbook/contact-editor/e-contact-editor.c:1248
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1764
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 msgid "Company"
 msgstr "公司電話"
 
@@ -120,14 +126,14 @@ 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:1765
-#: addressbook/gui/contact-editor/e-contact-editor.c:1831
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Home"
 msgstr "住家電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
 #: 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 "團體"
@@ -140,13 +146,13 @@ msgstr "團體"
 # addressbook/contact-editor/e-contact-editor.c:1253
 #: 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:1769
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Mobile"
 msgstr "行動電話"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1763
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Car"
 msgstr "汽車電話"
 
@@ -154,7 +160,7 @@ msgstr "汽車電話"
 # addressbook/gui/widgets/e-addressbook-view.c:713
 #: 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:1761
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "商務傅真"
@@ -168,14 +174,14 @@ msgstr "商務傅真"
 # addressbook/contact-editor/e-contact-editor.c:1251
 # addressbook/gui/widgets/e-addressbook-view.c:714
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1767
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "住家傳真"
 
 # addressbook/contact-editor/e-contact-editor.c:1244
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Business 2"
 msgstr "商務電話 2"
 
@@ -186,14 +192,14 @@ msgstr "商務電話 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1250
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1766
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Home 2"
 msgstr "住家電話 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1252
 # addressbook/gui/widgets/e-addressbook-view.c:717
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
@@ -202,15 +208,15 @@ msgstr "ISDN"
 # addressbook/contact-editor/e-contact-editor.c:1312
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1770
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
 msgid "Other"
 msgstr "其它"
 
 # addressbook/contact-editor/e-contact-editor.c:1255
 # addressbook/gui/widgets/e-addressbook-view.c:719
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1771
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "其它傳真"
@@ -218,7 +224,7 @@ msgstr "其它傳真"
 # addressbook/contact-editor/e-contact-editor.c:1256
 # addressbook/gui/widgets/e-addressbook-view.c:720
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1772
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "呼叫器"
@@ -226,7 +232,7 @@ msgstr "呼叫器"
 # addressbook/contact-editor/e-contact-editor.c:1258
 # addressbook/gui/widgets/e-addressbook-view.c:721
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1774
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "無線電電話"
@@ -234,7 +240,7 @@ msgstr "無線電電話"
 # addressbook/contact-editor/e-contact-editor.c:1259
 # addressbook/gui/widgets/e-addressbook-view.c:722
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1775
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "電報"
@@ -248,8 +254,8 @@ msgstr "TTY"
 # addressbook/contact-editor/e-contact-editor.c:1285
 # addressbook/gui/widgets/e-addressbook-view.c:725
 #: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:482
-#: addressbook/gui/contact-editor/e-contact-editor.c:1803
+#: 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"
@@ -257,8 +263,8 @@ msgstr "電子郵件 2"
 # addressbook/contact-editor/e-contact-editor.c:1286
 # addressbook/gui/widgets/e-addressbook-view.c:726
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:492
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: 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"
@@ -285,7 +291,7 @@ msgstr "部門"
 
 # addressbook/gui/widgets/e-addressbook-view.c:729
 #: 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 "辦公室"
@@ -297,7 +303,7 @@ msgstr "辦公室"
 
 # addressbook/gui/widgets/e-addressbook-view.c:730
 #: 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 "頭銜"
@@ -314,7 +320,7 @@ msgstr "專業"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
 #: 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 "主管"
@@ -330,7 +336,7 @@ msgstr "助理"
 
 # addressbook/gui/widgets/e-addressbook-view.c:734
 #: 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 "暱稱"
@@ -342,14 +348,14 @@ msgstr "暱稱"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
 #: 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 "配偶"
 
 # addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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 "備註"
@@ -357,7 +363,7 @@ msgstr "備註"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
 #: 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 "行事曆 URI"
 
@@ -388,7 +394,7 @@ msgstr "行事曆"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
 #: 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 "紀念日"
 
@@ -403,7 +409,7 @@ msgstr "出生日期"
 
 # calendar/gui/e-calendar-table.c:150
 #: 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 "類別"
@@ -420,125 +426,125 @@ msgid "ECard"
 msgstr "ECard"
 
 # addressbook/gui/widgets/alphabet.glade.h:25
-#: addressbook/backend/ebook/e-card-simple.c:830
+#: addressbook/backend/ebook/e-card-simple.c:832
 #, c-format
 msgid "%x"
 msgstr "%x"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: 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 "未命名的清單"
 
 # addressbook/contact-editor/e-contact-quick-add.c:276
 # addressbook/gui/widgets/e-addressbook-view.c:700
-#: 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 "全名"
 
 # addressbook/backend/ebook/e-card.c:3346
-#: 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 "地址"
 
 # data/evolution.keys.in.h:1
-#: addressbook/backend/ebook/e-card.c:1337
+#: addressbook/backend/ebook/e-card.c:1328
 msgid "Address Label"
 msgstr "地址標籤"
 
 # mail/mail-config.glade.h:25
-#: addressbook/backend/ebook/e-card.c:1344
+#: addressbook/backend/ebook/e-card.c:1335
 msgid "Phone"
 msgstr "電話"
 
 # addressbook/backend/ebook/e-card.c:3335
-#: addressbook/backend/ebook/e-card.c:1358
+#: addressbook/backend/ebook/e-card.c:1349
 msgid "Birth date"
 msgstr "出生日期"
 
 # calendar/gui/e-calendar-table.c:161
-#: 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/gui/widgets/e-addressbook-view.c:708
-#: addressbook/backend/ebook/e-card.c:1378
+#: addressbook/backend/ebook/e-card.c:1369
 msgid "Organizational Unit"
 msgstr "團體單位"
 
-#: 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 "角色"
 
 # addressbook/backend/ebook/e-card.c:3428
-#: 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 "寄件者"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: addressbook/backend/ebook/e-card.c:1454
+#: addressbook/backend/ebook/e-card.c:1445
 msgid "Free/Busy URL"
 msgstr "空閒/忙碌 URL"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: addressbook/backend/ebook/e-card.c:1461
+#: addressbook/backend/ebook/e-card.c:1452
 #, fuzzy
 msgid "ICS Calendar"
 msgstr "行事曆"
 
 # addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-#: addressbook/backend/ebook/e-card.c:1475
+#: addressbook/backend/ebook/e-card.c:1466
 msgid "Related Contacts"
 msgstr "相關的連絡人"
 
 # calendar/gui/e-calendar-table.c:150
-#: addressbook/backend/ebook/e-card.c:1489
+#: addressbook/backend/ebook/e-card.c:1480
 msgid "Category List"
 msgstr "類別清單"
 
-#: addressbook/backend/ebook/e-card.c:1496
+#: addressbook/backend/ebook/e-card.c:1487
 msgid "Wants HTML"
 msgstr "需要 HTML"
 
-#: addressbook/backend/ebook/e-card.c:1503
+#: addressbook/backend/ebook/e-card.c:1494
 msgid "Wants HTML set"
 msgstr "需要 HTML 設定"
 
 # addressbook/contact-editor/fullname.glade.h:8
-#: addressbook/backend/ebook/e-card.c:1510
+#: addressbook/backend/ebook/e-card.c:1501
 msgid "List"
 msgstr "清單"
 
 # addressbook/gui/widgets/e-addressbook-view.c:724
-#: addressbook/backend/ebook/e-card.c:1517
+#: addressbook/backend/ebook/e-card.c:1508
 msgid "List Show Addresses"
 msgstr "清單顯示地址"
 
-#: addressbook/backend/ebook/e-card.c:1524
+#: addressbook/backend/ebook/e-card.c:1515
 msgid "Arbitrary"
 msgstr "任意"
 
 # addressbook/contact-editor/fullname.glade.h:4
-#: addressbook/backend/ebook/e-card.c:1531
+#: addressbook/backend/ebook/e-card.c:1522
 msgid "ID"
 msgstr "ID"
 
 # ui/evolution-event-editor.xml.h:30
 # ui/evolution-task-editor-dialog.xml.h:33
-#: addressbook/backend/ebook/e-card.c:1538
+#: addressbook/backend/ebook/e-card.c:1529
 msgid "Last Use"
 msgstr "上次使用的"
 
 # mail/message-list.c:1081
-#: addressbook/backend/ebook/e-card.c:1549
+#: addressbook/backend/ebook/e-card.c:1540
 msgid "Use Score"
 msgstr "使用累計"
 
@@ -613,90 +619,94 @@ msgid "Error performing search"
 msgstr "進行搜尋時發生錯誤"
 
 # mail/mail-config.glade.h:29
-#: addressbook/conduit/address-conduit.c:296
+#: addressbook/conduit/address-conduit.c:294
 msgid "Default Sync Address:"
 msgstr "預設的同步地址:"
 
 # addressbook/conduit/address-conduit.c:201
-#: addressbook/conduit/address-conduit.c:539
+#: addressbook/conduit/address-conduit.c:537
 msgid "Cursor could not be loaded\n"
 msgstr "無法載入滑鼠游標\n"
 
 # addressbook/conduit/address-conduit.c:214
-#: addressbook/conduit/address-conduit.c:552
+#: addressbook/conduit/address-conduit.c:550
 msgid "EBook not loaded\n"
 msgstr "尚未載入 EBook\n"
 
 # addressbook/conduit/address-conduit.c:654
 # calendar/conduits/calendar/calendar-conduit.c:731
 # calendar/conduits/todo/todo-conduit.c:545
-#: addressbook/conduit/address-conduit.c:1358
-#: 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 "無法啟動 wombat 服務"
 
 # addressbook/conduit/address-conduit.c:655
 # calendar/conduits/calendar/calendar-conduit.c:732
 # calendar/conduits/todo/todo-conduit.c:546
-#: addressbook/conduit/address-conduit.c:1359
-#: 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"
 
 # addressbook/conduit/address-conduit.c:687
 # addressbook/conduit/address-conduit.c:690
-#: addressbook/conduit/address-conduit.c:1389
-#: addressbook/conduit/address-conduit.c:1392
+#: addressbook/conduit/address-conduit.c:1407
+#: addressbook/conduit/address-conduit.c:1410
 msgid "Could not read pilot's Address application block"
 msgstr "無法讀取 pilot 通訊錄程式區塊"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "用於地址彈出選單的 Bonobo 控制。"
+msgid "Configure access to LDAP directory servers here"
+msgstr "在這裡設定對 LDAP 目錄的存取"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "用於顯示地址的 Bonobo 控制。"
+msgid "Directory Servers"
+msgstr "目錄伺服器"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "顯示目錄服務的 Bonobo 控制例子。"
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Evolution 目錄服務迷你名片檢視"
 
+# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr "Evolution 目錄服務儲存區的組態控制。"
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Evolution 目錄服務名稱選擇界面。"
 
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure access to LDAP directory servers here"
-msgstr "在這裡設定對 LDAP 目錄的存取"
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution 目錄服務迷你名片檢視"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "顯示 Evolution 目錄服務迷你名片之控制項。"
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution 目錄服務迷你名片檢視"
 
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Directory Servers"
-msgstr "目錄伺服器"
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution 目錄服務迷你名片檢視"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution 目錄服務迷你名片檢視"
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution 測試元件。"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #: 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 目錄服務所匯出的控制的工廠"
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution 目錄服務迷你名片檢視"
 
 # ui/evolution-addressbook.xml.h:17
 #: addressbook/gui/component/addressbook-component.c:76
@@ -781,31 +791,31 @@ msgstr "無法在 Root DSE 上執行查詢"
 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 "這個伺服器不支援 LDAPv3 模式的資訊"
 
 # mail/mail-callbacks.c:1349
-#: addressbook/gui/component/addressbook-config.c:1213
+#: addressbook/gui/component/addressbook-config.c:1215
 msgid "Error retrieving schema information"
 msgstr "接收模式資訊時發生錯誤"
 
 # camel/providers/imap/camel-imap-command.c:487
-#: addressbook/gui/component/addressbook-config.c:1221
+#: addressbook/gui/component/addressbook-config.c:1223
 msgid "Server did not respond with valid schema information"
 msgstr "伺服器沒有回應有效的模式資訊"
 
 # mail/mail-config.glade.h:3
-#: addressbook/gui/component/addressbook-config.c:1632
+#: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
 msgstr "帳號名稱"
 
 # addressbook/gui/component/select-names/select-names.glade.h:3
-#: addressbook/gui/component/addressbook-config.c:1634
+#: addressbook/gui/component/addressbook-config.c:1639
 msgid "Server Name"
 msgstr "伺服器名稱"
 
-#: addressbook/gui/component/addressbook-config.c:1671
+#: addressbook/gui/component/addressbook-config.c:1676
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "此一版本的 Evolution 並未啟用 LDAP"
 
@@ -944,7 +954,7 @@ msgstr "這次的查詢並未完全成功。"
 # calendar/gui/e-tasks.c:155
 #. 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 "任何類別"
 
@@ -959,57 +969,57 @@ msgstr "資料夾瀏覽器顯示之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 "(沒有)"
 
 # addressbook/contact-editor/contact-editor.glade.h:14
 # addressbook/contact-editor/e-contact-editor.c:1284
-#: 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:1802
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
 msgid "Primary Email"
 msgstr "主要電子郵件"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: addressbook/gui/component/e-address-popup.c:608
+#: addressbook/gui/component/e-address-popup.c:614
 msgid "Select an Action"
 msgstr "選擇一個動作"
 
 # ui/evolution-addressbook.xml.h:2
-#: 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 "建立新的連絡人 “%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 "新增住址到既存之連絡人 “%s”"
 
 # addressbook/gui/widgets/e-minicard-control.c:282
-#: 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-widget.c:388
 # addressbook/gui/component/select-names/e-select-names-popup.c:281
-#: 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 "編輯連絡人資訊"
 
 # addressbook/gui/component/e-address-widget.c:424
 # addressbook/gui/component/select-names/e-select-names-popup.c:347
-#: 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 "新增到連絡人"
 
 # mail/mail-config.glade.h:29
-#: addressbook/gui/component/e-address-popup.c:1051
+#: addressbook/gui/component/e-address-popup.c:1052
 msgid "Merge E-Mail Address"
 msgstr "合併電子郵件地址"
 
@@ -1039,84 +1049,60 @@ msgstr " 顯示支援的起點(_S) "
 #: 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
-#: mail/subscribe-dialog.glade.h:3
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
-msgid "1234"
-msgstr "1234"
-
 # calendar/gui/e-calendar-table.c:377
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:5
 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"
 
-# calendar/gui/e-calendar-table.c:375
-#: 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/select-names/e-select-names-popup.c:161
-# composer/e-msg-composer-attachment-bar.c:468
-# shell/e-shortcuts-view.c:265
-# shell/e-shortcuts-view.c:388
-#: addressbook/gui/component/ldap-config.glade.h:14
-msgid "<- _Remove"
-msgstr "<- 移除(_R)"
-
-# addressbook/printing/e-contact-print.glade.h:23
-#: 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/addressbook-config.c:148
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "Add LDAP Server"
+msgstr "LDAP 伺服器"
 
 # addressbook/gui/component/addressbook-config.glade.h:2
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
 msgstr "目錄服務來源"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:62
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
 #: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "永遠"
 
 # camel/camel-sasl-anonymous.c:33
-#: 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"
@@ -1130,15 +1116,10 @@ msgstr ""
 "請按“完成”按鈕以儲存您在這裡輸入的設定值。"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
 msgstr "連線中"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: addressbook/gui/component/ldap-config.glade.h:25
-msgid "DN Customization"
-msgstr "DN 自訂化"
-
 # addressbook/gui/component/addressbook-config.glade.h:3
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
 # addressbook/gui/widgets/e-addressbook-view.c:616
@@ -1150,57 +1131,58 @@ msgstr "DN 自訂化"
 # ui/evolution-event-editor.xml.h:17
 # ui/evolution-mail.xml.h:22
 # ui/evolution-task-editor-dialog.xml.h:18
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "De_lete"
 msgstr "刪除(_L)"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "'辨別的名稱(_N):"
 
+# addressbook/gui/component/addressbook-config.c:148
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid "Edit LDAP Server"
+msgstr "LDAP 伺服器"
+
 # mail/mail-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: 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 "Evolution 會使用這個 DN 透過伺服器來驗證您"
 
-#: 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 會使用電子郵件位址透過伺服器來驗證您"
 
 # mail/mail-search.c:316
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Finished"
 msgstr "已完成"
 
 # addressbook/contact-editor/contact-editor.glade.h:10
 # executive-summary/component/executive-summary-config.glade.h:3
-#: 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 "一般"
 
 # mail/mail-config.glade.h:40
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "LDAP Configuration Assistant"
 msgstr "LDAP 組態助理"
 
-# addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "Mappings"
-msgstr "對應"
-
 # calendar/gui/event-editor-dialog.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:35 mail/mail-account-gui.c:64
-#: mail/mail-config.glade.h:76
+#: 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"
@@ -1213,58 +1195,30 @@ msgstr ""
 "與 TLS (Transport Layer Security) 通訊協定被某些伺服器用來加密以保護\n"
 "您的連線。請向您的系統管理者詢問您的 LDAP 伺服器是否使用這些通訊協定。"
 
-#: 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 "Evolution 中使用的物件類別:"
-
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid "Objectclasses Used on Server:"
-msgstr "伺服器上使用的物件類別:"
-
 # addressbook/gui/component/addressbook-config.c:179
-#: 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 ""
-"請選擇一個 Evolution 屬性和\n"
-"要跟它關連的 LDAP 屬性。"
-
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid "R_estore Defaults"
-msgstr "還原預設值(_E)"
-
-#: addressbook/gui/component/ldap-config.glade.h:46
-msgid "Re_store Defaults"
-msgstr "還原預設值(_S)"
-
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "搜尋範圍(_E):"
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:48
-#: calendar/gui/calendar-model.c:1975 calendar/gui/e-day-view.c:1670
-#: calendar/gui/e-week-view.c:1223
+#: 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"
@@ -1273,7 +1227,7 @@ msgstr ""
 "選擇這個選項代表 Evolution 只有在您的 LDAP 伺服器支援 SSL 或 TLS 時\n"
 "才會連線到您的 LDAP 伺服器。"
 
-#: 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"
@@ -1289,7 +1243,7 @@ msgstr ""
 "那麼 Evolution 就不需要使用 SSL/TLS，因為您的連線已經\n"
 "很安全了。"
 
-#: 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"
@@ -1301,7 +1255,7 @@ msgstr ""
 "表示您的連線將是不安全的，同時您在安全性上是有\n"
 "弱點的。"
 
-#: 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"
@@ -1310,41 +1264,41 @@ msgstr ""
 "選擇這個選項會讓您改變 Evolution 在 LDAP 搜尋、建立\n"
 "和編輯連絡人的預設設定。"
 
-#: 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 "指定顯示名稱是在設定 LDAP 伺服器時最後需要的步驟。"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 1: Server Information"
 msgstr "步驟一：伺服器資訊"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: 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 "步驟四：顯示名稱"
 
 # calendar/gui/print.c:362
-#: 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"
@@ -1354,7 +1308,7 @@ msgstr ""
 "設定 LDAP 伺服器的第一個步驟是提供伺服器的名稱，和您的登入\n"
 "資訊。如果您不確定這個資訊，請向您的系統管理者詢問。"
 
-#: 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"
@@ -1366,7 +1320,7 @@ msgstr ""
 "還有一次搜尋應該花多久的時間。如果您需要改變這些選項，\n"
 "請詢問您的系統管理者。"
 
-#: 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"
@@ -1376,7 +1330,7 @@ msgstr ""
 "搜尋起點是您的搜尋起始處的辨認的名稱 (DN)。\n"
 "如果您讓它保持空白，搜尋會從樹狀目錄的根目錄開始。"
 
-#: 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"
@@ -1389,7 +1343,7 @@ msgstr ""
 "“子目錄”的搜尋範圍會包括在您的搜尋起點之下的所有項目。\n"
 "“一層”的搜尋範圍只會包括在您的起點下一層的項目。\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"
@@ -1405,13 +1359,13 @@ msgstr ""
 "的特殊資訊。如果您需要找尋這個資訊，請連絡\n"
 "您的系統管理者。"
 
-#: 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 "這是您的 ldap 伺服器的完整名稱。例如：“ldap.mycompany.com”。"
 
-#: 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"
@@ -1420,7 +1374,7 @@ msgstr ""
 "這是要下載的項目的最大數量。把這個數量設得\n"
 "太大會減慢您的目錄服務的速度。"
 
-#: 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 "
@@ -1429,7 +1383,7 @@ msgstr ""
 "這是 Evolution 將要用驗證您的方法。注意要設定此項至“電子郵件位址”需要您的 "
 "LDAP 伺服器的匿名存取。"
 
-#: 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"
@@ -1438,7 +1392,7 @@ msgstr ""
 "這是此伺服器出現於您的 Evolution 資料夾清單中的名稱。\n"
 "它僅做為顯示之用。"
 
-#: 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"
@@ -1449,95 +1403,45 @@ msgstr ""
 "這裡提供了標準連接埠的清單。請詢問您的系統管理者\n"
 "您應該指定哪個連接埠。"
 
-#: 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 ""
-"要加入屬性至 DN，從清單中選擇它，並且按下“加入屬性”按鈕。\n"
-"任何您加入到 DN 的數值都會變成您要把新的連絡人加入 LDAP 伺服器\n"
-"上的目錄時需要的數值。"
-
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "U_se SSL/TLS:"
 msgstr "使用 SSL/TLS(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "Using distinguished name (DN)"
 msgstr "使用辨認的名稱 (DN)"
 
 # mail/mail-config.glade.h:29
-#: 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:63 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/contact-editor/contact-editor.glade.h:17
 # mail/mail-config.glade.h:84
-#: 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
+#: 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 "新增(_A)"
 
-# addressbook/contact-editor/contact-editor.glade.h:17
-# mail/mail-config.glade.h:84
-#: addressbook/gui/component/ldap-config.glade.h:103
-msgid "_Add ->"
-msgstr "新增(_A) ->"
-
-#: addressbook/gui/component/ldap-config.glade.h:104
-msgid "_Add Mapping"
-msgstr "新增對應(_A)"
-
-#: addressbook/gui/component/ldap-config.glade.h:105
-msgid "_Add to DN"
-msgstr "加入到 DN(_A)"
-
-# calendar/gui/e-calendar-table.c:162
-#: addressbook/gui/component/ldap-config.glade.h:106
-msgid "_Always"
-msgstr "永遠(_A)"
-
-# addressbook/contact-editor/contact-editor.glade.h:23
-# mail/folder-browser.c:715
-# mail/mail-config.glade.h:85
-# ui/evolution-event-editor.xml.h:57
-# ui/evolution-mail.xml.h:103
-# ui/evolution-task-editor-dialog.xml.h:69
-# ui/evolution.xml.h:46
-#: addressbook/gui/component/ldap-config.glade.h:107
-msgid "_Delete Mapping"
-msgstr "刪除對應(_D)"
-
 # calendar/gui/calendar-summary.c:622
 # mail/mail-config.glade.h:24
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Display name:"
 msgstr "顯示名稱(_D):"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
-msgid "_Distinguished Name (DN):"
-msgstr "辨認的名稱(DN)(_D):"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-msgid "_Don't use SSL/TLS"
-msgstr "不使用 SSL/TLS(_D)"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Download limit:"
 msgstr "下載限制(_D):"
 
@@ -1547,7 +1451,7 @@ msgstr "下載限制(_D):"
 # ui/evolution-subscribe.xml.h:10
 # ui/evolution-task-editor-dialog.xml.h:70
 # ui/evolution.xml.h:48
-#: addressbook/gui/component/ldap-config.glade.h:112 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
@@ -1557,171 +1461,99 @@ msgstr "下載限制(_D):"
 msgid "_Edit"
 msgstr "編輯 (_E)"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:2
-#: addressbook/gui/component/ldap-config.glade.h:113
-msgid "_Edit Mapping"
-msgstr "編輯對應(_E)"
-
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#: addressbook/gui/component/ldap-config.glade.h:114
-msgid "_Evolution attribute:"
-msgstr "_Evolution 屬性:"
-
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_If necessary "
-msgstr "如果需要(_I) "
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_LDAP attribute:"
-msgstr "_LDAP 屬性:"
-
-#: addressbook/gui/component/ldap-config.glade.h:117
-msgid "_LDAP attributes:"
-msgstr "_LDAP 屬性:"
-
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Log in method:"
 msgstr "登入方法(_L):"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:431
-#: addressbook/gui/component/ldap-config.glade.h:119
-msgid "_More Options >>"
-msgstr "更多選項(_M) >>"
-
 # addressbook/gui/component/addressbook-config.c:409
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Port number:"
 msgstr "連接埠號碼(_P):"
 
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_Restore Defaults"
-msgstr "還原預設值(_R)"
-
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Search base:"
 msgstr "搜尋起點(_S):"
 
 # calendar/gui/e-itip-control.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Server name:"
 msgstr "伺服器名稱(_S):"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:4
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Timeout (minutes):"
 msgstr "逾時時間（分鐘）(_T):"
 
-# mail/mail-config.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:125
-msgid "account-druid"
-msgstr "account-druid"
-
-# addressbook/contact-editor/contact-editor.glade.h:7
-#: addressbook/gui/component/ldap-config.glade.h:126
-msgid "account-editor"
-msgstr "account-editor"
-
 # calendar/gui/calendar-model.c:638
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "cards"
 msgstr "名片"
 
 # mail/mail-ops.c:1939
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
-msgid "dn-customization-tab"
-msgstr "dn-customization-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:130
-msgid "edit_server_window_simple"
-msgstr "edit_server_window_simple"
-
 # addressbook/contact-editor/contact-editor.glade.h:10
 # executive-summary/component/executive-summary-config.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:132
-msgid "mappings-tab"
-msgstr "mappings-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:133
-msgid "objectclasses-tab"
-msgstr "objectclasses-tab"
-
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "searching-tab"
 msgstr "searching-tab"
 
 # 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
-msgid "Evolution's addressbook name selection interface."
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
 msgstr "Evolution 目錄服務名稱選擇界面。"
 
-# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-#: 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:176
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "全部移除"
 
 # addressbook/gui/component/select-names/e-select-names-popup.c:161
 # composer/e-msg-composer-attachment-bar.c:468
 # shell/e-shortcuts-view.c:265
 # shell/e-shortcuts-view.c:388
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:162
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: 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:176
-#: 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:200
-#: addressbook/gui/component/select-names/e-select-names-popup.c:201
-msgid "Send HTML Mail?"
-msgstr "傳送 HTML 格式的電子郵件？"
+# ui/evolution-addressbook.xml.h:17
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+msgstr "新增連絡人清單"
 
 # addressbook/gui/component/e-address-widget.c:388
 # addressbook/gui/component/select-names/e-select-names-popup.c:281
-#: addressbook/gui/component/select-names/e-select-names-popup.c:300
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
 #, fuzzy
 msgid "View Contact Info"
 msgstr "編輯連絡人資訊"
 
-# ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/select-names/e-select-names-popup.c:399
-#, fuzzy
-msgid "View Contact List"
-msgstr "新增連絡人清單"
-
-# addressbook/gui/component/addressbook-storage.c:99
-#: addressbook/gui/component/select-names/e-select-names-popup.c:417
-msgid "Unnamed Contact List"
-msgstr "未命名的連絡人清單"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:434
-#, c-format
-msgid "(%d not shown)"
-msgstr "(%d 沒有顯示)"
+# addressbook/gui/component/select-names/e-select-names-popup.c:200
+#: 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/addressbook-storage.c:99
-#: 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 "未命名的連絡人"
 
@@ -1731,12 +1563,12 @@ msgstr "未命名的連絡人"
 msgid "Source"
 msgstr "來源"
 
-#: addressbook/gui/component/select-names/e-select-names.c:507
+#: addressbook/gui/component/select-names/e-select-names.c:505
 msgid "Select Contacts from Addressbook"
 msgstr "從目錄服務選擇連絡人"
 
 # addressbook/gui/component/addressbook.c:619
-#: addressbook/gui/component/select-names/e-select-names.c:571
+#: addressbook/gui/component/select-names/e-select-names.c:648
 msgid "Find contact in"
 msgstr "尋找連絡人於"
 
@@ -1815,7 +1647,7 @@ msgstr "合作"
 # addressbook/contact-editor/contact-editor.glade.h:7
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1352
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
 msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
@@ -1899,9 +1731,9 @@ msgstr "允許接收 _HTML 格式的電子郵件"
 # ui/evolution.xml.h:46
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:656 calendar/gui/e-calendar-table.c:969
-#: calendar/gui/e-day-view.c:3720 calendar/gui/e-week-view.c:3559
-#: filter/filter.glade.h:15 mail/folder-browser.c:1767
+#: 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
@@ -1943,14 +1775,14 @@ msgstr "Web 網址(_W):"
 # mail/mail-config.glade.h:30
 #: 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:187
+#: 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: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 "可編輯的"
 
@@ -3076,45 +2908,45 @@ msgid "Zimbabwe"
 msgstr "辛巴威"
 
 # addressbook/printing/e-contact-print.glade.h:4
-#: addressbook/gui/contact-editor/e-contact-editor.c:159
+#: 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:104
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:459
 msgid "Book"
 msgstr "書本"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
-#: addressbook/gui/contact-editor/e-contact-editor.c:166
+#: 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:173
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
 msgid "Is New Card"
 msgstr "是新的名片"
 
 # ui/evolution-message-composer.xml.h:47
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
 msgid "Writable Fields"
 msgstr "可寫的欄位"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
 msgid "Changed"
 msgstr "已變更"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: addressbook/gui/contact-editor/e-contact-editor.c:845
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
 msgid "Category editor not available."
 msgstr "類別編輯器無法使用。"
 
 # addressbook/contact-editor/e-contact-editor.c:603
-#: addressbook/gui/contact-editor/e-contact-editor.c:853
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "This contact belongs to these categories:"
 msgstr "此連絡人屬於這些類別:"
 
@@ -3122,13 +2954,13 @@ msgstr "此連絡人屬於這些類別:"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
 # addressbook/gui/widgets/e-addressbook-view.c:551
 # addressbook/gui/widgets/e-addressbook-view.c:611
-#: addressbook/gui/contact-editor/e-contact-editor.c:1027
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
 msgid "Save Contact as VCard"
 msgstr "儲存成 VCard 檔案格式"
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: addressbook/gui/contact-editor/e-contact-editor.c:1073
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -3138,7 +2970,7 @@ msgstr ""
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: addressbook/gui/contact-editor/e-contact-editor.c:1076
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -3147,12 +2979,12 @@ msgstr ""
 "這個連絡人？"
 
 # addressbook/contact-editor/e-contact-editor.c:1260
-#: addressbook/gui/contact-editor/e-contact-editor.c:1776
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 # camel/providers/local/camel-local-store.c:279
-#: addressbook/gui/contact-editor/e-contact-editor.c:2380
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "無法找到此欄位之界面工具：“%s”"
@@ -3329,20 +3161,20 @@ msgid "_Title:"
 msgstr "頭銜(_T):"
 
 # composer/e-msg-composer-attachment.glade.h:4
-#: 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 "列出名稱(_N):"
 
 # calendar/gui/goto-dialog.glade.h:12
-#: 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 "當傳送電子郵件至此清單時隱藏其位址(_H)"
 
@@ -3350,13 +3182,13 @@ msgstr "當傳送電子郵件至此清單時隱藏其位址(_H)"
 # composer/e-msg-composer-attachment-bar.c:468
 # shell/e-shortcuts-view.c:265
 # shell/e-shortcuts-view.c:388
-#: 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 "移除(_R)"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
-#: 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 "連絡人清單編輯器"
 
@@ -3462,7 +3294,7 @@ msgstr " %d 張名片"
 #: 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 "查詢"
@@ -3480,12 +3312,12 @@ msgstr "模型"
 # shell/e-shell-importer.c:404
 #: 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 "編輯名片時發生錯誤"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1160
+#: shell/evolution-shell-component.c:1178
 msgid "Success"
 msgstr "成功"
 
@@ -3494,8 +3326,9 @@ 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:2083
-#: shell/e-storage.c:602 shell/evolution-shell-component.c:1199
+#: 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 "不明的錯誤"
 
@@ -3507,7 +3340,7 @@ msgstr "資料庫離線"
 
 # shell/e-storage.c:475
 #: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
-#: shell/evolution-shell-component.c:1190
+#: shell/evolution-shell-component.c:1208
 msgid "Permission denied"
 msgstr "權限不足"
 
@@ -3532,11 +3365,11 @@ msgstr "通訊協定不支援"
 # camel/camel-service.c:544
 # camel/camel-service.c:580
 #: 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
-#: camel/camel-service.c:847 camel/camel-service.c:890
+#: 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"
@@ -3798,7 +3631,7 @@ msgstr "刪除"
 
 # widgets/menus/gal-view-menus.c:176
 #: 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 "目前檢視"
 
@@ -3919,42 +3752,42 @@ msgid "Save in addressbook"
 msgstr "存入目錄服務"
 
 # addressbook/printing/e-contact-print.glade.h:41
-#: 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/printing/e-contact-print.glade.h:15
-#: 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 "得到焦點"
 
 # ui/evolution-message-composer.xml.h:47
-#: addressbook/gui/widgets/e-minicard-label.c:123
+#: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "欄位"
 
 # addressbook/contact-editor/e-contact-quick-add.c:276
 # addressbook/gui/widgets/e-addressbook-view.c:700
-#: 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 "欄寬"
 
@@ -3988,14 +3821,14 @@ msgstr ""
 msgid "Adapter"
 msgstr "轉接器"
 
-#: addressbook/gui/widgets/e-minicard.c:165
+#: addressbook/gui/widgets/e-minicard.c:169
 msgid "Selected"
 msgstr "已選擇"
 
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: addressbook/gui/widgets/e-minicard.c:172
+#: addressbook/gui/widgets/e-minicard.c:176
 msgid "Has Cursor"
 msgstr "有游標"
 
@@ -4405,7 +4238,7 @@ msgstr "31日"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:10
 # calendar/gui/e-calendar-table.c:345
 # mail/message-list.c:689
-#: calendar/cal-util/cal-util.c:523 calendar/cal-util/cal-util.c:545
+#: 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"
@@ -4417,8 +4250,8 @@ msgstr "高"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:13
 # calendar/gui/e-calendar-table.c:346
 # mail/message-list.c:688
-#: calendar/cal-util/cal-util.c:525 calendar/cal-util/cal-util.c:547
-#: calendar/gui/calendar-model.c:1701
+#: 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"
@@ -4429,7 +4262,7 @@ msgstr "普通"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:12
 # calendar/gui/e-calendar-table.c:347
 # mail/message-list.c:687
-#: calendar/cal-util/cal-util.c:527 calendar/cal-util/cal-util.c:549
+#: 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"
@@ -4439,94 +4272,99 @@ msgstr "低"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
 # calendar/gui/e-calendar-table.c:348
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:543
+#: 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:208
+#: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr "分割多日事件:"
 
 # calendar/conduits/calendar/calendar-conduit.c:687
 # calendar/conduits/todo/todo-conduit.c:501
-#: 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 "與行事曆伺服器通訊時發生錯誤"
 
 # calendar/conduits/calendar/calendar-conduit.c:786
 # calendar/conduits/calendar/calendar-conduit.c:789
-#: 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 "無法讀取 pilot 行事曆程式區塊"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: calendar/conduits/todo/todo-conduit.c:208
+#: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
 msgstr "預設優先順序:"
 
 # calendar/conduits/todo/todo-conduit.c:600
 # calendar/conduits/todo/todo-conduit.c:603
-#: 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 "無法讀取 pilot 待辦事項程式區塊"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+# ui/evolution-mail.xml.h:110
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "一個可以顯示工作清單的 Bonobo 控制項。"
+msgid "Calendar and Tasks"
+msgstr "行事曆與工作"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "一個可以顯示行事曆的 Bonobo 控制項例子。"
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "在這裡設定您的時區、行事曆與工作清單"
 
 # ui/evolution-mail.xml.h:110
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
 msgstr "行事曆與工作"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:4
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr " Evolution 行事曆組態控制。"
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution 郵件資料夾顯示元件。"
 
+# mail/GNOME_Evolution_Mail.oaf.in.h:5
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "在這裡設定您的時區、行事曆與工作清單"
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution 郵件資料夾元件工廠。"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: 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 行事曆 iTip/iMip 檢視器"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "用作處理行事曆的 Evolution 元件。"
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution 行事曆 iTip/iMip 檢視器"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Factory for the Evolution Calendar objects"
-msgstr "Evolution 行事曆物件工廠"
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution 行事曆 iTip/iMip 檢視器"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "集中式行事曆元件編輯器對話盒工廠"
-
-# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Alarm notification service"
-msgstr "聲音提醒服務"
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution 提醒"
 
 # calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.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 "聲音提醒服務的元件工廠"
 
 # importers/netscape-importer.c:790
@@ -4593,7 +4431,7 @@ msgstr "沒有可用的描述。"
 # widgets/misc/e-messagebox.c:159
 #: calendar/gui/alarm-notify/alarm-queue.c:845
 #: calendar/gui/alarm-notify/alarm-queue.c:869
-#: calendar/gui/tasks-control.c:457 widgets/misc/e-messagebox.c:161
+#: calendar/gui/tasks-control.c:463 widgets/misc/e-messagebox.c:161
 msgid "Warning"
 msgstr "警告"
 
@@ -4667,7 +4505,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 "沒有相符資料"
 
@@ -4683,8 +4521,8 @@ msgstr "%A %d %B %Y"
 # calendar/gui/e-week-view-main-item.c:334
 #. 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"
 
@@ -4707,7 +4545,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"
 
@@ -4743,10 +4581,10 @@ msgstr "公開資料夾包含約會與事件"
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
 #: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:735
-#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:511
-#: calendar/importers/icalendar-importer.c:595
+#: 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:326 my-evolution/e-summary-tasks.c:344
+#: 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 "工作"
@@ -4836,7 +4674,7 @@ msgstr "建立一個新的全天約會"
 # calendar/gui/calendar-model.c:363
 # calendar/gui/calendar-model.c:900
 # calendar/gui/e-calendar-table.c:324
-#: 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 "私人"
@@ -4844,7 +4682,7 @@ msgstr "私人"
 # calendar/gui/calendar-model.c:366
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
-#: 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 "機密"
@@ -4877,15 +4715,15 @@ msgid "W"
 msgstr "W"
 
 # ui/evolution-calendar.xml.h:36
-#: 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 "空閒"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:393
 #: 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:1184
+#: calendar/gui/e-meeting-time-sel.c:407
+#: shell/evolution-shell-component.c:1202
 msgid "Busy"
 msgstr "忙碌"
 
@@ -4893,7 +4731,7 @@ msgstr "忙碌"
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
-#: 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"
@@ -4903,7 +4741,7 @@ msgstr "未開始"
 # calendar/gui/calendar-model.c:1178
 # calendar/gui/dialogs/task-editor-dialog.glade.h:11
 # calendar/gui/e-calendar-table.c:420
-#: 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"
@@ -4913,7 +4751,7 @@ msgstr "進行中"
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: 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
@@ -4921,7 +4759,7 @@ msgid "Completed"
 msgstr "已完成"
 
 # calendar/gui/calendar-model.c:970
-#: calendar/gui/calendar-model.c:1028
+#: calendar/gui/calendar-model.c:1031
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4946,11 +4784,11 @@ msgstr ""
 # widgets/misc/e-dateedit.c:1341
 # widgets/misc/e-dateedit.c:1456
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1168 calendar/gui/dialogs/meeting-page.c:286
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1982
-#: mail/folder-browser.c:1729 mail/mail-account-gui.c:1254
-#: mail/mail-account-gui.c:1686 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:78
+#: 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
@@ -4958,24 +4796,24 @@ msgid "None"
 msgstr "無"
 
 # calendar/gui/calendar-model.c:1576
-#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/calendar-model.c:1706
 msgid "Recurring"
 msgstr "循環模式"
 
 # calendar/gui/calendar-model.c:1578
-#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/calendar-model.c:1708
 msgid "Assigned"
 msgstr "已指定"
 
 # calendar/gui/calendar-model.c:1584
-#: 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 "是"
 
 # calendar/gui/calendar-model.c:1584
-#: 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 "否"
@@ -5024,36 +4862,36 @@ msgid "Could not open the folder in '%s'"
 msgstr "無法開啟“%s”內的資料夾"
 
 # calendar/gui/control-factory.c:126
-#: 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/cal-prefs-dialog.glade.h:9
-#: calendar/gui/dialogs/alarm-options.c:473
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "音效提醒選項"
 
 # addressbook/gui/component/select-names/select-names.glade.h:2
-#: calendar/gui/dialogs/alarm-options.c:482
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "訊息提醒選項"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/alarm-options.c:491
+#: calendar/gui/dialogs/alarm-options.c:438
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "郵件提醒選項"
 
-#: calendar/gui/dialogs/alarm-options.c:500
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "程式提醒選項"
 
 # camel/camel-sasl-login.c:127
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "不明的提醒選項"
 
@@ -5102,15 +4940,20 @@ msgid "days"
 msgstr "天"
 
 #: 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:12 filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
 msgid "hours"
 msgstr "時"
 
 # executive-summary/test-service/rdf-summary.c:806
-#: 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 "分"
 
@@ -5196,7 +5039,7 @@ msgstr "時"
 
 # calendar/gui/event-editor-dialog.glade.h:42
 # mail/mail-config.glade.h:87
-#: 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 "分"
 
@@ -5418,7 +5261,7 @@ msgstr "週五(_F)"
 # addressbook/contact-editor/contact-editor.glade.h:10
 # executive-summary/component/executive-summary-config.glade.h:3
 #: 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)"
 
@@ -5583,30 +5426,30 @@ msgid "Due "
 msgstr "期限 "
 
 # shell/e-setup.c:163
-#: calendar/gui/dialogs/comp-editor.c:329
+#: calendar/gui/dialogs/comp-editor.c:328
 msgid "Could not update invalid object"
 msgstr "無法更新無效的物件"
 
-#: calendar/gui/dialogs/comp-editor.c:332
+#: calendar/gui/dialogs/comp-editor.c:331
 msgid "Object not found, not updated"
 msgstr "找不到物件，沒有更新"
 
-#: calendar/gui/dialogs/comp-editor.c:335
+#: calendar/gui/dialogs/comp-editor.c:334
 msgid "You don't have permissions to update this object"
 msgstr "您沒有可以更新這個物件的權限"
 
 # shell/e-setup.c:163
-#: calendar/gui/dialogs/comp-editor.c:338
+#: calendar/gui/dialogs/comp-editor.c:337
 msgid "Could not update object"
 msgstr "無法更新物件"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: calendar/gui/dialogs/comp-editor.c:788
+#: calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "編輯約會"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/dialogs/comp-editor.c:793
+#: calendar/gui/dialogs/comp-editor.c:792
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
@@ -5614,36 +5457,36 @@ msgstr "約會 - %s"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/dialogs/comp-editor.c:796
+#: calendar/gui/dialogs/comp-editor.c:795
 #, c-format
 msgid "Task - %s"
 msgstr "工作 - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:799
+#: calendar/gui/dialogs/comp-editor.c:798
 #, c-format
 msgid "Journal entry - %s"
 msgstr "日誌項目 - %s"
 
 # calendar/gui/e-calendar-table.c:159
-#: calendar/gui/dialogs/comp-editor.c:810
+#: calendar/gui/dialogs/comp-editor.c:809
 msgid "No summary"
 msgstr "沒有摘要"
 
 # composer/e-msg-composer.c:774
-#: calendar/gui/dialogs/comp-editor.c:1231
-#: 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/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:1332
-#: calendar/gui/dialogs/comp-editor.c:1356
-#: calendar/gui/dialogs/comp-editor.c:1380
+#: 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 "如果有更新透過電子郵件到達，對此項目所做的變更可能被放棄"
 
-#: calendar/gui/dialogs/comp-editor.c:1407
+#: calendar/gui/dialogs/comp-editor.c:1406
 msgid "Unable to obtain current version!"
 msgstr "無法取得目前的版本！"
 
@@ -5744,20 +5587,20 @@ msgid "Meeting"
 msgstr "會議"
 
 # calendar/gui/e-calendar-table.c:154
-#: 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/event-editor-dialog.glade.h:31
-#: calendar/gui/dialogs/event-page.c:687
+#: calendar/gui/dialogs/event-page.c:633
 msgid "Start time is wrong"
 msgstr "開始時間錯誤"
 
-#: calendar/gui/dialogs/event-page.c:694
+#: calendar/gui/dialogs/event-page.c:640
 msgid "End time is wrong"
 msgstr "結束時間錯誤"
 
@@ -5832,38 +5675,35 @@ msgstr "顯示時間為"
 msgid "Su_mmary:"
 msgstr "摘要(_M):"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:24
-# calendar/gui/event-editor-dialog.glade.h:29
-#: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "連絡人(_C)..."
-
 # calendar/gui/event-editor-dialog.glade.h:30
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "結束時間(_E):"
 
 # calendar/gui/event-editor-dialog.glade.h:31
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "開始時間(_S):"
 
-#: calendar/gui/dialogs/meeting-page.c:400
+#: 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:424
+#: calendar/gui/dialogs/meeting-page.c:446
 msgid "At least one attendee is required."
 msgstr "最少需要一個到會者。"
 
-#: calendar/gui/dialogs/meeting-page.c:579
+#: calendar/gui/dialogs/meeting-page.c:616
 msgid "That person is already attending the meeting!"
 msgstr "此人已經出席本會議！"
 
 # calendar/gui/e-calendar-table.c:708
 # ui/evolution-task-editor-dialog.xml.h:19
-#: calendar/gui/dialogs/meeting-page.c:652
+#: calendar/gui/dialogs/meeting-page.c:696
 msgid "_Delegate To..."
 msgstr "委派給(_D)..."
 
@@ -5912,7 +5752,7 @@ msgid "Member"
 msgstr "會員"
 
 #: 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"
@@ -5939,7 +5779,7 @@ msgstr "變更會議召集人(_C)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:411
 #: 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 "邀請其他人(_I)..."
 
@@ -6187,7 +6027,7 @@ msgstr "到期日錯誤"
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: 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:"
@@ -6198,6 +6038,12 @@ msgstr "描述:"
 msgid "Sta_rt Date:"
 msgstr "開始日期(_R):"
 
+# calendar/gui/dialogs/task-editor-dialog.glade.h:24
+# calendar/gui/event-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "連絡人(_C)..."
+
 # calendar/gui/dialogs/task-editor-dialog.glade.h:25
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
@@ -6316,68 +6162,79 @@ msgstr "%s 為未知的觸發類型"
 
 # calendar/gui/e-calendar-table.c:367
 #: calendar/gui/e-calendar-table.c:415
+#, c-format
 msgid "0%"
 msgstr "0%"
 
 # calendar/gui/e-calendar-table.c:368
 #: calendar/gui/e-calendar-table.c:416
+#, c-format
 msgid "10%"
 msgstr "10%"
 
 # calendar/gui/e-calendar-table.c:369
 #: calendar/gui/e-calendar-table.c:417
+#, c-format
 msgid "20%"
 msgstr "20%"
 
 # calendar/gui/e-calendar-table.c:370
 #: calendar/gui/e-calendar-table.c:418
+#, c-format
 msgid "30%"
 msgstr "30%"
 
 # calendar/gui/e-calendar-table.c:371
 #: calendar/gui/e-calendar-table.c:419
+#, c-format
 msgid "40%"
 msgstr "40%"
 
 # calendar/gui/e-calendar-table.c:372
 #: calendar/gui/e-calendar-table.c:420
+#, c-format
 msgid "50%"
 msgstr "50%"
 
 # calendar/gui/e-calendar-table.c:373
 #: calendar/gui/e-calendar-table.c:421
+#, c-format
 msgid "60%"
 msgstr "60%"
 
 # calendar/gui/e-calendar-table.c:374
 #: calendar/gui/e-calendar-table.c:422
+#, c-format
 msgid "70%"
 msgstr "70%"
 
 # calendar/gui/e-calendar-table.c:375
 #: calendar/gui/e-calendar-table.c:423
+#, c-format
 msgid "80%"
 msgstr "80%"
 
 # calendar/gui/e-calendar-table.c:376
 #: calendar/gui/e-calendar-table.c:424
+#, c-format
 msgid "90%"
 msgstr "90%"
 
 # calendar/gui/e-calendar-table.c:377
 #: calendar/gui/e-calendar-table.c:425
+#, c-format
 msgid "100%"
 msgstr "100%"
 
 # calendar/gui/e-calendar-table.c:714
-#: 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 "刪除選定的物件"
 
 # mail/folder-browser.c:686
-#: 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:1740
+#: 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 "開啟(_O)"
@@ -6390,8 +6247,8 @@ msgstr "另存新檔(_S)..."
 # ui/evolution-addressbook.xml.h:18
 # ui/evolution-calendar.xml.h:42
 # ui/evolution-contact-editor.xml.h:15
-#: 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
@@ -6400,16 +6257,16 @@ msgstr "列印(_P)..."
 
 # ui/evolution-event-editor.xml.h:6
 # ui/evolution-task-editor-dialog.xml.h:7
-#: 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 "剪下(_U)"
 
 # ui/evolution-event-editor.xml.h:55
 # ui/evolution-task-editor-dialog.xml.h:67
-#: 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"
@@ -6417,9 +6274,9 @@ msgstr "複製(_C)"
 
 # ui/evolution-event-editor.xml.h:68
 # ui/evolution-task-editor-dialog.xml.h:81
-#: 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"
@@ -6451,8 +6308,8 @@ msgstr "標示選定的工作為已完成(_M)"
 msgid "_Delete Selected Tasks"
 msgstr "刪除選定的工作(_D)"
 
-#: 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 "更新物件"
 
@@ -6508,7 +6365,7 @@ msgstr "開始日期"
 
 # calendar/gui/e-calendar-table.c:159
 #: 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 "摘要"
@@ -6549,7 +6406,7 @@ msgstr ""
 "%s"
 
 # calendar/gui/e-day-view-time-item.c:519
-#: 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 分鐘"
@@ -6559,8 +6416,8 @@ msgstr "間隔 %02i 分鐘"
 # calendar/gui/e-week-view-main-item.c:325
 #. 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"
 
@@ -6569,8 +6426,8 @@ msgstr "%A %d %B"
 # calendar/gui/e-week-view-main-item.c:348
 #. 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"
 
@@ -6594,54 +6451,54 @@ msgstr "下午"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/e-day-view.c:3659
+#: calendar/gui/e-day-view.c:3662
 msgid "New _Appointment"
 msgstr "新增約會(_A)"
 
 # calendar/gui/e-day-view.c:3148
 # calendar/gui/e-week-view.c:3279
-#: 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 "新增全天事件(_E)"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: 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 "新增會議"
 
 # ui/evolution-tasks.xml.h:3
-#: 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 "新增工作"
 
 # ui/evolution-contact-editor.xml.h:7
 # ui/evolution-event-editor.xml.h:38
 # ui/evolution-task-editor-dialog.xml.h:41
-#: 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 "列印..."
 
 # ui/evolution-calendar.xml.h:12
-#: 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 "移至今日(_T)"
 
 # calendar/gui/e-day-view.c:3155
 # calendar/gui/e-week-view.c:3286
-#: 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 "到指定日期(_G)..."
 
 # mail/mail-config.glade.h:61
-#: 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 "發佈空閒/忙碌資訊(_P)"
 
 # ui/evolution-mail.xml.h:110
-#: 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 "設定值(_S)..."
@@ -6650,36 +6507,36 @@ msgstr "設定值(_S)..."
 # ui/evolution-calendar.xml.h:43
 # ui/evolution-mail.xml.h:118
 # ui/evolution-tasks.xml.h:8
-#: calendar/gui/e-day-view.c:3703 calendar/gui/e-week-view.c:3542
-#: mail/folder-browser.c:1742 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)..."
 
 # ui/evolution-event-editor.xml.h:46
-#: 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 "會議排程(_S)..."
 
 # calendar/gui/calendar-summary.c:721
 # calendar/gui/e-itip-control.glade.h:7
-#: 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 "以 iCalendar 轉寄(_F)..."
 
 # calendar/gui/e-day-view.c:3175
 # calendar/gui/e-week-view.c:3309
-#: 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 "將這個事件標示成可移動(_M)"
 
 # calendar/gui/e-day-view.c:3177
 # calendar/gui/e-week-view.c:3311
-#: 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 "刪除這個事件(_O)"
 
 # calendar/gui/e-week-view.c:3313
-#: 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 "刪除全部事件(_A)"
 
@@ -6821,29 +6678,29 @@ msgid "<i>None</i>"
 msgstr "<i>無</i>"
 
 # addressbook/backend/ebook/e-card.c:3442
-#: calendar/gui/e-itip-control.c:1058
+#: calendar/gui/e-itip-control.c:1059
 msgid "Location:"
 msgstr "位置:"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#: calendar/gui/e-itip-control.c:1072
+#: calendar/gui/e-itip-control.c:1073
 msgid "Status:"
 msgstr "狀態:"
 
-#: 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:404
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "接受"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: calendar/gui/e-itip-control.c:1081 calendar/gui/itip-utils.c:407
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
 
-#: 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:410 calendar/gui/itip-utils.c:436
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "婉拒"
 
@@ -6851,13 +6708,13 @@ msgstr "婉拒"
 # calendar/gui/event-editor.c:1601
 # calendar/gui/event-editor.c:1628
 # camel/providers/smtp/camel-smtp-transport.c:221
-#: 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:1531
-#: camel/camel-gpg-context.c:1581 camel/camel-tcp-stream-openssl.c:634
+#: 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:344
+#: 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"
@@ -6865,323 +6722,323 @@ msgstr "不明"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: 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 "選擇一個動作:"
 
-#: calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update"
 msgstr "更新"
 
 # widgets/misc/e-cell-date-edit.c:245
-#: 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:2073 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 "確認"
 
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1174
 msgid "Accept"
 msgstr "接受"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1175
 msgid "Tentatively accept"
 msgstr "暫時接受"
 
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1176
 msgid "Decline"
 msgstr "婉拒"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1200
 msgid "Send Free/Busy Information"
 msgstr "送出空閒/忙碌資訊"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1213
 msgid "Update respondent status"
 msgstr "更新回應狀態"
 
 # widgets/misc/e-messagebox.c:152
-#: calendar/gui/e-itip-control.c:1225
+#: calendar/gui/e-itip-control.c:1226
 msgid "Send Latest Information"
 msgstr "送出最新資訊"
 
 # ui/evolution-mail.xml.h:2
-#: calendar/gui/e-itip-control.c:1238 calendar/gui/itip-utils.c:424
-#: shell/evolution-shell-component.c:1162 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:1319
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> 已經發佈會議資訊。"
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1321
 msgid "Meeting Information"
 msgstr "會議資訊"
 
-#: 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> 邀請 %s 出席此次會議。"
 
-#: 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> 邀請您出席此次會議。"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1329
 msgid "Meeting Proposal"
 msgstr "會議提案"
 
-#: 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> 希望加入一個既存的會議。"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:631
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update"
 msgstr "會議更新"
 
-#: 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> 希望收到最新的會議資訊。"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Update Request"
 msgstr "會議更新請求"
 
-#: 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> 已經答覆了會議請求。"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-itip-control.c:1346
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Reply"
 msgstr "會議答覆"
 
-#: 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> 已經消取會議。"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1355
 msgid "Meeting Cancellation"
 msgstr "會議取消"
 
-#: 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> 傳送了一個難以理解的訊息。"
 
 # mail/mail-search.c:268
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1363
 msgid "Bad Meeting Message"
 msgstr "不正確的會議訊息"
 
-#: 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> 已經發佈了工作資訊。"
 
 # widgets/misc/e-messagebox.c:152
-#: calendar/gui/e-itip-control.c:1387
+#: calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "工作資訊"
 
-#: 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> 要求 %s 進行工作。"
 
-#: 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> 要求您進行工作。"
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "工作計畫"
 
-#: 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> 希望加入一項既存的工作。"
 
-#: calendar/gui/e-itip-control.c:1400
+#: calendar/gui/e-itip-control.c:1401
 msgid "Task Update"
 msgstr "工作更新"
 
-#: 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> 希望收到最新的工作資訊。"
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Update Request"
 msgstr "工作更新請求"
 
-#: 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> 已經回覆指派的工作。"
 
 # mail/message-browser.c:188
 # ui/evolution-mail.xml.h:70
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1414
 msgid "Task Reply"
 msgstr "工作回覆"
 
-#: 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> 已經取消工作。"
 
-#: calendar/gui/e-itip-control.c:1421
+#: calendar/gui/e-itip-control.c:1422
 msgid "Task Cancellation"
 msgstr "工作取消"
 
 # calendar/gui/e-itip-control.glade.h:4
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1430
 msgid "Bad Task Message"
 msgstr "不正確的工作訊息"
 
-#: 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> 已經發佈空閒/忙碌資訊。"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:1449
+#: calendar/gui/e-itip-control.c:1450
 msgid "Free/Busy Information"
 msgstr "空閒/忙碌資訊"
 
-#: 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> 請求您的空閒/忙碌資訊。"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: calendar/gui/e-itip-control.c:1454
+#: calendar/gui/e-itip-control.c:1455
 msgid "Free/Busy Request"
 msgstr "空閒/忙碌請求"
 
-#: 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> 已經答覆空閒/忙碌請求。"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: calendar/gui/e-itip-control.c:1459
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Reply"
 msgstr "空閒/忙碌回覆"
 
 # mail/mail-callbacks.c:1407
-#: calendar/gui/e-itip-control.c:1464
+#: calendar/gui/e-itip-control.c:1465
 msgid "Bad Free/Busy Message"
 msgstr "不正確的空閒/忙碌訊息"
 
 # camel/providers/local/camel-mbox-folder.c:368
-#: 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 "訊息似乎沒有被適當地組成"
 
-#: calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1604
 msgid "The message contains only unsupported requests."
 msgstr "這個郵件只包含不支援的請求。"
 
-#: 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 "附件並未包含合法的行事曆訊息"
 
-#: calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1666
 msgid "The attachment has no viewable calendar items"
 msgstr "附件沒有可檢視的行事曆項目"
 
-#: 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 "物件是無效的而且不能更新\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 "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 "找不到物件\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 "您沒有正確的權限可以更新行事曆\n"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1919
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1922
 msgid "Calendar file could not be updated!\n"
 msgstr "無法更新行事曆檔案！\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 "到會者狀態不能更新，因為項目已經不存在"
 
-#: 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 "這個回覆並非來自目前的到會者。將他加入為到會者？"
 
-#: 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 "由於不合法的狀態使得到會者狀態無法更新！\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 "您沒有正確的權限可以更新行事曆\n"
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:2011
 msgid "Attendee status updated\n"
 msgstr "到會者狀態已更新\n"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:2014
 msgid "Attendee status could not be updated!\n"
 msgstr "無法更新到會者狀態！\n"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#: calendar/gui/e-itip-control.c:2048
+#: calendar/gui/e-itip-control.c:2049
 msgid "Removal Complete"
 msgstr "移除完成"
 
-#: 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 "項目傳送！\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 "無法傳送這個項目！\n"
 
 # mail/mail-account-gui.c:682
-#: calendar/gui/e-itip-control.c:2205
+#: calendar/gui/e-itip-control.c:2206
 msgid "Select Calendar Folder"
 msgstr "選擇行事曆資料夾"
 
 # mail/mail-account-gui.c:682
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2213
 msgid "Select Tasks Folder"
 msgstr "選擇工作資料夾"
 
@@ -7304,7 +7161,7 @@ msgstr "需要動作"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
 #: 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 "暫訂"
 
@@ -7326,7 +7183,7 @@ 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:2077
+#: calendar/gui/e-meeting-time-sel.c:2092
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7336,7 +7193,7 @@ 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: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 %m/%d/%Y"
@@ -7354,77 +7211,77 @@ msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:394
-#: 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 "不在辦公室"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: calendar/gui/e-meeting-time-sel.c:410
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "No Information"
 msgstr "沒有資訊"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:431
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "選項(_O)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:448
-#: calendar/gui/e-meeting-time-sel.c:468
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Only Working Hours"
 msgstr "只顯示工作時間(_O)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:461
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:481
 msgid "Show _Zoomed Out"
 msgstr "顯示縮小(_Z)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:479
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_Update Free/Busy"
 msgstr "更新空閒/忙碌(_U)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:497
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:517
 msgid "_<<"
 msgstr "_<<"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:514
-#: calendar/gui/e-meeting-time-sel.c:535
+#: calendar/gui/e-meeting-time-sel.c:534
 msgid "_Autopick"
 msgstr "自動選擇(_A)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:528
-#: calendar/gui/e-meeting-time-sel.c:549
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid ">_>"
 msgstr ">_>"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:545
-#: calendar/gui/e-meeting-time-sel.c:568
+#: calendar/gui/e-meeting-time-sel.c:567
 msgid "_All People and Resources"
 msgstr "所有人員與資源(_A)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:558
-#: calendar/gui/e-meeting-time-sel.c:581
+#: calendar/gui/e-meeting-time-sel.c:580
 msgid "All _People and One Resource"
 msgstr "所有與會者與一項資源(_P)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:571
-#: calendar/gui/e-meeting-time-sel.c:594
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "_Required People"
 msgstr "需要與會者(_R)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:584
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:606
 msgid "Required People and _One Resource"
 msgstr "需要與會者與一項資源(_O)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:607
-#: calendar/gui/e-meeting-time-sel.c:630
+#: calendar/gui/e-meeting-time-sel.c:629
 msgid "Meeting _start time:"
 msgstr "會議開始時間(_S):"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:631
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:648
 msgid "Meeting _end time:"
 msgstr "會議結束時間(_E):"
 
@@ -7480,7 +7337,7 @@ msgstr "除去中"
 
 # calendar/gui/e-week-view.c:3277
 # calendar/gui/e-week-view.c:3300
-#: calendar/gui/e-week-view.c:3509
+#: calendar/gui/e-week-view.c:3529
 msgid "New _Appointment..."
 msgstr "新增約會(_A)..."
 
@@ -7607,64 +7464,65 @@ msgstr "10月"
 msgid "September"
 msgstr "9月"
 
-#: calendar/gui/itip-utils.c:262 calendar/gui/itip-utils.c:333
+#: 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:297
+#: calendar/gui/itip-utils.c:298
 msgid "At least one attendee is necessary"
 msgstr "至少需要一個到會者"
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/itip-utils.c:376 calendar/gui/itip-utils.c:485
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
 msgid "Event information"
 msgstr "事件資訊"
 
 # widgets/misc/e-messagebox.c:152
-#: calendar/gui/itip-utils.c:378 calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
 msgid "Task information"
 msgstr "工作資訊"
 
 # mail/mail-config.glade.h:47
-#: calendar/gui/itip-utils.c:380 calendar/gui/itip-utils.c:489
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Journal information"
 msgstr "日誌資訊"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/itip-utils.c:382 calendar/gui/itip-utils.c:509
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
 msgid "Free/Busy information"
 msgstr "空閒/忙碌資訊"
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/itip-utils.c:384
+#: calendar/gui/itip-utils.c:394
 msgid "Calendar information"
 msgstr "行事曆資訊"
 
-#: calendar/gui/itip-utils.c:420
+#: calendar/gui/itip-utils.c:430
 msgid "Updated"
 msgstr "已更新"
 
 # ui/evolution-subscribe.xml.h:4
-#: calendar/gui/itip-utils.c:428
+#: calendar/gui/itip-utils.c:438
 msgid "Refresh"
 msgstr "重整清單"
 
-#: calendar/gui/itip-utils.c:432
+#: calendar/gui/itip-utils.c:442
 msgid "Counter-proposal"
 msgstr "計算計劃"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/itip-utils.c:503
+#: calendar/gui/itip-utils.c:513
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "空閒/忙碌資訊 (%s 到 %s)"
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/itip-utils.c:515
+#: calendar/gui/itip-utils.c:525
 msgid "iCalendar information"
 msgstr "iCalendar 資訊"
 
-#: calendar/gui/itip-utils.c:663
+#: calendar/gui/itip-utils.c:669
 msgid "You must be an attendee of the event."
 msgstr "您必須是此事件的到會者。"
 
@@ -7794,8 +7652,8 @@ msgstr "連絡人: "
 # ui/evolution-addressbook.xml.h:10
 # ui/evolution-calendar.xml.h:24
 #: calendar/gui/print.c:2533 calendar/gui/print.c:2619
-#: calendar/gui/tasks-control.c:579 mail/mail-callbacks.c:2950
-#: my-evolution/e-summary.c:618
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:616
 msgid "Print Preview"
 msgstr "預覽列印"
 
@@ -7817,7 +7675,7 @@ msgstr "列印設定"
 msgid "The URI of the tasks folder to display"
 msgstr "工作資料夾顯示的 URI"
 
-#: calendar/gui/tasks-control.c:465
+#: 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"
@@ -7832,48 +7690,61 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: calendar/gui/tasks-control.c:472
+#: calendar/gui/tasks-control.c:479
 msgid "Do not ask me again."
 msgstr "不要再顯示這個訊息。"
 
 # ui/evolution-calendar.xml.h:25
-#: calendar/gui/tasks-control.c:608
+#: calendar/gui/tasks-control.c:615
 msgid "Print Tasks"
 msgstr "列印工作"
 
 # calendar/gui/weekday-picker.c:315
 # calendar/gui/weekday-picker.c:410
-#: 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 "日一二三四五六"
 
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "匯入 iCalendar 檔案到 Evolution 的元件工廠。"
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Evolution 行事曆 iTip/iMip 檢視器"
 
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "匯入 iCalendar 檔案到 Evolution"
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Evolution 行事曆 iTip/iMip 檢視器"
 
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "匯入 vCalendar 檔案到 Evolution"
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Evolution 行事曆 iTip/iMip 檢視器"
+
+# calendar/gui/e-itip-control.glade.h:4
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "行事曆訊息"
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
+msgstr ""
 
 # calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/importers/icalendar-importer.c:380
+#: calendar/importers/icalendar-importer.c:404
 msgid "Reminder!!"
 msgstr "提醒！！"
 
 # calendar/gui/e-itip-control.glade.h:4
-#: calendar/importers/icalendar-importer.c:588
+#: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "行事曆事件"
 
 # importers/pine-importer.c:705
-#: 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?"
@@ -7883,11 +7754,11 @@ msgstr ""
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: calendar/importers/icalendar-importer.c:620
+#: calendar/importers/icalendar-importer.c:670
 msgid "Gnome Calendar"
 msgstr "Gnome 行事曆"
 
-#: calendar/pcs/cal-backend-file.c:310
+#: calendar/pcs/cal-backend-file.c:311
 msgid "Can't save calendar data: Malformed URI."
 msgstr ""
 
@@ -9596,12 +9467,12 @@ msgid "You may not export keys with this cipher"
 msgstr "您不能匯出此加密器的金鑰"
 
 # mail/mail-ops.c:1728
-#: camel/camel-data-cache.c:137
+#: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
 msgstr "無法建立快取路徑"
 
 # camel/providers/imap/camel-imap-message-cache.c:150
-#: camel/camel-data-cache.c:375
+#: camel/camel-data-cache.c:370
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "無法移除快取項目： %s： %s"
@@ -9843,9 +9714,9 @@ msgstr ""
 "“%s”"
 
 # mail/mail-send-recv.c:471
-#: 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 "已取消。"
 
@@ -9871,7 +9742,7 @@ msgstr "不能加密郵件：沒有提供有效的收件者。"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1122
+#: camel/camel-gpg-context.c:1125
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9884,29 +9755,29 @@ msgstr ""
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: 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-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: 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-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: 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-pgp-context.c:890
-#: 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"
@@ -10169,70 +10040,70 @@ msgstr "伺服器回覆包含不完整的許可資料\n"
 msgid "Server response does not match\n"
 msgstr "伺服器回覆不符\n"
 
-#: camel/camel-sasl-gssapi.c:47
+#: camel/camel-sasl-gssapi.c:48
 msgid "GSSAPI"
 msgstr ""
 
 # camel/camel-sasl-kerberos4.c:42
-#: camel/camel-sasl-gssapi.c:49
+#: 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:147
+#: 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:152
+#: camel/camel-sasl-gssapi.c:153
 msgid "The provided target_name parameter was ill-formed."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:155
+#: 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:159
+#: 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:164
+#: 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:168
+#: 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:173
+#: camel/camel-sasl-gssapi.c:174
 msgid "The supplied context handle did not refer to a valid context."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:176
+#: camel/camel-sasl-gssapi.c:177
 msgid "The consistency checks performed on the input_token failed."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:179
+#: camel/camel-sasl-gssapi.c:180
 msgid "The consistency checks performed on the credential failed."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:182
+#: camel/camel-sasl-gssapi.c:183
 msgid "The referenced credentials have expired."
 msgstr ""
 
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:433
-#: camel/camel-sasl-gssapi.c:188 camel/camel-sasl-gssapi.c:238
-#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:291
+#: 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."
@@ -10240,7 +10111,7 @@ msgstr "來自伺服器的不良許可回應。"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-sasl-gssapi.c:212
+#: camel/camel-sasl-gssapi.c:213
 #, fuzzy, c-format
 msgid "Failed to resolve host `%s': %s"
 msgstr "建立到“%s”的導管失敗： %s"
@@ -10354,35 +10225,35 @@ msgid "Resolving: %s"
 msgstr "解析：%s"
 
 # camel/camel-service.c:575
-#: 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:600
-#: 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:602
-#: 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:548
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
 msgid "Resolving address"
 msgstr "解析位址"
 
 # camel/camel-service.c:600
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
 msgid "Host lookup failed: host not found"
 msgstr "搜尋主機失敗：找不到主機"
 
 # camel/camel-service.c:602
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
 msgid "Host lookup failed: unknown reason"
 msgstr "搜尋主機失敗：不明原因"
 
@@ -10682,7 +10553,7 @@ msgstr ""
 "發照者： %s"
 
 # camel/camel-url.c:289
-#: camel/camel-url.c:289
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "無法分析 URL“%s”"
@@ -10706,26 +10577,26 @@ msgstr "不能複製或移動郵件到虛擬資料夾中"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:261
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "不能刪除資料夾： %s ：無效的操作"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/camel-vee-store.c:281
+#: camel/camel-vee-store.c:280
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "不能刪除資料夾： %s ：沒有這個資料夾"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/camel-vee-store.c:294
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "不能重新命名資料夾： %s ：無效的操作"
 
 # camel/providers/local/camel-local-store.c:237
-#: camel/camel-vee-store.c:302
+#: camel/camel-vee-store.c:301
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "不能重新命名資料夾： %s ：沒有這個資料夾"
@@ -10736,7 +10607,7 @@ msgstr "不能重新命名資料夾： %s ：沒有這個資料夾"
 # camel/providers/imap/camel-imap-command.c:287
 #: 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-command.c:453
 #: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr "作業已取消"
@@ -10772,18 +10643,18 @@ msgid "IMAP command failed: %s"
 msgstr "IMAP 指令失敗： %s"
 
 # camel/providers/imap/camel-imap-command.c:295
-#: 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:487
-#: 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 "IMAP 伺服器的回應沒有包含 %s 資訊"
 
 # camel/providers/imap/camel-imap-command.c:524
-#: 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 伺服器傳回不當的 OK 回應： %s"
@@ -10903,7 +10774,7 @@ msgstr "檢查所有資料夾裡的新郵件"
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: 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 "資料夾"
 
@@ -11237,7 +11108,7 @@ msgstr "無效的郵件內文"
 # camel/providers/local/camel-mh-store.c:90
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -11252,7 +11123,7 @@ 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:168
+#: camel/providers/local/camel-spool-store.c:167
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "資料夾“%s”不存在。"
@@ -11261,7 +11132,7 @@ msgstr "資料夾“%s”不存在。"
 # camel/providers/local/camel-mh-store.c:103
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:173
+#: camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -11294,8 +11165,8 @@ msgstr "不是一個 maildir 目錄"
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:287
-#: camel/providers/local/camel-spool-store.c:317
+#: 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"
@@ -11555,38 +11426,38 @@ msgstr "排程器“%s”不是正規的檔案或目錄"
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: camel/providers/local/camel-spool-store.c:154
+#: camel/providers/local/camel-spool-store.c:153
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "資料夾“%s/%s”不存在。"
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: camel/providers/local/camel-spool-store.c:181
+#: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "“%s”不是 mailbox 檔案。"
 
-#: camel/providers/local/camel-spool-store.c:198
+#: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
 msgstr "儲存並不支援 INBOX"
 
 # camel/providers/local/camel-local-store.c:183
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool mail file %s"
 msgstr "排程郵件檔案 %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "排程資料夾樹狀結構 %s"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
 msgstr "排程資料夾不能重新命名"
 
-#: camel/providers/local/camel-spool-store.c:226
+#: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
 msgstr "排程資料夾不能刪除"
 
@@ -11868,7 +11739,7 @@ msgstr ""
 "傳送密碼時發生錯誤：%s"
 
 # camel/providers/pop3/camel-pop3-store.c:484
-#: camel/providers/pop3/camel-pop3-store.c:623
+#: camel/providers/pop3/camel-pop3-store.c:625
 #, c-format
 msgid "No such folder `%s'."
 msgstr "沒有這個資料夾“%s”。"
@@ -12376,7 +12247,7 @@ msgstr "回覆地址:"
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:521
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "寄件者:"
 
@@ -12384,37 +12255,37 @@ msgstr "寄件者:"
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:527
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "主旨:"
 
 # composer/e-msg-composer-hdrs.c:386
-#: composer/e-msg-composer-hdrs.c:536
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "收件者:"
 
 # composer/e-msg-composer-hdrs.c:387
-#: composer/e-msg-composer-hdrs.c:537
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "輸入郵件的收件者"
 
 # composer/e-msg-composer-hdrs.c:390
-#: composer/e-msg-composer-hdrs.c:540
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "副本:"
 
 # composer/e-msg-composer-hdrs.c:391
-#: 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 "輸入郵件副本的收件者"
 
 # composer/e-msg-composer-hdrs.c:394
-#: composer/e-msg-composer-hdrs.c:544
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "密件副本:"
 
 # composer/e-msg-composer-hdrs.c:395
-#: 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."
@@ -12424,14 +12295,14 @@ msgstr "輸入郵件密件副本的收件者"
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "張貼到:"
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: composer/e-msg-composer-hdrs.c:554
+#: composer/e-msg-composer-hdrs.c:549
 msgid "Posting destination"
 msgstr "張貼的目的端"
 
@@ -12443,12 +12314,12 @@ msgid "Attach file(s)"
 msgstr "附加檔案"
 
 # mail/mail-crypto.c:59
-#: composer/e-msg-composer.c:530
+#: composer/e-msg-composer.c:533
 msgid "Could not create a PGP signature context"
 msgstr "無法建立一個 PGP 簽名文本。"
 
 # composer/e-msg-composer.c:805
-#: composer/e-msg-composer.c:809
+#: composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -12457,35 +12328,35 @@ msgstr ""
 "讀取檔案 %s 時發生錯誤：\n"
 "%s"
 
-#: composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1175
 msgid "File exists, overwrite?"
 msgstr "檔案已存在，覆蓋它？"
 
 # composer/e-msg-composer.c:785
-#: composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1193
 #, c-format
 msgid "Error saving file: %s"
 msgstr "儲存檔案時發生錯誤：%s"
 
 # composer/e-msg-composer.c:805
-#: composer/e-msg-composer.c:1213
+#: composer/e-msg-composer.c:1216
 #, c-format
 msgid "Error loading file: %s"
 msgstr "載入檔案時發生錯誤：%s"
 
 # composer/e-msg-composer.c:785
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "存取檔案時發生錯誤：%s"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
 msgid "Unable to retrieve message from editor"
 msgstr "無法從編輯器取得郵件"
 
 # mail/mail-ops.c:1728
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1269
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -12495,7 +12366,7 @@ msgstr ""
 "%s"
 
 # mail/mail-ops.c:1728
-#: composer/e-msg-composer.c:1270
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -12505,7 +12376,7 @@ msgstr ""
 "%s"
 
 # mail/mail-ops.c:1728
-#: composer/e-msg-composer.c:1279
+#: composer/e-msg-composer.c:1285
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -12515,7 +12386,7 @@ msgstr ""
 "%s"
 
 # mail/mail-ops.c:1755
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1294
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -12525,7 +12396,7 @@ msgstr ""
 " %s"
 
 # importers/pine-importer.c:705
-#: 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?"
@@ -12534,7 +12405,7 @@ msgstr ""
 "是否嘗試將它復原？"
 
 # composer/e-msg-composer.c:941
-#: composer/e-msg-composer.c:1544
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -12545,37 +12416,37 @@ msgstr ""
 "\n"
 "您希望儲存您的變更嗎？"
 
-#: composer/e-msg-composer.c:1549
+#: composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "放棄變更(_D)"
 
 # mail/mail-ops.c:1154
-#: composer/e-msg-composer.c:1553
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "警告：編輯過的郵件"
 
 # composer/e-msg-composer.c:966
-#: composer/e-msg-composer.c:1585
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "開啟檔案"
 
 # mail/mail-config.glade.h:74
-#: composer/e-msg-composer.c:1943
+#: composer/e-msg-composer.c:2015
 msgid "Signature:"
 msgstr "簽名檔:"
 
-#: composer/e-msg-composer.c:1983 mail/mail-account-gui.c:1255
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
 msgid "Autogenerated"
 msgstr "自動產生的"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: 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 "編輯郵件"
 
-#: 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."
@@ -12584,7 +12455,7 @@ msgstr ""
 "無法作用位址選擇器控制元。"
 
 # composer/evolution-composer.c:355
-#: 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"
@@ -12597,7 +12468,7 @@ msgstr ""
 "的 gtkhtml 與 libgtkhtml 。\n"
 
 # composer/evolution-composer.c:355
-#: 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."
@@ -12605,7 +12476,7 @@ msgstr ""
 "無法建立郵件編輯視窗：\n"
 "無法作用 HTML 編輯器元件。"
 
-#: 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>"
@@ -12781,7 +12652,7 @@ msgstr "ping_timeout_callback：無法確定 CORBA 物件是不是存在"
 
 # mail/mail-callbacks.c:1144
 # mail/mail-display.c:96
-#: 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?"
@@ -12789,13 +12660,19 @@ msgstr ""
 "同一名稱的檔案已經存在。\n"
 "是否複蓋該檔案？"
 
+# mail/mail-callbacks.c:1140
+# mail/mail-display.c:92
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "覆蓋檔案？"
+
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
-#: e-util/e-passwords.c:345
+#: 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 "記住這個密碼用於剩餘的工作階段"
 
@@ -13041,7 +12918,7 @@ msgid "File '%s' does not exist or is not a regular file."
 msgstr "排程器“%s”不存在或不是一個合法的檔案。"
 
 # ui/evolution-message-composer.xml.h:12
-#: filter/filter-file.c:293
+#: filter/filter-file.c:298
 msgid "Choose a file"
 msgstr "選擇一個檔案"
 
@@ -13057,7 +12934,7 @@ msgstr "您必須指定一個資料夾。"
 
 # mail/mail-account-gui.c:682
 #: filter/filter-folder.c:243 filter/vfolder-rule.c:408
-#: mail/mail-account-gui.c:1504 mail/mail-account-gui.c:1518
+#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
 msgid "Select Folder"
 msgstr "選擇資料夾"
 
@@ -13071,19 +12948,19 @@ 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 "重要"
 
 #. 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 "工作"
 
 #. 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 "個人"
 
@@ -13091,14 +12968,14 @@ msgstr "個人"
 # mail/message-list.c:1083
 #. 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 "待辦"
 
 # calendar/gui/event-editor-dialog.glade.h:33
 #. 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 "稍後"
 
@@ -13203,7 +13080,7 @@ msgstr "前"
 msgid "months"
 msgstr "月"
 
-#: 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 "秒"
 
@@ -13371,7 +13248,7 @@ msgstr "沒有標幟的"
 
 # addressbook/contact-editor/e-contact-editor.c:1256
 # addressbook/gui/widgets/e-addressbook-view.c:720
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1777
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
 msgid "Label"
 msgstr "標籤"
 
@@ -13438,7 +13315,7 @@ msgstr "傳回小於"
 msgid "Score"
 msgstr "目標"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
 msgid "Sender"
 msgstr "寄件者"
 
@@ -13565,8 +13442,8 @@ msgstr "掃描 %s"
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
 #: 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 "郵件"
@@ -13729,68 +13606,79 @@ msgstr "Pine"
 msgid "Composer Preferences"
 msgstr "郵件編輯器偏好設定"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Evolution 顯示字型的組態控制。"
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "在此設定郵件的偏好設定，包含安全性與訊息的顯示"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
 #: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Evolution 郵件帳號組態控制項。"
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "在此設定拼字檢查、簽名檔與郵件編輯器"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
 #: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Evolution 郵件寄送組態控制。"
+msgid "Configure the fonts used by Evolution here"
+msgstr "在此設定 Evolution 使用的字型"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# ui/evolution-mail.xml.h:19
 #: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Evolution 郵件編輯組態控制。"
+msgid "Configure your email accounts here"
+msgstr "在此設定您的郵件帳號"
 
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
 #: 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/mail-account-editor.c:173
 #: 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 "Evolution 帳號編輯器"
 
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Configure the fonts used by Evolution here"
-msgstr "在此設定 Evolution 使用的字型"
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolution 郵件編輯器。"
 
-# ui/evolution-mail.xml.h:19
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Configure your email accounts here"
-msgstr "在此設定您的郵件帳號"
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolution 郵件編輯器。"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:1
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "用作處理郵件的 Evolution 元件。"
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution 郵件編輯器。"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:9
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution mail composer."
-msgstr "Evolution 郵件編輯器。"
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "郵件組態界面"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
+# mail/GNOME_Evolution_Mail.oaf.in.h:4
 #: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Evolution 郵件執行摘要元件。"
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution 郵件資料夾顯示元件。"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:4
+# mail/GNOME_Evolution_Mail.oaf.in.h:5
 #: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Evolution 郵件資料夾顯示元件。"
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Evolution 郵件資料夾元件工廠。"
 
-# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
 #: mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "Factory for the controls exported by the Evolution Mailer"
-msgstr "用作 Evolution 郵件寄送程式匯出控制元的元件工廠"
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution 郵件執行摘要元件。"
 
 # calendar/gui/event-editor-dialog.glade.h:13
 #: mail/GNOME_Evolution_Mail.server.in.in.h:15
@@ -13806,37 +13694,32 @@ msgstr "郵件帳號"
 msgid "Mail Preferences"
 msgstr "郵件偏好設定"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:9
-#: mail/GNOME_Evolution_Mail.server.in.in.h:18
-msgid "Mail configuration interface"
-msgstr "郵件組態界面"
-
 # mail/folder-browser.c:871
-#: mail/component-factory.c:114
+#: mail/component-factory.c:116
 msgid "Folder containing mail"
 msgstr "資料夾包含郵件"
 
 # calendar/gui/calendar-model.c:360
 # calendar/gui/calendar-model.c:898
 # calendar/gui/e-calendar-table.c:323
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 msgid "Public Mail"
 msgstr "公開郵件"
 
 # mail/folder-browser.c:871
-#: mail/component-factory.c:115
+#: mail/component-factory.c:117
 msgid "Public folder containing mail"
 msgstr "公開資料夾包含郵件"
 
-#: 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 "此資料夾不能包含郵件。"
 
@@ -13844,74 +13727,74 @@ msgstr "此資料夾不能包含郵件。"
 # ui/evolution-mail.xml.h:115
 # ui/evolution-task-editor-dialog.xml.h:83
 # ui/evolution.xml.h:60
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Properties..."
 msgstr "屬性..."
 
 # ui/evolution-mail.xml.h:4
-#: mail/component-factory.c:438
+#: mail/component-factory.c:440
 msgid "Change this folder's properties"
 msgstr "變更這個資料夾的屬性"
 
-#: 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/mail-callbacks.c:202
-#: mail/component-factory.c:991
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "您沒有設定郵件傳送方法"
 
-#: mail/component-factory.c:1015
+#: mail/component-factory.c:1020
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "您有未寄出的郵件，您無論如何都要離開嗎？"
 
 # ui/evolution-mail.xml.h:109
-#: mail/component-factory.c:1055
+#: mail/component-factory.c:1060
 msgid "New Mail Message"
 msgstr "新增郵件"
 
 # ui/evolution-mail.xml.h:109
-#: mail/component-factory.c:1055
+#: mail/component-factory.c:1060
 msgid "_Mail Message"
 msgstr "郵件訊息(_M)"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: mail/component-factory.c:1056
+#: mail/component-factory.c:1061
 msgid "Compose a new mail message"
 msgstr "編輯新的郵件訊息"
 
 # widgets/misc/e-messagebox.c:180
-#: mail/component-factory.c:1064
+#: mail/component-factory.c:1069
 msgid "New Message Post"
 msgstr "張貼新郵件"
 
 # mail/mail-callbacks.c:1407
-#: mail/component-factory.c:1064
+#: mail/component-factory.c:1069
 msgid "_Post Message"
 msgstr "張貼郵件(_P)"
 
 # ui/evolution-mail.xml.h:109
-#: mail/component-factory.c:1065
+#: mail/component-factory.c:1070
 msgid "Post a new mail message"
 msgstr "張貼新的郵件訊息"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: mail/component-factory.c:1348
+#: mail/component-factory.c:1353
 msgid "Connecting..."
 msgstr "正在連線..."
 
 # mail/component-factory.c:410
-#: mail/component-factory.c:1359
+#: mail/component-factory.c:1364
 msgid "Cannot register storage with shell"
 msgstr "不能以此 shell 註冊儲存空間"
 
 # mail/folder-browser-factory.c:196
-#: mail/folder-browser-ui.c:483
+#: mail/folder-browser-ui.c:485
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "“%s” 的屬性"
@@ -13919,106 +13802,106 @@ msgstr "“%s” 的屬性"
 # mail/folder-browser-factory.c:198
 # ui/evolution-event-editor.xml.h:39
 # ui/evolution-task-editor-dialog.xml.h:42
-#: mail/folder-browser-ui.c:485
+#: mail/folder-browser-ui.c:487
 msgid "Properties"
 msgstr "屬性"
 
 # mail/mail-display.c:236
-#: mail/folder-browser.c:326 mail/mail-display.c:391 mail/mail-display.c:939
+#: 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"
 
 # calendar/gui/event-editor.c:1558
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr "%d 新的"
 
-#: mail/folder-browser.c:784 mail/folder-browser.c:792
-#: mail/folder-browser.c:795
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:786
+#: mail/folder-browser.c:787
 #, c-format
 msgid "%d hidden"
 msgstr "%d 隱藏"
 
-#: mail/folder-browser.c:788
+#: mail/folder-browser.c:789
 #, c-format
 msgid "%d visible"
 msgstr "%d 可見的"
 
-#: mail/folder-browser.c:793
+#: mail/folder-browser.c:794
 #, c-format
 msgid "%d selected"
 msgstr "%d 已選擇"
 
 # calendar/gui/event-editor.c:1558
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr "%d 未傳送"
 
 # calendar/gui/event-editor.c:1558
-#: mail/folder-browser.c:800
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d sent"
 msgstr "%d 已傳送"
 
-#: mail/folder-browser.c:802
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr "%d 全部"
 
 # ui/evolution-mail.xml.h:10
-#: mail/folder-browser.c:1166
+#: mail/folder-browser.c:1182
 msgid "Create _Virtual Folder From Search..."
 msgstr "從搜尋建立虛擬資料夾(_V)..."
 
 # mail/folder-browser.c:653
-#: mail/folder-browser.c:1713
+#: mail/folder-browser.c:1729
 msgid "VFolder on _Subject"
 msgstr "從主旨建立虛擬資料夾(_S)"
 
 # mail/folder-browser.c:656
-#: mail/folder-browser.c:1714
+#: mail/folder-browser.c:1730
 msgid "VFolder on Se_nder"
 msgstr "從寄件者建立虛擬資料夾(_N)"
 
 # mail/folder-browser.c:659
-#: mail/folder-browser.c:1715
+#: mail/folder-browser.c:1731
 msgid "VFolder on _Recipients"
 msgstr "從收件者建立虛擬資料夾(_R)"
 
 # mail/folder-browser.c:662
-#: mail/folder-browser.c:1716
+#: mail/folder-browser.c:1732
 msgid "VFolder on Mailing _List"
 msgstr "從郵件清單建立虛擬資料夾(_L)"
 
 # mail/folder-browser.c:668
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1736
 msgid "Filter on Sub_ject"
 msgstr "從主旨建立過濾器(_J)"
 
 # mail/folder-browser.c:671
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1737
 msgid "Filter on Sen_der"
 msgstr "從寄件者建立過濾器(_D)"
 
 # mail/folder-browser.c:674
-#: mail/folder-browser.c:1722
+#: mail/folder-browser.c:1738
 msgid "Filter on Re_cipients"
 msgstr "收件者過濾器(_C)"
 
 # mail/folder-browser.c:677
-#: mail/folder-browser.c:1723 mail/folder-browser.c:2047
+#: mail/folder-browser.c:1739 mail/folder-browser.c:2063
 msgid "Filter on _Mailing List"
 msgstr "從郵件清單建立過濾器(_M)"
 
 # ui/evolution-mail.xml.h:66
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1757
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)..."
 
@@ -14026,34 +13909,34 @@ msgstr "編輯為新郵件(_E)..."
 # ui/evolution-event-editor.xml.h:69
 # ui/evolution-task-editor-dialog.xml.h:82
 # ui/evolution-tasks.xml.h:7
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1759
 msgid "_Print"
 msgstr "列印(_P)"
 
 # mail/folder-browser.c:697
 # ui/evolution-mail.xml.h:117
-#: mail/folder-browser.c:1747 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)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: mail/folder-browser.c:1748 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1764 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
 # mail/folder-browser.c:701
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1766
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: mail/folder-browser.c:1754
+#: mail/folder-browser.c:1770
 msgid "Follo_w Up..."
 msgstr "跟隨(_W)..."
 
@@ -14061,81 +13944,81 @@ msgstr "跟隨(_W)..."
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: mail/folder-browser.c:1755
+#: mail/folder-browser.c:1771
 msgid "Fla_g Completed"
 msgstr "標幟已完成(_G)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: mail/folder-browser.c:1756
+#: mail/folder-browser.c:1772
 msgid "Cl_ear Flag"
 msgstr "清除標幟(_E)"
 
 # mail/folder-browser.c:704
 #. separator here?
-#: mail/folder-browser.c:1760 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 "標示成已閱讀(_K)"
 
 # mail/folder-browser.c:706
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1777
 msgid "Mark as _Unread"
 msgstr "標示成未閱讀(_U)"
 
 # mail/folder-browser.c:706
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1778
 msgid "Mark as _Important"
 msgstr "標示成重要(_I)"
 
 # mail/folder-browser.c:706
-#: mail/folder-browser.c:1763
+#: mail/folder-browser.c:1779
 msgid "_Mark as Unimportant"
 msgstr "標示成不重要(_M)"
 
 # mail/folder-browser.c:717
 # ui/evolution-mail.xml.h:121
-#: mail/folder-browser.c:1768
+#: mail/folder-browser.c:1784
 msgid "U_ndelete"
 msgstr "復原(_N)"
 
 # mail/folder-browser.c:711
-#: mail/folder-browser.c:1772
+#: mail/folder-browser.c:1788
 msgid "Mo_ve to Folder..."
 msgstr "移至資料夾(_V)..."
 
 # mail/folder-browser.c:713
-#: mail/folder-browser.c:1773 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1789 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "複製至資料夾(_C)..."
 
 # addressbook/gui/component/addressbook-config.c:662
-#: mail/folder-browser.c:1781
+#: mail/folder-browser.c:1797
 msgid "Add Sender to Address_book"
 msgstr "新增寄件者到目錄服務(_B)"
 
 # mail/folder-browser.c:727
-#: mail/folder-browser.c:1785
+#: mail/folder-browser.c:1801
 msgid "Appl_y Filters"
 msgstr "套用過濾器(_Y)"
 
 # mail/folder-browser.c:731
-#: mail/folder-browser.c:1789
+#: mail/folder-browser.c:1805
 msgid "Crea_te Rule From Message"
 msgstr "從郵件建立規則(_T)"
 
 # mail/folder-browser.c:871
-#: mail/folder-browser.c:2048
+#: mail/folder-browser.c:2064
 msgid "VFolder on M_ailing List"
 msgstr "郵件清單的虛擬資料夾(_A)"
 
 # mail/folder-browser.c:873
-#: mail/folder-browser.c:2050
+#: mail/folder-browser.c:2066
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "郵件清單的過濾器(%s)(_M)"
 
 # mail/folder-browser.c:874
-#: mail/folder-browser.c:2051
+#: mail/folder-browser.c:2067
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "郵件清單的虛擬資料夾(%s)(_A)"
@@ -14150,25 +14033,41 @@ msgstr "預設值"
 msgid "Getting Folder Information"
 msgstr "取得資料夾資訊"
 
-# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: 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:2
 #: 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/GNOME_Evolution_Mail.oaf.in.h:2
+#: 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/GNOME_Evolution_Mail.oaf.in.h:2
+#: 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
 #: mail/local-config.glade.h:1
@@ -14223,22 +14122,22 @@ msgstr "Evolution 帳號編輯器"
 
 # addressbook/gui/component/addressbook-config.c:401
 # mail/mail-config.glade.h:33
-#: mail/mail-account-gui.c:752 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "主機(_H):"
 
 # mail/mail-config.glade.h:80
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "使用者名稱(_N):"
 
 # addressbook/gui/component/addressbook-config.c:520
 # mail/mail-config.glade.h:53
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
 msgid "_Path:"
 msgstr "路徑(_P):"
 
-#: mail/mail-account-gui.c:1881
+#: mail/mail-account-gui.c:1880
 msgid "You may not create two accounts with the same name."
 msgstr "您不能用相同的名稱建立兩個帳號。"
 
@@ -14255,14 +14154,14 @@ msgstr "不要刪除"
 
 # mail/mail-accounts.c:197
 #: 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 "停用"
 
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
 #: 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 "啟用"
 
@@ -14275,7 +14174,7 @@ msgstr "[預設值]"
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
 #: 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 "已啟用"
 
@@ -14335,12 +14234,12 @@ msgstr ""
 
 # widgets/misc/e-messagebox.c:224
 #. 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:93
-#: 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"
@@ -14353,7 +14252,7 @@ msgstr ""
 "是否現在設定？"
 
 # mail/mail-callbacks.c:146
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:211
 msgid ""
 "You need to configure an account\n"
 "before you can compose mail."
@@ -14362,7 +14261,7 @@ msgstr ""
 "才可以開始撰寫郵件。"
 
 # mail/mail-callbacks.c:146
-#: mail/mail-callbacks.c:227
+#: mail/mail-callbacks.c:225
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -14371,7 +14270,7 @@ msgstr ""
 "才可以開始撰寫郵件。"
 
 # mail/mail-callbacks.c:158
-#: mail/mail-callbacks.c:234
+#: mail/mail-callbacks.c:232
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -14380,7 +14279,7 @@ msgstr ""
 "才可以開始撰寫郵件。"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:256
+#: 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"
@@ -14390,12 +14289,12 @@ msgstr ""
 
 # calendar/gui/event-editor-dialog.glade.h:23
 # calendar/gui/event-editor.c:1594
-#: mail/mail-callbacks.c:268
+#: mail/mail-callbacks.c:266
 msgid "Send anyway?"
 msgstr "無論如何都傳送？"
 
 # mail/mail-callbacks.c:235
-#: mail/mail-callbacks.c:289
+#: mail/mail-callbacks.c:287
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -14403,18 +14302,18 @@ msgstr ""
 "郵件上沒有主旨。\n"
 "是否仍然將郵件送出？"
 
-#: mail/mail-callbacks.c:315
+#: 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:319
+#: mail/mail-callbacks.c:317
 msgid "This message contains only Bcc recipients."
 msgstr "這個郵件只包含密件副本收件者。"
 
-#: 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"
@@ -14424,12 +14323,12 @@ msgstr ""
 "無論如何都要傳送嗎？"
 
 # mail/mail-callbacks.c:308
-#: mail/mail-callbacks.c:472
+#: mail/mail-callbacks.c:470
 msgid "You must specify recipients in order to send this message."
 msgstr "您必須指定收件者才可送出郵件。"
 
 # composer/e-msg-composer.c:877
-#: mail/mail-callbacks.c:724
+#: 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?"
@@ -14439,32 +14338,32 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: mail/mail-callbacks.c:1189
+#: mail/mail-callbacks.c:1187
 msgid "an unknown sender"
 msgstr "不明的寄件者"
 
-#: mail/mail-callbacks.c:1193
+#: 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:850
-#: mail/mail-callbacks.c:1700 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:852
-#: mail/mail-callbacks.c:1702 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:1017
-#: mail/mail-callbacks.c:2346
+#: mail/mail-callbacks.c:2344
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "您確定要編輯全部 %d 封郵件？"
 
 # mail/mail-callbacks.c:1039
-#: mail/mail-callbacks.c:2362
+#: mail/mail-callbacks.c:2360
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -14473,7 +14372,7 @@ msgstr ""
 "草稿資料夾內的郵件。"
 
 # mail/mail-callbacks.c:1073
-#: mail/mail-callbacks.c:2395
+#: mail/mail-callbacks.c:2393
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -14482,13 +14381,13 @@ msgstr ""
 "內的郵件重傳。"
 
 # mail/mail-callbacks.c:1085
-#: mail/mail-callbacks.c:2405
+#: mail/mail-callbacks.c:2403
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "您確定要重新傳送全部 %d 封郵件？"
 
 # mail/mail-callbacks.c:1106
-#: mail/mail-callbacks.c:2426
+#: mail/mail-callbacks.c:2424
 msgid "No Message Selected"
 msgstr "沒有選定郵件"
 
@@ -14499,7 +14398,7 @@ msgstr "沒有選定郵件"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: mail/mail-callbacks.c:2467
+#: mail/mail-callbacks.c:2465
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -14508,7 +14407,7 @@ msgstr ""
 "無法儲存到“%s”\n"
 " %s"
 
-#: mail/mail-callbacks.c:2472
+#: mail/mail-callbacks.c:2470
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -14518,16 +14417,16 @@ msgstr ""
 "您是否要複蓋它？"
 
 # mail/mail-callbacks.c:1188
-#: mail/mail-callbacks.c:2513
+#: mail/mail-callbacks.c:2511
 msgid "Save Message As..."
 msgstr "另存郵件..."
 
 # mail/mail-callbacks.c:1190
-#: mail/mail-callbacks.c:2515
+#: mail/mail-callbacks.c:2513
 msgid "Save Messages As..."
 msgstr "另存郵件..."
 
-#: mail/mail-callbacks.c:2689
+#: 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"
@@ -14540,7 +14439,7 @@ msgstr ""
 "確定清除這些郵件？"
 
 # mail/mail-callbacks.c:1349
-#: mail/mail-callbacks.c:2784
+#: mail/mail-callbacks.c:2782
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -14551,60 +14450,60 @@ msgstr ""
 
 # importers/netscape-importer.c:795
 # mail/mail-callbacks.c:1359
-#: mail/mail-callbacks.c:2792
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "過濾器"
 
 # camel/camel-filter-driver.c:748
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:2831
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d / %d 頁"
 
 # mail/mail-callbacks.c:1407
-#: mail/mail-callbacks.c:2889
+#: mail/mail-callbacks.c:2887
 msgid "Print Message"
 msgstr "列印郵件"
 
 # mail/mail-callbacks.c:1454
-#: mail/mail-callbacks.c:2956
+#: mail/mail-callbacks.c:2954
 msgid "Printing of message failed"
 msgstr "列印郵件失敗"
 
 # mail/mail-callbacks.c:1549
-#: mail/mail-callbacks.c:3148
+#: mail/mail-callbacks.c:3147
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "您確定要用新視窗開啟全部 %d 封郵件？"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: mail/mail-composer-prefs.c:225 mail/mail-composer-prefs.c:328
-#: mail/mail-config.c:1218
+#: 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:313
+#: mail/mail-composer-prefs.c:335
 msgid "You must specify a valid script name."
 msgstr "您必須指定一個有效的命令稿名稱。"
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: 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 "[命令稿]"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
-#: mail/mail-composer-prefs.c:840
+#: mail/mail-composer-prefs.c:864
 msgid "Language(s)"
 msgstr "語言"
 
-#: mail/mail-composer-prefs.c:882
+#: mail/mail-composer-prefs.c:906
 msgid "Add script signature"
 msgstr "新增命令稿簽名檔"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-composer-prefs.c:902
+#: mail/mail-composer-prefs.c:926
 msgid "Signature(s)"
 msgstr "簽名檔"
 
@@ -14675,13 +14574,13 @@ msgstr ""
 "理為一個 Evolution 郵件帳號。現請在下面的空白處為這個帳號輸入一個名稱。這個名"
 "稱僅用作顯示用途。"
 
-#: mail/mail-config.c:922
+#: mail/mail-config.c:994
 msgid "Checking Service"
 msgstr "檢查服務"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: mail/mail-config.c:1000 mail/mail-config.c:1004
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
 msgid "Connecting to server..."
 msgstr "正在連線至伺服器..."
 
@@ -14976,25 +14875,27 @@ msgstr "郵件編輯器"
 msgid "Message Display"
 msgstr "郵件顯示"
 
+# addressbook/gui/component/addressbook.c:619
 #: 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:40
-#: 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:47
 #: mail/mail-config.glade.h:81
 msgid "Optional Information"
@@ -15269,127 +15170,133 @@ msgstr "當新郵件到達時不要通知我(_D)"
 msgid "_Enable"
 msgstr "啟用(_E)"
 
-#: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr "固定寬度(_F):"
-
 # ui/evolution-mail.xml.h:34
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:152
 msgid "_Forward style:"
 msgstr "轉寄方式(_F):"
 
 # mail/mail-config.glade.h:31
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid "_Full name:"
 msgstr "全名(_F):"
 
 # mail/mail-config.glade.h:36
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
 msgid "_HTML Mail"
 msgstr "_HTML 格式郵件"
 
 # mail/mail-config.glade.h:35
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "_Identity"
 msgstr "身分(_I)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "如果寄件者在目錄服務中就載入影像(_L)"
 
 # mail/mail-config.glade.h:41
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "設為我的預設帳號(_M)"
 
 # ui/evolution-mail.xml.h:51
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "標示郵件為稍後閱讀(_M)"
 
 # addressbook/gui/component/addressbook-config.c:686
 # mail/mail-config.glade.h:43
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "名稱(_N):"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Never load images off the net"
 msgstr "永遠不自網路下載影像(_N)"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Play sound file when new mail arrives"
 msgstr "當新郵件到達時播放聲音檔案(_P)"
 
 # ui/evolution-mail.xml.h:14
-#: 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 "當傳送 HTML 郵件給不想收到 HTML 郵件的連絡人時顯示提示(_P)"
 
 # ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "當傳送沒有主旨的郵件時顯示提示(_P)"
 
 # mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 msgid "_Receiving Mail"
 msgstr "接收郵件(_R)"
 
 # mail/message-browser.c:191
 # ui/evolution-mail.xml.h:71
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "回覆方式(_R):"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Restore defaults"
 msgstr "還原預設值(_R)"
 
 # ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "命令稿(_S):"
 
 # mail/mail-config.glade.h:66
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "傳送郵件(_S)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "顯示動畫影像(_S)"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "簽名檔(_S)"
 
-# mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "桑波恩"
+
+# addressbook/gui/component/addressbook-storage.c:99
 #: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "原本的連絡人:"
+
+# mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "使用安全連線 (SSL)(_U):"
 
-# mail/mail-accounts.c:197
-#: mail/mail-config.glade.h:176
-msgid "_Variable-width:"
-msgstr "可變寬度(_V):"
+#: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_every"
 msgstr "每(_E)"
 
 # mail/mail-config.glade.h:2
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "color"
 msgstr "顏色"
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "description"
 msgstr "描述"
 
@@ -15429,12 +15336,6 @@ msgstr ""
 "檔案“%s”已經存在。\n"
 "是否複蓋該檔案？"
 
-# mail/mail-callbacks.c:1140
-# mail/mail-display.c:92
-#: mail/mail-display.c:196
-msgid "Overwrite file?"
-msgstr "覆蓋檔案？"
-
 # mail/mail-display.c:196
 #: mail/mail-display.c:333
 msgid "Save Attachment"
@@ -15499,23 +15400,23 @@ msgid "by %B %d, %Y, %l:%M %P"
 msgstr "by %B %d, %Y, %l:%M %P"
 
 # mail/mail-display.c:1256
-#: mail/mail-display.c:2234
+#: mail/mail-display.c:2240
 msgid "Open Link in Browser"
 msgstr "在瀏覽器內開啟連結"
 
 # ui/evolution-event-editor.xml.h:14
 # ui/evolution-task-editor-dialog.xml.h:15
-#: mail/mail-display.c:2235
+#: mail/mail-display.c:2241
 msgid "Copy Link Location"
 msgstr "複製連結位址"
 
 # ui/evolution-message-composer.xml.h:21
-#: mail/mail-display.c:2237
+#: mail/mail-display.c:2243
 msgid "Save Link as (FIXME)"
 msgstr "另存目標(FIXME)"
 
 # mail/mail-callbacks.c:1188
-#: mail/mail-display.c:2239
+#: mail/mail-display.c:2245
 msgid "Save Image as..."
 msgstr "另存圖片..."
 
@@ -16054,18 +15955,18 @@ msgid "Name:"
 msgstr "名稱:"
 
 # mail/mail-tools.c:219
-#: mail/mail-tools.c:267
+#: mail/mail-tools.c:269
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "轉寄的郵件 - %s"
 
 # mail/mail-ops.c:1154
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 msgid "Forwarded message"
 msgstr "轉寄的郵件"
 
 # mail/mail-ops.c:1154
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:431
 msgid "Forwarded Message"
 msgstr "轉寄的郵件"
 
@@ -16097,7 +15998,7 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: mail/mail-vfolder.c:777 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "虛擬資料夾"
 
@@ -16122,12 +16023,12 @@ msgid "New VFolder"
 msgstr "新增虛擬資料夾"
 
 # views/mail/galview.xml.h:3
-#: mail/message-browser.c:219
+#: mail/message-browser.c:224
 msgid "(No subject)"
 msgstr "(沒有主旨)"
 
 # widgets/misc/e-messagebox.c:180
-#: mail/message-browser.c:221
+#: mail/message-browser.c:226
 #, c-format
 msgid "%s - Message"
 msgstr "%s - 郵件"
@@ -16178,37 +16079,37 @@ msgid "Highest"
 msgstr "最高"
 
 # mail/message-list.c:941
-#: mail/message-list.c:1076
+#: mail/message-list.c:1080
 msgid "?"
 msgstr "？"
 
 # mail/message-list.c:948
-#: mail/message-list.c:1083
+#: mail/message-list.c:1087
 msgid "Today %l:%M %p"
 msgstr "今天 %l:%M %p"
 
 # mail/message-list.c:957
-#: mail/message-list.c:1092
+#: mail/message-list.c:1096
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %l:%M %p"
 
 # mail/message-list.c:969
-#: mail/message-list.c:1104
+#: mail/message-list.c:1108
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
 # mail/message-list.c:977
-#: 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:979
-#: mail/message-list.c:1114
+#: mail/message-list.c:1118
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 # mail/mail-local.c:905
-#: mail/message-list.c:2602
+#: mail/message-list.c:2614
 msgid "Generating message list"
 msgstr "產生郵件清單"
 
@@ -16332,13 +16233,13 @@ msgid "_Flag:"
 msgstr "標幟(_F):"
 
 # mail/mail-ops.c:992
-#: mail/subscribe-dialog.c:232
+#: mail/subscribe-dialog.c:233
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "掃描 %s 裡的資料夾於“%s”"
 
 # mail/mail-ops.c:992
-#: mail/subscribe-dialog.c:234
+#: mail/subscribe-dialog.c:235
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "掃描“%s”上管理者層級的資料夾"
@@ -16357,29 +16258,24 @@ msgstr "取消訂閱至資料夾 “%s”"
 
 # mail/subscribe-dialog.c:76
 # shell/e-storage-set-view.c:48
-#: mail/subscribe-dialog.c:1272 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 "資料夾"
 
 # ui/evolution-message-composer.xml.h:22
-#: mail/subscribe-dialog.c:1429
+#: mail/subscribe-dialog.c:1389
 msgid "Scanning folders..."
 msgstr "掃描資料夾..."
 
-#: mail/subscribe-dialog.c:1551
+#: mail/subscribe-dialog.c:1503
 msgid "No server has been selected"
 msgstr "尚未選擇伺服器"
 
-#: mail/subscribe-dialog.c:1626
+#: mail/subscribe-dialog.c:1602
 msgid "Please select a server."
 msgstr "請選擇一個伺服器。"
 
-# shell/e-shell-importer.c:601
-#: mail/subscribe-dialog.glade.h:4
-msgid "All folders"
-msgstr "全部資料夾"
-
 # calendar/gui/dialogs/alarm-notify.glade.h:1
 # ui/evolution-contact-editor.xml.h:1
 # ui/evolution-event-editor.xml.h:10
@@ -16387,7 +16283,7 @@ msgstr "全部資料夾"
 # ui/evolution-subscribe.xml.h:2
 # ui/evolution-task-editor-dialog.xml.h:11
 # ui/evolution.xml.h:5
-#: 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
@@ -16396,55 +16292,55 @@ msgstr "全部資料夾"
 msgid "Close"
 msgstr "關閉"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: 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.c:873
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:4
 msgid "Manage Subscriptions"
 msgstr "管理訂閱"
 
 # ui/evolution-subscribe.xml.h:4
-#: 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/mail-account-gui.c:682
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:6
 msgid "S_elect server: "
 msgstr "選擇伺服器(_E): "
 
 # ui/evolution-subscribe.xml.h:8
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:7
 msgid "_Subscribe"
 msgstr "訂閱(_S)"
 
 # ui/evolution-subscribe.xml.h:9
-#: mail/subscribe-dialog.glade.h:12
+#: mail/subscribe-dialog.glade.h:8
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
 #: 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 摘要的外觀"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Summary"
+msgstr "Evolution 摘要元件。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
-msgid "Evolution Summary component."
+#, fuzzy
+msgid "Evolution Summary component"
 msgstr "Evolution 摘要元件。"
 
-# calendar/gui/gnome-cal.c:234
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Summary configuration control"
+msgstr "Evolution 摘要元件。"
+
+# calendar/gui/gnome-cal.c:234
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
 msgid "Summary Preferences"
 msgstr "摘要偏好設定"
 
@@ -27278,13 +27174,12 @@ msgid "No description"
 msgstr "沒有描述"
 
 # calendar/gui/e-calendar-table.c:159
-#: my-evolution/e-summary-mail.c:156
+#: my-evolution/e-summary-mail.c:188
 msgid "Mail summary"
 msgstr "郵件摘要"
 
 # mail/mail-config.glade.h:76
-#: 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 "本機資料夾"
 
@@ -27305,13 +27200,13 @@ msgid "Enter the URL of the news feed you wish to add"
 msgstr "輸入您希望新增新聞發送伺服器網址"
 
 # shell/e-shell-importer.c:404
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
 msgid "Error downloading RDF"
 msgstr "下載 RDF 時發生錯誤"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: my-evolution/e-summary-rdf.c:447
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr "新聞發送伺服器"
 
@@ -27335,14 +27230,14 @@ msgid "Shown"
 msgstr "顯示"
 
 # ui/evolution-tasks.xml.h:3
-#: my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:329
 msgid "No tasks"
 msgstr "無工作"
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: my-evolution/e-summary-tasks.c:371
+#: my-evolution/e-summary-tasks.c:365
 msgid "(No Description)"
 msgstr "(沒有描述)"
 
@@ -27350,12 +27245,12 @@ 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 "下載此資料時發生錯誤"
 
 # calendar/gui/event-editor-dialog.glade.h:33
-#: my-evolution/e-summary-weather.c:490
+#: my-evolution/e-summary-weather.c:480
 msgid "Weather"
 msgstr "天氣"
 
@@ -27363,13 +27258,13 @@ 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:594
+#: my-evolution/e-summary-weather.c:584
 msgid "KBOS"
 msgstr "RCSS:VHHH"
 
 # widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
 # widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-#: my-evolution/e-summary.c:197
+#: my-evolution/e-summary.c:198
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
@@ -27378,12 +27273,12 @@ msgid "Please wait..."
 msgstr "請稍候..."
 
 # calendar/gui/e-calendar-table.c:159
-#: my-evolution/e-summary.c:591 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "列印摘要"
 
 # mail/mail-callbacks.c:1454
-#: my-evolution/e-summary.c:625
+#: my-evolution/e-summary.c:623
 msgid "Printing of Summary failed"
 msgstr "列印摘要失敗"
 
@@ -28728,22 +28623,23 @@ msgid "_Weather"
 msgstr "天氣(_W)"
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configuration control for Evolution folder settings."
-msgstr "Evolution 資料夾設定的組態控制。"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Configure special folders and offline folder behavior here"
 msgstr "在此設定特殊資料夾與離線資料夾的行為"
 
-# ui/evolution-mail.xml.h:110
+# shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution shell。"
+
 #: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Folder Settings"
-msgstr "資料夾設定"
+msgid "Evolution folder settings configuration control"
+msgstr ""
 
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
+# ui/evolution-mail.xml.h:110
 #: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "The Evolution shell."
-msgstr "Evolution shell。"
+msgid "Folder Settings"
+msgstr "資料夾設定"
 
 # addressbook/contact-editor/contact-editor.glade.h:8
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
@@ -28784,8 +28680,8 @@ msgid "Drafts"
 msgstr "草稿"
 
 # mail/local-config.glade.h:8
-#: 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 "收件匣"
 
@@ -28799,12 +28695,12 @@ msgid "Sent"
 msgstr "傳送"
 
 # shell/e-setup.c:163
-#: shell/e-setup.c:147
+#: shell/e-setup.c:146
 msgid "Could not update files correctly"
 msgstr "無法正確地更新檔案"
 
 # shell/e-setup.c:215
-#: shell/e-setup.c:168
+#: shell/e-setup.c:167
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -28816,7 +28712,7 @@ msgstr ""
 "錯誤：%s"
 
 # composer/e-msg-composer.c:1165
-#: shell/e-setup.c:179
+#: shell/e-setup.c:178
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -28825,42 +28721,8 @@ msgstr ""
 "複製資料夾到“%s”時\n"
 "發生錯誤。"
 
-# camel/camel-session.c:479
-#: shell/e-setup.c:244
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Evolution 無法建立目錄\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 ""
-"目錄 %s\n"
-"沒有正確的權限，請將它\n"
-"設為可讀、可執行並重新啟動 Evolution 。"
-
-#: 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 ""
-"檔案 %s\n"
-"應該被移除以便 Evolution 能正確工作。\n"
-"請移除此檔案並重新啟動 Evolution 。"
-
 # shell/e-setup.c:255
-#: shell/e-setup.c:291
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -28872,7 +28734,7 @@ msgstr ""
 "以便 Evolution 能夠安裝使用者檔案。"
 
 # shell/e-setup.c:267
-#: shell/e-setup.c:300
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -28914,55 +28776,55 @@ msgstr "自動補齊資料夾"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: shell/e-shell-folder-commands.c:141
+#: shell/e-shell-folder-commands.c:140
 #, c-format
 msgid "Cannot copy folder: %s"
 msgstr "不能複製資料夾：%s"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
 #, c-format
 msgid "Cannot move folder: %s"
 msgstr "不能移動資料夾：%s"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: shell/e-shell-folder-commands.c:189
+#: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
 msgstr "不能將資料夾移動到它自己。"
 
 # shell/e-setup.c:230
-#: 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”進去的資料夾："
 
 # ui/evolution.xml.h:7
-#: 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 "移動資料夾"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: shell/e-shell-folder-commands.c:392
+#: shell/e-shell-folder-commands.c:391
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -28973,7 +28835,7 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: shell/e-shell-folder-commands.c:406
+#: shell/e-shell-folder-commands.c:405
 #, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "確定要刪除資料夾“%s”？"
@@ -28989,14 +28851,14 @@ msgstr "確定要刪除資料夾“%s”？"
 # ui/evolution-event-editor.xml.h:17
 # ui/evolution-mail.xml.h:22
 # ui/evolution-task-editor-dialog.xml.h:18
-#: shell/e-shell-folder-commands.c:413
+#: shell/e-shell-folder-commands.c:412
 #, c-format
 msgid "Delete \"%s\""
 msgstr "刪除“%s”"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: shell/e-shell-folder-commands.c:486
+#: shell/e-shell-folder-commands.c:485
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -29007,31 +28869,31 @@ msgstr ""
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: shell/e-shell-folder-commands.c:535
+#: shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "重新命名資料夾“%s”為："
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: shell/e-shell-folder-commands.c:541
+#: shell/e-shell-folder-commands.c:540
 msgid "Rename folder"
 msgstr "重新命名資料夾"
 
 # shell/e-shell-folder-creation-dialog.c:156
-#: 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 "指定的資料夾名稱不合法： %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 "選擇的資料夾不屬於其他使用者"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:586
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -29041,7 +28903,7 @@ msgstr ""
 "%s"
 
 # shell/e-shell-folder-creation-dialog.c:99
-#: 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"
@@ -29051,13 +28913,13 @@ msgstr ""
 "%s"
 
 # ui/evolution.xml.h:8
-#: shell/e-shell-folder-creation-dialog.c:307
+#: shell/e-shell-folder-creation-dialog.c:308
 msgid "Create New Folder"
 msgstr "建立新資料夾"
 
 # shell/e-shell-folder-title-bar.c:459
 # shell/e-shell-folder-title-bar.c:460
-#: 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 "(未命名)"
 
@@ -29101,7 +28963,7 @@ msgstr "選擇匯入服務"
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "檔案 %s 不存在"
@@ -29109,13 +28971,13 @@ msgstr "檔案 %s 不存在"
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: 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 錯誤"
 
 # shell/e-shell-importer.c:353
-#: 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"
@@ -29125,12 +28987,12 @@ msgstr ""
 "%s"
 
 # shell/e-shell-importer.c:363
-#: shell/e-shell-importer.c:517
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "匯入中"
 
 # shell/e-shell-importer.c:371
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -29140,19 +29002,19 @@ msgstr ""
 "正在啟動 %s"
 
 # shell/e-shell-importer.c:384
-#: shell/e-shell-importer.c:536
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "啟動 %s 時發生錯誤"
 
 # shell/e-shell-importer.c:404
-#: shell/e-shell-importer.c:550
+#: shell/e-shell-importer.c:551
 #, c-format
 msgid "Error loading %s"
 msgstr "載入 %s 時發生錯誤"
 
 # shell/e-shell-importer.c:419
-#: shell/e-shell-importer.c:567
+#: shell/e-shell-importer.c:568
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -29162,36 +29024,36 @@ msgstr ""
 "正在匯入項目 1。"
 
 # shell/e-shell-importer.c:490
-#: shell/e-shell-importer.c:621
+#: shell/e-shell-importer.c:622
 msgid "Automatic"
 msgstr "自動"
 
 # shell/e-shell-importer.c:540
-#: shell/e-shell-importer.c:670
+#: shell/e-shell-importer.c:671
 msgid "Filename:"
 msgstr "檔案名稱:"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: shell/e-shell-importer.c:675
+#: shell/e-shell-importer.c:676
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
 # shell/e-shell-importer.c:555
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:685
 msgid "File type:"
 msgstr "檔案類型:"
 
-#: shell/e-shell-importer.c:709
+#: shell/e-shell-importer.c:710
 msgid "Import data and settings from older programs"
 msgstr "從舊程式匯入資料與設定"
 
 # ui/evolution.xml.h:21
-#: shell/e-shell-importer.c:713
+#: shell/e-shell-importer.c:714
 msgid "Import a single file"
 msgstr "匯入單一檔案"
 
-#: 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"
@@ -29199,23 +29061,23 @@ msgstr ""
 "請稍候...\n"
 "正在掃描現存的設定"
 
-#: shell/e-shell-importer.c:782
+#: shell/e-shell-importer.c:783
 msgid "Starting Intelligent Importers"
 msgstr "啟動智慧型匯入服務"
 
 # composer/e-msg-composer-hdrs.c:355
-#: 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 "來自 %s："
 
 # shell/e-shell-importer.c:601
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
 msgid "Select folder"
 msgstr "選擇資料夾"
 
 # shell/e-shell-importer.c:602
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
 msgid "Select a destination folder for importing this data"
 msgstr "選擇用來匯入這些資料的目的資料夾"
 
@@ -29224,12 +29086,12 @@ msgstr "選擇用來匯入這些資料的目的資料夾"
 # importers/pine-importer.c:646
 # shell/e-shell-importer.c:653
 # shell/importer/import.glade.h:4
-#: 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 "匯入"
 
 # shell/e-shell-offline-handler.c:554
-#: shell/e-shell-offline-handler.c:588
+#: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
 msgstr "關閉連線..."
 
@@ -29258,7 +29120,7 @@ msgstr "正在同步“%s” (%d / %d) ..."
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:345
 msgid "Evolution Settings"
 msgstr "Evolution 設定值"
 
@@ -29399,31 +29261,31 @@ msgstr "離線工作"
 msgid "(No folder displayed)"
 msgstr "(沒有資料夾顯示)"
 
-#: shell/e-shell-view.c:2054
+#: shell/e-shell-view.c:2045
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
 # shell/e-storage.c:178
-#: shell/e-shell-view.c:2056
+#: shell/e-shell-view.c:2047
 msgid "(None)"
 msgstr "(沒有)"
 
-#: 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 目前為線上工作。按這裡改為離線工作。"
 
-#: 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 現正離線中。"
 
-#: 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 "Ximian Evolution 目前是離線工作。按這裡改為線上工作。"
 
-#: shell/e-shell.c:176
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -29435,12 +29297,12 @@ msgstr ""
 "%s"
 
 # shell/e-shell.c:392
-#: shell/e-shell.c:738
+#: shell/e-shell.c:741
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "無法設定本地端的儲存空間 -- %s"
 
-#: shell/e-shell.c:1810
+#: shell/e-shell.c:1802
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -29453,20 +29315,20 @@ msgstr ""
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: shell/e-shell.c:2075
+#: shell/e-shell.c:2067
 msgid "Invalid arguments"
 msgstr "無效的參數"
 
-#: shell/e-shell.c:2077
+#: shell/e-shell.c:2069
 msgid "Cannot register on OAF"
 msgstr "不能於 OAF 註冊"
 
-#: shell/e-shell.c:2079
+#: shell/e-shell.c:2071
 msgid "Configuration Database not found"
 msgstr "找不到組態資料庫"
 
 # shell/e-storage.c:461
-#: shell/e-shell.c:2081 shell/e-storage.c:572
+#: shell/e-shell.c:2073 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "一般錯誤"
 
@@ -29718,7 +29580,7 @@ msgstr "<按這裏選擇資料夾>"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: shell/evolution-shell-component-utils.c:123
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -29729,7 +29591,7 @@ msgstr ""
 "\n"
 "不明的錯誤。"
 
-#: shell/evolution-shell-component-utils.c:126
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -29742,7 +29604,7 @@ msgstr ""
 "來自元件系統的錯誤為：\n"
 "%s"
 
-#: shell/evolution-shell-component-utils.c:133
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -29756,21 +29618,21 @@ msgstr ""
 "%s"
 
 # shell/e-storage.c:467
-#: shell/evolution-shell-component.c:1164
+#: shell/evolution-shell-component.c:1182
 msgid "CORBA error"
 msgstr "CORBA 錯誤"
 
-#: shell/evolution-shell-component.c:1166
+#: shell/evolution-shell-component.c:1184
 msgid "Interrupted"
 msgstr "已中斷"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: shell/evolution-shell-component.c:1168
+#: shell/evolution-shell-component.c:1186
 msgid "Invalid argument"
 msgstr "無效的參數"
 
-#: shell/evolution-shell-component.c:1170
+#: shell/evolution-shell-component.c:1188
 msgid "Already has an owner"
 msgstr "已經有擁有者"
 
@@ -29788,55 +29650,55 @@ msgstr "已經有擁有者"
 # widgets/misc/e-dateedit.c:432
 # widgets/misc/e-dateedit.c:1341
 # widgets/misc/e-dateedit.c:1456
-#: shell/evolution-shell-component.c:1172
+#: shell/evolution-shell-component.c:1190
 msgid "No owner"
 msgstr "沒有擁有者"
 
 # calendar/gui/calendar-commands.c:266
-#: shell/evolution-shell-component.c:1174
+#: shell/evolution-shell-component.c:1192
 msgid "Not found"
 msgstr "找不到"
 
 # mail/mail-config.glade.h:1
-#: shell/evolution-shell-component.c:1176
+#: shell/evolution-shell-component.c:1194
 msgid "Unsupported type"
 msgstr "不支援的類型"
 
-#: shell/evolution-shell-component.c:1178
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported schema"
 msgstr "不支援的基模"
 
 # mail/mail-session.c:161
-#: shell/evolution-shell-component.c:1180
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported operation"
 msgstr "不支援的操作"
 
 # shell/e-storage.c:467
-#: shell/evolution-shell-component.c:1182
+#: shell/evolution-shell-component.c:1200
 msgid "Internal error"
 msgstr "內部錯誤"
 
-#: shell/evolution-shell-component.c:1186
+#: shell/evolution-shell-component.c:1204
 msgid "Exists"
 msgstr "存在"
 
 # mail/mail-config.glade.h:37
-#: shell/evolution-shell-component.c:1188
+#: shell/evolution-shell-component.c:1206
 msgid "Invalid URI"
 msgstr "無效的 URI"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: shell/evolution-shell-component.c:1192
+#: shell/evolution-shell-component.c:1210
 msgid "Has subfolders"
 msgstr "有子資料夾"
 
 # mail/mail-callbacks.c:1106
-#: shell/evolution-shell-component.c:1194
+#: shell/evolution-shell-component.c:1212
 msgid "No space left"
 msgstr "沒有剩餘空間"
 
-#: shell/evolution-shell-component.c:1196
+#: shell/evolution-shell-component.c:1214
 msgid "Old owner has died"
 msgstr "舊的擁有者已死亡"
 
@@ -29858,10 +29720,6 @@ msgstr "按“確定”關閉這些連線以離線"
 msgid "The following connections are currently active:"
 msgstr "以下是目前接通的連線："
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "dialog1"
-msgstr ""
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
 #: shell/glade/e-shell-config-default-folders.glade.h:1
@@ -30033,17 +29891,17 @@ msgstr "Evolution 可以自下列檔案匯入資料："
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: shell/main.c:109 shell/main.c:506
+#: shell/main.c:112 shell/main.c:564
 msgid "Evolution"
 msgstr "Evolution"
 
 # ui/evolution.xml.h:17
-#: shell/main.c:115
+#: shell/main.c:118
 msgid "Evolution is now exiting ..."
 msgstr "Evolution 正在關閉..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:216
+#: shell/main.c:266
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -30081,7 +29939,7 @@ msgstr ""
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: shell/main.c:240
+#: shell/main.c:290
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -30092,44 +29950,48 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: shell/main.c:248
+#: shell/main.c:298
 msgid "Don't tell me again"
 msgstr "不要再顯示這個訊息"
 
 # shell/main.c:138
-#: shell/main.c:335
+#: shell/main.c:387
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "不能存取 Ximian Evolution shell。"
 
 # shell/main.c:138
-#: shell/main.c:344
+#: shell/main.c:396
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "不能初始化 Ximian Evolution shell： %s"
 
 # shell/main.c:184
-#: shell/main.c:476
+#: shell/main.c:528
 msgid "Disable splash screen"
 msgstr "停用顯著效果螢幕"
 
-#: shell/main.c:478
+#: shell/main.c:530
 msgid "Start in offline mode"
 msgstr "以離線模式啟動"
 
-#: shell/main.c:480
+#: shell/main.c:532
 msgid "Start in online mode"
 msgstr "以線上模式啟動"
 
+#: shell/main.c:535
+msgid "Forcibly shut down all evolution components"
+msgstr ""
+
 # shell/main.c:185
-#: shell/main.c:482
+#: shell/main.c:538
 msgid "Send the debugging output of all components to a file."
 msgstr "將全部元件的除錯輸出資料傳送至一個檔案。"
 
-#: shell/main.c:485
+#: shell/main.c:541
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr "強迫升級 Evolution 1.0.x 的組態檔案"
 
-#: shell/main.c:510
+#: shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -30140,7 +30002,6 @@ msgstr ""
 
 # composer/e-msg-composer.c:805
 #: tools/evolution-addressbook-abuse.c:81
-#: tools/evolution-addressbook-export.c:41
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "載入預設目錄服務時發生錯誤"
@@ -30151,10 +30012,6 @@ msgstr "載入預設目錄服務時發生錯誤"
 msgid "Input File"
 msgstr "輸入檔案"
 
-#: tools/evolution-addressbook-export.c:51
-msgid "Output File"
-msgstr "輸出檔案"
-
 # camel/camel-pgp-context.c:1073
 #: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
@@ -30188,6 +30045,20 @@ msgstr ""
 msgid "Default subject for the message."
 msgstr ""
 
+# camel/providers/local/camel-mbox-summary.c:655
+#. 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-mail.xml.h:9
 #: ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
@@ -32114,14 +31985,14 @@ msgstr "定義檢視"
 # widgets/misc/e-calendar-item.c:422
 #. 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 "一二三四五六日"
 
 # widgets/misc/e-calendar-item.c:1061
 # widgets/misc/e-calendar-item.c:2756
 #. 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"
 
@@ -32293,55 +32164,403 @@ msgid "Message"
 msgstr "訊息"
 
 # mail/mail-search-dialogue.c:113
-#: widgets/misc/e-search-bar.c:518
+#: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "尋找(_S)"
 
 # addressbook/gui/component/addressbook-config.c:349
-#: widgets/misc/e-search-bar.c:524
+#: widgets/misc/e-search-bar.c:537
 msgid "_Find Now"
 msgstr "立即搜尋(_F)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: widgets/misc/e-search-bar.c:525
+#: widgets/misc/e-search-bar.c:538
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: widgets/misc/e-search-bar.c:826
+#: widgets/misc/e-search-bar.c:833
 msgid "Item ID"
 msgstr "項目 ID"
 
-#: widgets/misc/e-search-bar.c:833
+#: widgets/misc/e-search-bar.c:840
 msgid "Subitem ID"
 msgstr "子項目 ID"
 
-#: widgets/misc/e-search-bar.c:840
+#: widgets/misc/e-search-bar.c:847
 msgid "Text"
 msgstr "文字"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: widgets/misc/e-search-bar.c:918
+#: widgets/misc/e-search-bar.c:925
 msgid "Clear"
 msgstr "清除"
 
 # addressbook/gui/component/addressbook-config.c:349
-#: widgets/misc/e-search-bar.c:920
+#: widgets/misc/e-search-bar.c:927
 msgid "Find Now"
 msgstr "立即搜尋"
 
-# wombat/GNOME_Evolution_Wombat.oaf.in.h:1
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #: 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_Wombat.oaf.in.h:2
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: 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 "Evolution 行事曆 iTip/iMip 檢視器"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Evolution 目錄服務迷你名片檢視"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "匯入 LDIF 檔案到 Evolution 的元件工廠。"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "匯入 LDIF 檔案到 Evolution。"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "匯入 VCard 檔案到 Evolution 的元件工廠。"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "匯入 VCard 檔案到 Evolution。"
+
+# 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 控制例子。"
+
+#~ msgid "Configuration control for the Evolution Addressbook Storages."
+#~ msgstr "Evolution 目錄服務儲存區的組態控制。"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "顯示 Evolution 目錄服務迷你名片之控制項。"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "用作處理連絡人的 Evolution 元件。"
+
+#~ msgid "Factory for the controls exported by the Evolution Addressbook"
+#~ msgstr "用於 Evolution 目錄服務所匯出的控制的工廠"
+
+#~ msgid "1234"
+#~ msgstr "1234"
+
+# calendar/gui/e-calendar-table.c:375
+#~ msgid "380"
+#~ msgstr "380"
+
+#~ msgid "666"
+#~ msgstr "666"
+
+# addressbook/gui/component/select-names/e-select-names-popup.c:161
+# composer/e-msg-composer-attachment-bar.c:468
+# shell/e-shortcuts-view.c:265
+# shell/e-shortcuts-view.c:388
+#~ msgid "<- _Remove"
+#~ msgstr "<- 移除(_R)"
+
+# addressbook/printing/e-contact-print.glade.h:23
+#~ msgid "<< Fewer Options"
+#~ msgstr "<< 減少選項"
+
+#~ msgid "Add (or Edit) Attribute Mappings"
+#~ msgstr "新增（或編輯）屬性對應"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:395
+#~ msgid "DN Customization"
+#~ msgstr "DN 自訂化"
+
+# addressbook/printing/e-contact-print.glade.h:21
+#~ msgid "Mappings"
+#~ msgstr "對應"
+
+#~ msgid "Objectclasses"
+#~ msgstr "物件類別"
+
+#~ msgid "Objectclasses Used in Evolution:"
+#~ msgstr "Evolution 中使用的物件類別:"
+
+#~ msgid "Objectclasses Used on Server:"
+#~ msgstr "伺服器上使用的物件類別:"
+
+#~ msgid ""
+#~ "Please select an Evolution attribute and an\n"
+#~ "LDAP attribute to associate with it."
+#~ msgstr ""
+#~ "請選擇一個 Evolution 屬性和\n"
+#~ "要跟它關連的 LDAP 屬性。"
+
+#~ msgid "R_estore Defaults"
+#~ msgstr "還原預設值(_E)"
+
+#~ msgid "Re_store Defaults"
+#~ msgstr "還原預設值(_S)"
+
+#~ 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 的數值都會變成您要把新的連絡人加入 LDAP 伺服器\n"
+#~ "上的目錄時需要的數值。"
+
+# addressbook/contact-editor/contact-editor.glade.h:17
+# mail/mail-config.glade.h:84
+#~ msgid "_Add ->"
+#~ msgstr "新增(_A) ->"
+
+#~ msgid "_Add Mapping"
+#~ msgstr "新增對應(_A)"
+
+#~ msgid "_Add to DN"
+#~ msgstr "加入到 DN(_A)"
+
+# calendar/gui/e-calendar-table.c:162
+#~ msgid "_Always"
+#~ msgstr "永遠(_A)"
+
+# addressbook/contact-editor/contact-editor.glade.h:23
+# mail/folder-browser.c:715
+# mail/mail-config.glade.h:85
+# ui/evolution-event-editor.xml.h:57
+# ui/evolution-mail.xml.h:103
+# ui/evolution-task-editor-dialog.xml.h:69
+# ui/evolution.xml.h:46
+#~ msgid "_Delete Mapping"
+#~ msgstr "刪除對應(_D)"
+
+#~ msgid "_Distinguished Name (DN):"
+#~ msgstr "辨認的名稱(DN)(_D):"
+
+#~ msgid "_Don't use SSL/TLS"
+#~ msgstr "不使用 SSL/TLS(_D)"
+
+# calendar/gui/dialogs/alarm-notify.glade.h:2
+#~ msgid "_Edit Mapping"
+#~ msgstr "編輯對應(_E)"
+
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#~ msgid "_Evolution attribute:"
+#~ msgstr "_Evolution 屬性:"
+
+#~ msgid "_If necessary "
+#~ msgstr "如果需要(_I) "
+
+#~ msgid "_LDAP attribute:"
+#~ msgstr "_LDAP 屬性:"
+
+#~ msgid "_LDAP attributes:"
+#~ msgstr "_LDAP 屬性:"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:431
+#~ msgid "_More Options >>"
+#~ msgstr "更多選項(_M) >>"
+
+#~ msgid "_Restore Defaults"
+#~ msgstr "還原預設值(_R)"
+
+# mail/mail-config.glade.h:3
+#~ msgid "account-druid"
+#~ msgstr "account-druid"
+
+# addressbook/contact-editor/contact-editor.glade.h:7
+#~ msgid "account-editor"
+#~ msgstr "account-editor"
+
+#~ 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"
+
+# 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/addressbook-storage.c:99
+#~ msgid "Unnamed Contact List"
+#~ msgstr "未命名的連絡人清單"
+
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d 沒有顯示)"
+
+# 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:1
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "一個可以顯示行事曆的 Bonobo 控制項例子。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr " Evolution 行事曆組態控制。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "用作處理行事曆的 Evolution 元件。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#~ msgid "Factory for the Evolution Calendar objects"
+#~ msgstr "Evolution 行事曆物件工廠"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr "集中式行事曆元件編輯器對話盒工廠"
+
+# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+#~ msgid "Alarm notification service"
+#~ msgstr "聲音提醒服務"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "匯入 iCalendar 檔案到 Evolution 的元件工廠。"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "匯入 iCalendar 檔案到 Evolution"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "匯入 vCalendar 檔案到 Evolution"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Evolution 顯示字型的組態控制。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Evolution 郵件帳號組態控制項。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Evolution 郵件寄送組態控制。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Evolution 郵件編輯組態控制。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:1
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "用作處理郵件的 Evolution 元件。"
+
+# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#~ msgid "Factory for the controls exported by the Evolution Mailer"
+#~ msgstr "用作 Evolution 郵件寄送程式匯出控制元的元件工廠"
+
+# 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_Mbox_Importer.oaf.in.h:2
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "匯入 mbox 檔案到 Evolution"
+
+# 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.oaf.in.h:2
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "匯入  Outlook Express 4 的檔案到 Evolution。"
+
+#~ msgid "On Screen fonts"
+#~ msgstr "螢幕字型"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "固定寬度(_F):"
+
+# mail/mail-accounts.c:197
+#~ msgid "_Variable-width:"
+#~ msgstr "可變寬度(_V):"
+
+# shell/e-shell-importer.c:601
+#~ msgid "All folders"
+#~ msgstr "全部資料夾"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#~ msgid "Display Options"
+#~ msgstr "顯示選項"
+
+#~ msgid "Folders whose names begin with:"
+#~ msgstr "資料夾名稱開頭為:"
+
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "Evolution 摘要的組態控制。"
+
+#~ msgid "Configuration control for Evolution folder settings."
+#~ msgstr "Evolution 資料夾設定的組態控制。"
+
+# camel/camel-session.c:479
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Evolution 無法建立目錄\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 "Output File"
+#~ msgstr "輸出檔案"
+
+# wombat/GNOME_Evolution_Wombat.oaf.in.h:1
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "個人的目錄伺服器"
+
+# wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "個人的行事曆伺服器；行事曆元件工廠"
 
 # ui/evolution-addressbook.xml.h:17
 #~ msgid "Edit Contact List"
@@ -32444,10 +32663,6 @@ msgstr "個人的行事曆伺服器；行事曆元件工廠"
 #~ msgid "Cannot initialize Evolution's folder info component."
 #~ msgstr "不能初始化 Evolution 的 資料夾資訊元件。"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:5
-#~ msgid "Evolution mail folder factory component."
-#~ msgstr "Evolution 郵件資料夾元件工廠。"
-
 # mail/GNOME_Evolution_Mail.oaf.in.h:6
 #~ msgid "Factory for the Evolution composer."
 #~ msgstr "Evolution 郵件編輯元件工廠。"